Merge pull request #649 from BlakeHolifield/mbop-update

Update mbop image tag
RedHatInsights · Jul 4, 2022 · 8bedc68 · 8bedc68
2 parents daa10d8 + 2ae298a
commit 8bedc68
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/controllers/cloud.redhat.com/pod_mutator.go b/controllers/cloud.redhat.com/pod_mutator.go
@@ -17,8 +17,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-var IMAGE_MUTATE_CADDY_SIDECAR = "quay.io/cloudservices/crc-caddy-plugin:d3d0597"
-
 type mutantPod struct {
 	Client   client.Client
 	Recorder record.EventRecorder
@@ -52,7 +50,7 @@ func (p *mutantPod) Handle(ctx context.Context, req admission.Request) admission
 			return admission.Errored(http.StatusBadRequest, fmt.Errorf("pod does not specify authsidecar config"))
 		}
 
-		image := IMAGE_MUTATE_CADDY_SIDECAR
+		image := utils.IMAGE_MUTATE_CADDY_SIDECAR
 
 		if clowderconfig.LoadedConfig.Images.Caddy != "" {
 			image = clowderconfig.LoadedConfig.Images.Caddy

diff --git a/controllers/cloud.redhat.com/providers/deployment/impl.go b/controllers/cloud.redhat.com/providers/deployment/impl.go
@@ -47,7 +47,7 @@ func initDeployment(app *crd.ClowdApp, env *crd.ClowdEnvironment, d *apps.Deploy
 	pod := deployment.PodSpec
 	if env.Spec.Providers.Web.Mode == "local" && (deployment.WebServices.Public.Enabled || bool(deployment.Web)) {
 		annotations := map[string]string{
-			"clowder/authsidecar-image":   "a76bb81",
+			"clowder/authsidecar-image":   utils.IMAGE_MUTATE_CADDY_SIDECAR,
 			"clowder/authsidecar-enabled": "true",
 			"clowder/authsidecar-port":    strconv.Itoa(int(env.Spec.Providers.Web.Port)),
 			"clowder/authsidecar-config":  fmt.Sprintf("caddy-config-%s-%s", app.Name, deployment.Name),

diff --git a/controllers/cloud.redhat.com/providers/web/impl.go b/controllers/cloud.redhat.com/providers/web/impl.go
@@ -21,7 +21,7 @@ import (
 )
 
 var KEYCLOAK_VERSION = "15.0.2"
-var IMAGE_WEB_MBOP = "quay.io/cloudservices/mbop:dd6c49a"
+var IMAGE_WEB_MBOP = "quay.io/cloudservices/mbop:0d3f99f"
 var IMAGE_WEB_MOCKTITLEMENTS = "quay.io/cloudservices/mocktitlements:130433d"
 
 func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.ClowdApp, env *crd.ClowdEnvironment) error {
@@ -463,7 +463,7 @@ func makeMocktitlements(o obj.ClowdObject, objMap providers.ObjectMap, usePVC bo
 	dd.Spec.Template.ObjectMeta.Labels = labels
 
 	annotations := map[string]string{
-		"clowder/authsidecar-image":   "a76bb81",
+		"clowder/authsidecar-image":   utils.IMAGE_MUTATE_CADDY_SIDECAR,
 		"clowder/authsidecar-enabled": "true",
 		"clowder/authsidecar-port":    "8090",
 		"clowder/authsidecar-config":  "caddy-config-mocktitlements",

diff --git a/controllers/cloud.redhat.com/utils/utils.go b/controllers/cloud.redhat.com/utils/utils.go
@@ -26,6 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+var IMAGE_MUTATE_CADDY_SIDECAR = "quay.io/cloudservices/crc-caddy-plugin:3ba6be7"
+
 const rCharSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 const lCharSet = "abcdefghijklmnopqrstuvwxyz0123456789"