Skip to content

Commit 05b2d8a

Browse files
grdryndavidebianchi
authored and
mholder6
committed
Add reference to etcd and ose-cli rhel9 manifest list image (opendatahub-io#369) (opendatahub-io#373)
* feat(RHOAIENG-32222): add reference to etcd rhel9 manifest list image * feat(RHOAIENG-32222): add reference to ose-cli rhel9 manifest list image * feat(RHOAIENG-32222): rename etcd image * fix(RHOAIENG-32222): substitute vars in initContainers * feat(RHOAIENG-32222): set specific image to etcd deployment in opendatahub * feat: rename etcd to ose-etcd * feat: update static reference to oauth-proxy --------- Signed-off-by: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Co-authored-by: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Signed-off-by: Mariah Holder <marholde@redhat.com>
1 parent 11782ae commit 05b2d8a

File tree

9 files changed

+34
-16
lines changed

9 files changed

+34
-16
lines changed

‎config/dependencies/fvt.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- /tmp/etcd.data
5454
# image: quay.io/coreos/etcd:v3.5.4
5555
# Tag -> registry.access.redhat.com/rhel7/etcd:3.2.32-34
56-
image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
56+
image: $(ose-etcd)
5757
name: etcd
5858
ports:
5959
- containerPort: 2379

‎config/internal/base/deployment.yaml.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
- '--openshift-delegate-urls={"/": {"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}}'
137137
- '--openshift-sar={"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}'
138138
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
139-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
139+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
140140
ports:
141141
- containerPort: 8443
142142
name: https

‎config/overlays/odh/kustomization.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,20 @@ vars:
5555
apiVersion: v1
5656
kind: ConfigMap
5757
name: mesh-parameters
58+
- fieldref:
59+
fieldPath: data.ose-etcd
60+
name: ose-etcd
61+
objref:
62+
apiVersion: v1
63+
kind: ConfigMap
64+
name: mesh-parameters
65+
- fieldref:
66+
fieldPath: data.ose-cli
67+
name: ose-cli
68+
objref:
69+
apiVersion: v1
70+
kind: ConfigMap
71+
name: mesh-parameters
5872

5973

6074

‎config/overlays/odh/params.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ odh-mm-rest-proxy=quay.io/opendatahub/rest-proxy:v0.12.0-rc0-latest
22
odh-modelmesh-runtime-adapter=quay.io/opendatahub/modelmesh-runtime-adapter:v0.12.0-rc0-latest
33
odh-modelmesh=quay.io/opendatahub/modelmesh:v0.12.0-rc0-latest
44
odh-modelmesh-controller=quay.io/opendatahub/modelmesh-controller:v0.12.0-rc0-latest
5+
ose-etcd=registry.redhat.io/openshift4/ose-etcd-rhel9:v4.19
6+
ose-cli=registry.redhat.io/openshift4/ose-cli-rhel9:v4.19

‎config/overlays/odh/params.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ varReference:
77
kind: RoleBinding
88
- path: spec/template/spec/containers[]/image
99
kind: Deployment
10+
- path: spec/template/spec/initContainers[]/image
11+
kind: Deployment
1012
- path: data
1113
kind: ConfigMap

‎config/overlays/odh/quickstart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
defaultMode: 0554
5050
initContainers:
5151
- name: etcd-secret-creator
52-
image: registry.redhat.io/openshift4/ose-cli@sha256:4cfb4219f46c8cc25a5e567fd4cb8babe9a3778b0b86a1e354a3403994ef3677
52+
image: $(ose-cli)
5353
command: ["/bin/bash", "-c", "--"]
5454
args:
5555
- |
@@ -69,10 +69,10 @@ spec:
6969
exit 0
7070
elif [[ $etcdpasswordexists == "false" && $modelservingetcdexists != "false" ]]; then
7171
echo "model-serving-etcd exists, creating etcdpasswords secret"
72-
ETC_ROOT_PSW=$(oc get secrets/model-serving-etcd --template={{.data.etcd_connection}} | base64 -d | grep -o '"password": *"[^"]*"' | grep -o '"[^"]*"$' | grep -oP '"\K[^"\047]+(?=["\047])')
72+
ETC_ROOT_PSW=$(oc get secrets/model-serving-etcd --template={{.data.etcd_connection}} | base64 -d | grep -o '"password": *"[^"]*"' | grep -o '"[^"]*"$' | grep -oP '"\K[^"\047]+(?=["\047])')
7373
oc create secret generic etcd-passwords --type=string --from-literal=root=$ETC_ROOT_PSW
7474
exit 0
75-
else
75+
else
7676
echo "secrets etcdpasswords and model-serving-etcd exist, doing nothing"
7777
exit 0
7878
fi
@@ -92,7 +92,7 @@ spec:
9292
- http://0.0.0.0:2379
9393
- "--data-dir"
9494
- /tmp/etcd.data
95-
image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
95+
image: $(ose-etcd)
9696
name: etcd
9797
env:
9898
- name: ROOT_PASSWORD

‎controllers/testdata/servingruntime_controller.golden‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ spec:
103103
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
104104
"get"}'
105105
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
106-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
106+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
107107
imagePullPolicy: IfNotPresent
108108
livenessProbe:
109109
failureThreshold: 3
@@ -415,7 +415,7 @@ spec:
415415
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
416416
"get"}'
417417
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
418-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
418+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
419419
imagePullPolicy: IfNotPresent
420420
livenessProbe:
421421
failureThreshold: 3
@@ -699,7 +699,7 @@ spec:
699699
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
700700
"get"}'
701701
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
702-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
702+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
703703
imagePullPolicy: IfNotPresent
704704
livenessProbe:
705705
failureThreshold: 3
@@ -1055,7 +1055,7 @@ spec:
10551055
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
10561056
"get"}'
10571057
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
1058-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
1058+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
10591059
imagePullPolicy: IfNotPresent
10601060
livenessProbe:
10611061
failureThreshold: 3
@@ -1360,7 +1360,7 @@ spec:
13601360
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
13611361
"get"}'
13621362
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
1363-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
1363+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
13641364
imagePullPolicy: IfNotPresent
13651365
livenessProbe:
13661366
failureThreshold: 3
@@ -1657,7 +1657,7 @@ spec:
16571657
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
16581658
"get"}'
16591659
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
1660-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
1660+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
16611661
imagePullPolicy: IfNotPresent
16621662
livenessProbe:
16631663
failureThreshold: 3
@@ -1959,7 +1959,7 @@ spec:
19591959
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
19601960
"get"}'
19611961
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
1962-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
1962+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
19631963
imagePullPolicy: IfNotPresent
19641964
livenessProbe:
19651965
failureThreshold: 3
@@ -2255,7 +2255,7 @@ spec:
22552255
- '--openshift-sar={"namespace": "default", "resource": "services", "verb":
22562256
"get"}'
22572257
- --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
2258-
image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
2258+
image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
22592259
imagePullPolicy: IfNotPresent
22602260
livenessProbe:
22612261
failureThreshold: 3

‎opendatahub/scripts/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manifests are the part that deploys the components required for fvt (functional
1919

2020
## Scripts
2121

22-
The scripts in this folder help you run fvt tests or compare odh manifests. However, it is not recommended to use these scripts directly without familiarizing yourself with them. [This doc has make examples](../docs/makefile_-cheatsheet.md) of using these scripts in a makefile here.
22+
The scripts in this folder help you run fvt tests or compare odh manifests. However, it is not recommended to use these scripts directly without familiarizing yourself with them. [This doc has make examples](../docs/makefile-cheatsheet.md) of using these scripts in a makefile here.
2323

2424
- [env.sh](./env.sh)
2525

‎opendatahub/scripts/manifests/fvt/fvt.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- /tmp/etcd.data
5454
# image: quay.io/coreos/etcd:v3.5.4
5555
# Tag -> registry.access.redhat.com/rhel7/etcd:3.2.32-34
56-
image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
56+
image: registry.redhat.io/openshift4/ose-etcd-rhel9@sha256:ea7545b79599f3868d442fdffdfe9b12a02a4b56ac155f02c0fac4720d475796
5757
name: etcd
5858
ports:
5959
- containerPort: 2379

0 commit comments

Comments
 (0)