Merge branch 'master' into change-caddy-sidecar-image-mark-II

RedHatInsights · Oct 28, 2024 · 440a1ea · 440a1ea
2 parents 7f42c09 + efaaafa
commit 440a1ea
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ RUN CGO_ENABLED=1 GOOS=linux GO111MODULE=on go build -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1052.1724178568
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086
 WORKDIR /
 COPY --from=builder /workspace/manager .
 COPY --from=builder /workspace/manifest.yaml .

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21.11-8.1724662611 as builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.21.13-1.1727869850 as builder
 USER 0
 RUN dnf install -y openssh-clients git make which jq python3
 

diff --git a/build/Dockerfile-local b/build/Dockerfile-local
@@ -1,6 +1,6 @@
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1052.1724178568
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086
 WORKDIR /
 COPY bin/manager-cgo ./manager
 COPY jsons/ ./jsons/

diff --git a/controllers/cloud.redhat.com/providers/utils/utils.go b/controllers/cloud.redhat.com/providers/utils/utils.go
@@ -21,7 +21,7 @@ import (
 	"github.com/RedHatInsights/rhc-osdk-utils/utils"
 )
 
-var DefaultImageCaddySideCar = "quay.io/redhat-user-workloads/hcm-eng-prod-tenant/crc-caddy-plugin/crc-caddy-plugin:on-pr-21eba678018172bf701817d4191a2ec52dd1080c"
+var DefaultImageCaddySideCar = "quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:b314a15"
 var DefaultImageCaddyGateway = DefaultImageCaddySideCar
 var DefaultImageMBOP = "quay.io/cloudservices/mbop:4fbb291"
 var DefaultImageMocktitlements = "quay.io/cloudservices/mocktitlements:2d55a98"

diff --git a/tests/kuttl/test-ephemeral-gateway/01-assert.yaml b/tests/kuttl/test-ephemeral-gateway/01-assert.yaml
@@ -82,7 +82,7 @@ spec:
       annotations:
         clowder/authsidecar-config: caddy-config-mocktitlements
         clowder/authsidecar-enabled: "true"
-        clowder/authsidecar-image: quay.io/redhat-user-workloads/hcm-eng-prod-tenant/crc-caddy-plugin/crc-caddy-plugin:on-pr-21eba678018172bf701817d4191a2ec52dd1080c
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:b314a15
         clowder/authsidecar-port: "8090"
     spec:
       containers:

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/redhat-user-workloads/hcm-eng-prod-tenant/crc-caddy-plugin/crc-caddy-plugin:on-pr-21eba678018172bf701817d4191a2ec52dd1080c
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:b314a15
     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/redhat-user-workloads/hcm-eng-prod-tenant/crc-caddy-plugin/crc-caddy-plugin:on-pr-21eba678018172bf701817d4191a2ec52dd1080c
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:b314a15
     spec:
       serviceAccountName: puptoo-2paths-processor
 status: