Merge pull request #962 from RedHatInsights/mknop/update_images

updating caddy and mocktitlements
RedHatInsights · Mar 26, 2024 · f189f1a · f189f1a
2 parents 5090e31 + 3f1b7ce
commit f189f1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -192,7 +192,7 @@ kustomize: ## Download kustomize locally if necessary.
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
-	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
+	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@d0396a3d6f9fb554ef2da382a3d0bf05f7565e65)
 
 # go-install-tool will 'go install' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

diff --git a/controllers/cloud.redhat.com/providers/utils/utils.go b/controllers/cloud.redhat.com/providers/utils/utils.go
@@ -21,10 +21,10 @@ import (
 	"github.com/RedHatInsights/rhc-osdk-utils/utils"
 )
 
-var DefaultImageCaddySideCar = "quay.io/cloudservices/crc-caddy-plugin:a988cd2"
+var DefaultImageCaddySideCar = "quay.io/cloudservices/crc-caddy-plugin:39a1c9e"
 var DefaultImageCaddyGateway = DefaultImageCaddySideCar
 var DefaultImageMBOP = "quay.io/cloudservices/mbop:959d00d"
-var DefaultImageMocktitlements = "quay.io/cloudservices/mocktitlements:81fd80e"
+var DefaultImageMocktitlements = "quay.io/cloudservices/mocktitlements:89adf1b"
 var DefaultKeyCloakVersion = "23.0.1"
 var DefaultImageCaddyProxy = "quay.io/cloudservices/caddy-ubi:latest"
 var DefaultImageKeyCloak = fmt.Sprintf("quay.io/keycloak/keycloak:%s", DefaultKeyCloakVersion)

diff --git a/tests/kuttl/test-ephemeral-gateway/01-assert.yaml b/tests/kuttl/test-ephemeral-gateway/01-assert.yaml
@@ -82,11 +82,11 @@ spec:
       annotations:
         clowder/authsidecar-config: caddy-config-mocktitlements
         clowder/authsidecar-enabled: "true"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:a988cd2
+        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:39a1c9e
         clowder/authsidecar-port: "8090"
     spec:
       containers:
-      - image: quay.io/cloudservices/mocktitlements:81fd80e
+      - image: quay.io/cloudservices/mocktitlements:89adf1b
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate

diff --git a/tests/kuttl/test-ephemeral-gateway/03-assert.yaml b/tests/kuttl/test-ephemeral-gateway/03-assert.yaml
@@ -18,7 +18,7 @@ spec:
         clowder/authsidecar-config: caddy-config-puptoo-processor
         clowder/authsidecar-enabled: "true"
         clowder/authsidecar-port: "8000"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:a988cd2
+        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:39a1c9e
     spec:
       serviceAccountName: puptoo-processor
 status:
@@ -36,7 +36,7 @@ spec:
         clowder/authsidecar-config: caddy-config-puptoo-2paths-processor
         clowder/authsidecar-enabled: "true"
         clowder/authsidecar-port: "8000"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:a988cd2
+        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:39a1c9e
     spec:
       serviceAccountName: puptoo-2paths-processor
 status: