chore(authproxy): deploy fork of openshift-oauth-proxy (#853)

* chore(authproxy): deploy fork of openshift-oauth-proxy * regenerate * bundle * test * regen/typo
cryostatio · Jun 6, 2024 · ceb2476 · ceb2476
1 parent abf08f0
commit ceb2476
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -68,9 +68,10 @@ OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
 OAUTH2_PROXY_NAME ?= oauth2-proxy
 OAUTH2_PROXY_VERSION ?= latest
 export OAUTH2_PROXY_IMG ?= $(OAUTH2_PROXY_NAMESPACE)/$(OAUTH2_PROXY_NAME):$(OAUTH2_PROXY_VERSION)
-OPENSHIFT_OAUTH_PROXY_NAMESPACE ?= quay.io/openshift
-OPENSHIFT_OAUTH_PROXY_NAME ?= origin-oauth-proxy
-OPENSHIFT_OAUTH_PROXY_VERSION ?= latest
+OPENSHIFT_OAUTH_PROXY_NAMESPACE ?= quay.io/cryostat
+OPENSHIFT_OAUTH_PROXY_NAME ?= openshift-oauth-proxy
+# there is no 'latest' tag for this container
+OPENSHIFT_OAUTH_PROXY_VERSION ?= cryostat-v3.0
 export OPENSHIFT_OAUTH_PROXY_IMG ?= $(OPENSHIFT_OAUTH_PROXY_NAMESPACE)/$(OPENSHIFT_OAUTH_PROXY_NAME):$(OPENSHIFT_OAUTH_PROXY_VERSION)
 DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 DATASOURCE_NAME ?= jfr-datasource

diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -53,7 +53,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
-    createdAt: "2024-06-06T19:18:49Z"
+    createdAt: "2024-06-06T19:50:42Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -1014,7 +1014,7 @@ spec:
                       - name: RELATED_IMAGE_OAUTH2_PROXY
                         value: quay.io/oauth2-proxy/oauth2-proxy:latest
                       - name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
-                        value: quay.io/openshift/origin-oauth-proxy:latest
+                        value: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
                       - name: RELATED_IMAGE_CORE
                         value: quay.io/cryostat/cryostat:3.0.0-snapshot
                       - name: RELATED_IMAGE_DATASOURCE
@@ -1191,7 +1191,7 @@ spec:
   relatedImages:
     - image: quay.io/oauth2-proxy/oauth2-proxy:latest
       name: oauth2-proxy
-    - image: quay.io/openshift/origin-oauth-proxy:latest
+    - image: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
       name: openshift-oauth-proxy
     - image: quay.io/cryostat/cryostat:3.0.0-snapshot
       name: core

diff --git a/config/default/image_tag_patch.yaml b/config/default/image_tag_patch.yaml
@@ -12,7 +12,7 @@ spec:
         - name: RELATED_IMAGE_OAUTH2_PROXY
           value: "quay.io/oauth2-proxy/oauth2-proxy:latest"
         - name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
-          value: "quay.io/openshift/origin-oauth-proxy:latest"
+          value: "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0"
         - name: RELATED_IMAGE_CORE
           value: "quay.io/cryostat/cryostat:3.0.0-snapshot"
         - name: RELATED_IMAGE_DATASOURCE

diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go
diff --git a/internal/controllers/reconciler_test.go b/internal/controllers/reconciler_test.go
@@ -2842,7 +2842,7 @@ func (t *cryostatTestInput) checkAuthProxyContainer(container *corev1.Container,
 	defaultPrefix := "quay.io/oauth2-proxy/oauth2-proxy:"
 	if t.OpenShift {
 		imageTag = t.EnvOpenShiftOAuthProxyImageTag
-		defaultPrefix = "quay.io/openshift/origin-oauth-proxy:"
+		defaultPrefix = "quay.io/cryostat/openshift-oauth-proxy:"
 	}
 	if imageTag != nil {
 		Expect(container.Image).To(Equal(*imageTag))