From ceb2476d79d0d9b751ffcd31829e5ac867415d37 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Thu, 6 Jun 2024 15:52:19 -0400 Subject: [PATCH] chore(authproxy): deploy fork of openshift-oauth-proxy (#853) * chore(authproxy): deploy fork of openshift-oauth-proxy * regenerate * bundle * test * regen/typo --- Makefile | 7 ++++--- .../manifests/cryostat-operator.clusterserviceversion.yaml | 6 +++--- config/default/image_tag_patch.yaml | 2 +- internal/controllers/const_generated.go | 2 +- internal/controllers/reconciler_test.go | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f25a5497..b544bf45 100644 --- 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 index ebd88dfb..38b54f97 100644 --- 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 index 7e674620..6c2d1f14 100644 --- 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 index 41ae4e3e..0157d52d 100644 --- a/internal/controllers/const_generated.go +++ b/internal/controllers/const_generated.go @@ -11,7 +11,7 @@ const OperatorVersion = "3.0.0-dev" const DefaultOAuth2ProxyImageTag = "quay.io/oauth2-proxy/oauth2-proxy:latest" // Default image tag for the OpenShift OAuth Proxy -const DefaultOpenShiftOAuthProxyImageTag = "quay.io/openshift/origin-oauth-proxy:latest" +const DefaultOpenShiftOAuthProxyImageTag = "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0" // Default image tag for the core application image const DefaultCoreImageTag = "quay.io/cryostat/cryostat:3.0.0-snapshot" diff --git a/internal/controllers/reconciler_test.go b/internal/controllers/reconciler_test.go index c622fd48..339e1daf 100644 --- 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))