Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

unify all references to ose-oauth-proxy to v4.10 latest digest #869

Closed
wants to merge 3 commits into from
Closed

unify all references to ose-oauth-proxy to v4.10 latest digest #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a8026d
unify all references to ose-oauth-proxy to v4.10 latest digest
shalberd Jul 6, 2023
640ee66
use ose-oauth-proxy v4.10 manifest link digest from July 6 2023
shalberd Jul 6, 2023
a2fbc67
Merge branch 'master' into consistent_and_stable_ose_oauth_version_cr…
shalberd Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data-science-pipelines-operator/base/params.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e52fc1de73dc2879
IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro@sha256:443db9a646aaf9374f95d266ba0c8656a52d70d0ffcc386a782cea28fa32e55d
IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:cafc7364494fb7206c373a1235fd5da74399c19b5c34d87dd02aa07e8f343fa2
IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator@sha256:bd4f3cfc9688aeb4296a5f3f7274557adeca0a8811533da750f05b485a819a8d
IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:d0f2f1ef0bdc3aa1a70794ac8ac779271b634af83e939029ac5224ec0c815d7a
IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shalberd dsp is using 4.12 oauth proxy, so this change is not needed on the dsp front since the primary reason for the issue is to stop using old oauth proxy images afaik

also, typically we make changes in the dsp manifests within the component repo before trickling the changes down to odh-manifests (as these need to be kept in sync)

Copy link
Contributor Author

@shalberd shalberd Jul 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HumairAK no, the idea of this PR is to unify the version of ose-oauth-proxy across all components. I know some people use latest versions of Openshift i.e. 4.12 or 4.13, but the standard here is really OCP 4.10. Thus the unified reference to v4.10 of ose-oauth-proxy.

We use digest format for disconnected support. You are right about also having to do this in your repo as well. ODH Dashboard has already unified to v4.10 from old 4.8 in their repo, for example. In a second step, they will now include the image in digest format.

Do you have a hard requirement / reason for using v4.12 oauth proxy image?

Copy link
Contributor

@HumairAK HumairAK Jul 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks for the clarification. There's no hard requirement for 4.12, we can go with 4.10, but may we get this merged in the component repo first (at least for dsp)? we can keep this in the pr here in the meantime, would you be willing to make the same adjustment here?

IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy@sha256:f2d5d430bbc925520f635f35698e604aae391ace39b15a5d601a9c9eb26dec2b
IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc@sha256:2490aadb2227cc72fd9e698549a8cd3270b669a2faa24bb0603c37f1c71ac8c4
IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer@sha256:89fc26374f8e58384628f6b178eb9b8e3ebb111fe395c529d0b65ba8adaa89f5

2 changes: 1 addition & 1 deletion model-mesh/odh-modelmesh-controller/internal/base/deployment.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
ports:
- containerPort: 8443
name: https
Expand Down
2 changes: 1 addition & 1 deletion modelmesh-monitoring/base/prometheus/odh-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33'
imagePullPolicy: Always
env:
- name: DEPLOYMENT_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion odh-dashboard/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ images:
newTag: v2.12.0
- name: oauth-proxy
newName: registry.redhat.io/openshift4/ose-oauth-proxy
Copy link
Contributor Author

@shalberd shalberd Jul 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewballantyne let me know what you think about adding a yaml comment line for humans to read on the tag version used

i.e.

# tag v4.10 as of July 6 2023

mini-PR in odh-dashboard manifests directory, working and tested

opendatahub-io/odh-dashboard#1599

@Jooho same for model-mesh

newTag: v4.8
digest: sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
2 changes: 1 addition & 1 deletion odh-notebook-controller/odh-notebook-controller/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33"]
securityContext:
allowPrivilegeEscalation: false
ports:
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/codeflare-stack/custom-nb-small.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down