build(nginx): update Nginx to UBI9 (#1041)

* build(nginx): update Nginx to UBI9 * Fix test, regenerate
cryostatio · Feb 5, 2025 · bcbf256 · bcbf256
1 parent 7dc341d
commit bcbf256
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -93,7 +93,7 @@ STORAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 STORAGE_NAME ?= cryostat-storage
 STORAGE_VERSION ?= latest
 export STORAGE_IMG ?= $(STORAGE_NAMESPACE)/$(STORAGE_NAME):$(STORAGE_VERSION)
-AGENT_PROXY_NAMESPACE ?= registry.access.redhat.com/ubi8
+AGENT_PROXY_NAMESPACE ?= registry.access.redhat.com/ubi9
 AGENT_PROXY_NAME ?= nginx-124
 AGENT_PROXY_VERSION ?= latest
 export AGENT_PROXY_IMG ?= $(AGENT_PROXY_NAMESPACE)/$(AGENT_PROXY_NAME):$(AGENT_PROXY_VERSION)

diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -24,7 +24,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
-    createdAt: "2025-01-31T17:19:11Z"
+    createdAt: "2025-02-04T23:03:44Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -1145,7 +1145,7 @@ spec:
                       - name: RELATED_IMAGE_DATABASE
                         value: quay.io/cryostat/cryostat-db:latest
                       - name: RELATED_IMAGE_AGENT_PROXY
-                        value: registry.access.redhat.com/ubi8/nginx-124:latest
+                        value: registry.access.redhat.com/ubi9/nginx-124:latest
                       - name: WATCH_NAMESPACE
                         valueFrom:
                           fieldRef:
@@ -1311,7 +1311,7 @@ spec:
       name: storage
     - image: quay.io/cryostat/cryostat-db:latest
       name: database
-    - image: registry.access.redhat.com/ubi8/nginx-124:latest
+    - image: registry.access.redhat.com/ubi9/nginx-124:latest
       name: agent-proxy
   version: 4.0.0-dev
   webhookdefinitions:

diff --git a/config/default/image_tag_patch.yaml b/config/default/image_tag_patch.yaml
@@ -26,4 +26,4 @@ spec:
         - name: RELATED_IMAGE_DATABASE
           value: "quay.io/cryostat/cryostat-db:latest"
         - name: RELATED_IMAGE_AGENT_PROXY
-          value: "registry.access.redhat.com/ubi8/nginx-124:latest"
+          value: "registry.access.redhat.com/ubi9/nginx-124:latest"
diff --git a/internal/controllers/constants/const_generated.go b/internal/controllers/constants/const_generated.go
diff --git a/internal/controllers/reconciler_test.go b/internal/controllers/reconciler_test.go
@@ -3786,7 +3786,7 @@ func (t *cryostatTestInput) checkAgentProxyContainer(container *corev1.Container
 	Expect(container.Name).To(Equal(t.Name + "-agent-proxy"))
 
 	imageTag := t.EnvAgentProxyImageTag
-	defaultPrefix := "registry.access.redhat.com/ubi8/nginx-124:"
+	defaultPrefix := "registry.access.redhat.com/ubi9/nginx-124:"
 	if imageTag != nil {
 		Expect(container.Image).To(Equal(*imageTag))
 	} else {