Skip to content

Commit 6057f1c

Browse files
fix(RHOAIENG-57045): add RHAI_VERSION env var to rhai operator (opendatahub-io#70)
1 parent 2439f2e commit 6057f1c

8 files changed

Lines changed: 110 additions & 846 deletions

charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ rules:
8181
# Replace RHAI_APPLICATIONS_NAMESPACE with templated value
8282
- path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_APPLICATIONS_NAMESPACE].value
8383
value: '{{ .Values.rhaiOperator.applicationsNamespace | quote }}'
84+
- path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_VERSION].value
85+
value: '{{ .Chart.AppVersion | quote }}'
8486
# Add related images env vars
8587
- path: .spec.template.spec.containers[name=rhods-operator].env
8688
appendWith: |

charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ spec:
9494
value: "true"
9595
- name: RHAI_APPLICATIONS_NAMESPACE
9696
value: {{ .Values.rhaiOperator.applicationsNamespace | quote }}
97+
- name: RHAI_VERSION
98+
value: {{ .Chart.AppVersion | quote }}
9799
- name: ODH_PLATFORM_TYPE
98100
value: XKS
99101
- name: OPERATOR_NAME

charts/rhai-on-xks-chart/templates/rbac/clusterrole-rhods-operator-role.yaml

Lines changed: 16 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,6 @@ rules:
248248
- cert-manager.io
249249
resources:
250250
- certificates
251-
- clusterissuers
252-
verbs:
253-
- create
254-
- delete
255-
- get
256-
- list
257-
- patch
258-
- update
259-
- watch
260-
- apiGroups:
261-
- cert-manager.io
262-
resources:
263251
- issuers
264252
verbs:
265253
- create
@@ -634,8 +622,6 @@ rules:
634622
- apiGroups:
635623
- infrastructure.opendatahub.io
636624
resources:
637-
- azurekubernetesengines
638-
- coreweavekubernetesengines
639625
- hardwareprofiles
640626
verbs:
641627
- create
@@ -648,16 +634,12 @@ rules:
648634
- apiGroups:
649635
- infrastructure.opendatahub.io
650636
resources:
651-
- azurekubernetesengines/finalizers
652-
- coreweavekubernetesengines/finalizers
653637
- hardwareprofiles/finalizers
654638
verbs:
655639
- update
656640
- apiGroups:
657641
- infrastructure.opendatahub.io
658642
resources:
659-
- azurekubernetesengines/status
660-
- coreweavekubernetesengines/status
661643
- hardwareprofiles/status
662644
verbs:
663645
- get
@@ -1002,18 +984,12 @@ rules:
1002984
- patch
1003985
- update
1004986
- apiGroups:
1005-
- operator.openshift.io
987+
- operator.authorino.kuadrant.io
1006988
resources:
1007-
- certmanagers
1008-
- leaderworkersetoperators
989+
- authorinos
1009990
verbs:
1010-
- create
1011-
- delete
1012991
- get
1013992
- list
1014-
- patch
1015-
- update
1016-
- watch
1017993
- apiGroups:
1018994
- operator.openshift.io
1019995
resources:
@@ -1029,6 +1005,7 @@ rules:
10291005
- operator.openshift.io
10301006
resources:
10311007
- jobsetoperators
1008+
- leaderworkersetoperators
10321009
verbs:
10331010
- get
10341011
- list
@@ -1141,113 +1118,11 @@ rules:
11411118
- rbac.authorization.k8s.io
11421119
resources:
11431120
- clusterrolebindings
1144-
- rolebindings
1145-
verbs:
1146-
- '*'
1147-
- apiGroups:
1148-
- rbac.authorization.k8s.io
1149-
resources:
1150-
- clusterroles
1151-
verbs:
1152-
- '*'
1153-
- apiGroups:
1154-
- rbac.authorization.k8s.io
1155-
resourceNames:
1156-
- cert-manager-operator-controller-manager-clusterrole
1157-
- cert-manager-operator-metrics-reader
1158-
resources:
1159-
- clusterroles
1160-
verbs:
1161-
- bind
1162-
- delete
1163-
- escalate
1164-
- get
1165-
- list
1166-
- patch
1167-
- update
1168-
- watch
1169-
- apiGroups:
1170-
- rbac.authorization.k8s.io
1171-
resourceNames:
1172-
- metrics-reader
1173-
- servicemesh-operator3-clusterrole
1174-
resources:
11751121
- clusterroles
1176-
verbs:
1177-
- bind
1178-
- delete
1179-
- escalate
1180-
- get
1181-
- list
1182-
- patch
1183-
- update
1184-
- watch
1185-
- apiGroups:
1186-
- rbac.authorization.k8s.io
1187-
resourceNames:
1188-
- openshift-lws-operator-clusterrole
1189-
resources:
1190-
- clusterroles
1191-
verbs:
1192-
- bind
1193-
- delete
1194-
- escalate
1195-
- get
1196-
- list
1197-
- patch
1198-
- update
1199-
- watch
1200-
- apiGroups:
1201-
- rbac.authorization.k8s.io
1202-
resources:
1122+
- rolebindings
12031123
- roles
12041124
verbs:
12051125
- '*'
1206-
- apiGroups:
1207-
- rbac.authorization.k8s.io
1208-
resourceNames:
1209-
- cert-manager-operator-controller-manager-role
1210-
resources:
1211-
- roles
1212-
verbs:
1213-
- bind
1214-
- delete
1215-
- escalate
1216-
- get
1217-
- list
1218-
- patch
1219-
- update
1220-
- watch
1221-
- apiGroups:
1222-
- rbac.authorization.k8s.io
1223-
resourceNames:
1224-
- openshift-lws-operator-role
1225-
resources:
1226-
- roles
1227-
verbs:
1228-
- bind
1229-
- delete
1230-
- escalate
1231-
- get
1232-
- list
1233-
- patch
1234-
- update
1235-
- watch
1236-
- apiGroups:
1237-
- rbac.authorization.k8s.io
1238-
resourceNames:
1239-
- servicemesh-operator3-role
1240-
resources:
1241-
- roles
1242-
verbs:
1243-
- bind
1244-
- delete
1245-
- escalate
1246-
- get
1247-
- list
1248-
- patch
1249-
- update
1250-
- watch
12511126
- apiGroups:
12521127
- route.openshift.io
12531128
resources:
@@ -1275,18 +1150,6 @@ rules:
12751150
- create
12761151
- patch
12771152
- update
1278-
- apiGroups:
1279-
- sailoperator.io
1280-
resources:
1281-
- istios
1282-
verbs:
1283-
- create
1284-
- delete
1285-
- get
1286-
- list
1287-
- patch
1288-
- update
1289-
- watch
12901153
- apiGroups:
12911154
- security.openshift.io
12921155
resources:
@@ -1421,6 +1284,18 @@ rules:
14211284
- delete
14221285
- get
14231286
- patch
1287+
- apiGroups:
1288+
- telemetry.istio.io
1289+
resources:
1290+
- telemetries
1291+
verbs:
1292+
- create
1293+
- delete
1294+
- get
1295+
- list
1296+
- patch
1297+
- update
1298+
- watch
14241299
- apiGroups:
14251300
- template.openshift.io
14261301
resources:

0 commit comments

Comments
 (0)