From 0a8026d0d86d855e575d1fe49f9db88ec2780ad6 Mon Sep 17 00:00:00 2001 From: Sven Thoms <21118431+shalberd@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:36:35 +0200 Subject: [PATCH 1/2] unify all references to ose-oauth-proxy to v4.10 latest digest --- data-science-pipelines-operator/base/params.env | 2 +- .../odh-modelmesh-controller/internal/base/deployment.yaml.tmpl | 2 +- modelmesh-monitoring/base/prometheus/odh-prometheus.yaml | 2 +- odh-dashboard/base/kustomization.yaml | 2 +- .../odh-notebook-controller/manager/manager.yaml | 2 +- tests/resources/codeflare-stack/custom-nb-small.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data-science-pipelines-operator/base/params.env b/data-science-pipelines-operator/base/params.env index aded367d6..7b8419a61 100644 --- a/data-science-pipelines-operator/base/params.env +++ b/data-science-pipelines-operator/base/params.env @@ -6,7 +6,7 @@ IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103:1-188 IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator:v1.0.0 -IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0 +IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy:v1.0.0 IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:v1.0.0 IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:v1.0.0 diff --git a/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl b/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl index ab838e199..d26c7197f 100644 --- a/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl +++ b/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl @@ -136,7 +136,7 @@ spec: - '--openshift-delegate-urls={"/": {"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}}' - '--openshift-sar={"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}' - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)' - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4bef31eb993feb6f1096b51b4876c65a6fb1f4401fee97fa4f4542b6b7c9bc46 + image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b ports: - containerPort: 8443 name: https diff --git a/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml b/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml index ccb6ef262..0e1d2b830 100644 --- a/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml +++ b/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml @@ -19,7 +19,7 @@ spec: - '--openshift-sar={"namespace": "$(DEPLOYMENT_NAMESPACE)", "resource": "services", "verb": "get"}' - '--openshift-delegate-urls={"/": {"namespace": "$(DEPLOYMENT_NAMESPACE)", "resource": "services", "verb": "get"}}' - '-skip-auth-regex=^/metrics' - image: 'registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4bef31eb993feb6f1096b51b4876c65a6fb1f4401fee97fa4f4542b6b7c9bc46' + image: 'registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b' imagePullPolicy: Always env: - name: DEPLOYMENT_NAMESPACE diff --git a/odh-dashboard/base/kustomization.yaml b/odh-dashboard/base/kustomization.yaml index cc9bb1386..5a267e7b1 100644 --- a/odh-dashboard/base/kustomization.yaml +++ b/odh-dashboard/base/kustomization.yaml @@ -28,4 +28,4 @@ images: newTag: v2.12.0 - name: oauth-proxy newName: registry.redhat.io/openshift4/ose-oauth-proxy - newTag: v4.8 + digest: sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b diff --git a/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml b/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml index 7038db98a..0680523c1 100644 --- a/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml +++ b/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml @@ -25,7 +25,7 @@ spec: imagePullPolicy: Always command: - /manager - args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy:v4.10"] + args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b"] securityContext: allowPrivilegeEscalation: false ports: diff --git a/tests/resources/codeflare-stack/custom-nb-small.yaml b/tests/resources/codeflare-stack/custom-nb-small.yaml index f411a8a8c..0a9bf89f2 100644 --- a/tests/resources/codeflare-stack/custom-nb-small.yaml +++ b/tests/resources/codeflare-stack/custom-nb-small.yaml @@ -107,7 +107,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10 + image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b imagePullPolicy: Always livenessProbe: failureThreshold: 3 From 640ee667fa1459ce37e19f6bc18d0958b2537b2b Mon Sep 17 00:00:00 2001 From: Sven Thoms <21118431+shalberd@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:58:41 +0200 Subject: [PATCH 2/2] use ose-oauth-proxy v4.10 manifest link digest from July 6 2023 --- data-science-pipelines-operator/base/params.env | 2 +- .../odh-modelmesh-controller/internal/base/deployment.yaml.tmpl | 2 +- modelmesh-monitoring/base/prometheus/odh-prometheus.yaml | 2 +- odh-dashboard/base/kustomization.yaml | 2 +- .../odh-notebook-controller/manager/manager.yaml | 2 +- tests/resources/codeflare-stack/custom-nb-small.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data-science-pipelines-operator/base/params.env b/data-science-pipelines-operator/base/params.env index 7b8419a61..ac2f0d643 100644 --- a/data-science-pipelines-operator/base/params.env +++ b/data-science-pipelines-operator/base/params.env @@ -6,7 +6,7 @@ IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103:1-188 IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator:v1.0.0 -IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b +IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33 IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy:v1.0.0 IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:v1.0.0 IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:v1.0.0 diff --git a/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl b/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl index d26c7197f..aba9769b7 100644 --- a/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl +++ b/model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl @@ -136,7 +136,7 @@ spec: - '--openshift-delegate-urls={"/": {"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}}' - '--openshift-sar={"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}' - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)' - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b + image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33 ports: - containerPort: 8443 name: https diff --git a/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml b/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml index 0e1d2b830..5402a9ab7 100644 --- a/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml +++ b/modelmesh-monitoring/base/prometheus/odh-prometheus.yaml @@ -19,7 +19,7 @@ spec: - '--openshift-sar={"namespace": "$(DEPLOYMENT_NAMESPACE)", "resource": "services", "verb": "get"}' - '--openshift-delegate-urls={"/": {"namespace": "$(DEPLOYMENT_NAMESPACE)", "resource": "services", "verb": "get"}}' - '-skip-auth-regex=^/metrics' - image: 'registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b' + image: 'registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33' imagePullPolicy: Always env: - name: DEPLOYMENT_NAMESPACE diff --git a/odh-dashboard/base/kustomization.yaml b/odh-dashboard/base/kustomization.yaml index 5a267e7b1..eae7b1c50 100644 --- a/odh-dashboard/base/kustomization.yaml +++ b/odh-dashboard/base/kustomization.yaml @@ -28,4 +28,4 @@ images: newTag: v2.12.0 - name: oauth-proxy newName: registry.redhat.io/openshift4/ose-oauth-proxy - digest: sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b + digest: sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33 diff --git a/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml b/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml index 0680523c1..5d7592e06 100644 --- a/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml +++ b/odh-notebook-controller/odh-notebook-controller/manager/manager.yaml @@ -25,7 +25,7 @@ spec: imagePullPolicy: Always command: - /manager - args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b"] + args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33"] securityContext: allowPrivilegeEscalation: false ports: diff --git a/tests/resources/codeflare-stack/custom-nb-small.yaml b/tests/resources/codeflare-stack/custom-nb-small.yaml index 0a9bf89f2..a9d14473c 100644 --- a/tests/resources/codeflare-stack/custom-nb-small.yaml +++ b/tests/resources/codeflare-stack/custom-nb-small.yaml @@ -107,7 +107,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4d5687c6c9216e294d25c6b095f5f4b7ff96e005326fff3303bda7760e012d5b + image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33 imagePullPolicy: Always livenessProbe: failureThreshold: 3