Merge remote-tracking branch 'upstream/main'

Author: moulalis

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

@@ -81,6 +81,8 @@ rules:
       # Replace RHAI_APPLICATIONS_NAMESPACE with templated value
       - path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_APPLICATIONS_NAMESPACE].value
         value: '{{ .Values.rhaiOperator.applicationsNamespace | quote }}'
+      - path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_VERSION].value
+        value: '{{ .Chart.AppVersion | quote }}'
       # Add related images env vars
       - path: .spec.template.spec.containers[name=rhods-operator].env
         appendWith: |

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

@@ -94,6 +94,8 @@ spec:
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
               value: {{ .Values.rhaiOperator.applicationsNamespace | quote }}
+            - name: RHAI_VERSION
+              value: {{ .Chart.AppVersion | quote }}
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME

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

@@ -248,7 +248,6 @@ rules:
       - cert-manager.io
     resources:
       - certificates
-      - clusterissuers
     verbs:
       - create
       - delete
@@ -634,8 +633,6 @@ rules:
   - apiGroups:
       - infrastructure.opendatahub.io
     resources:
-      - azurekubernetesengines
-      - coreweavekubernetesengines
       - hardwareprofiles
     verbs:
       - create
@@ -648,16 +645,12 @@ rules:
   - apiGroups:
       - infrastructure.opendatahub.io
     resources:
-      - azurekubernetesengines/finalizers
-      - coreweavekubernetesengines/finalizers
       - hardwareprofiles/finalizers
     verbs:
       - update
   - apiGroups:
       - infrastructure.opendatahub.io
     resources:
-      - azurekubernetesengines/status
-      - coreweavekubernetesengines/status
       - hardwareprofiles/status
     verbs:
       - get
@@ -1002,18 +995,12 @@ rules:
       - patch
       - update
   - apiGroups:
-      - operator.openshift.io
+      - operator.authorino.kuadrant.io
     resources:
-      - certmanagers
-      - leaderworkersetoperators
+      - authorinos
     verbs:
-      - create
-      - delete
       - get
       - list
-      - patch
-      - update
-      - watch
   - apiGroups:
       - operator.openshift.io
     resources:
@@ -1029,6 +1016,7 @@ rules:
       - operator.openshift.io
     resources:
       - jobsetoperators
+      - leaderworkersetoperators
     verbs:
       - get
       - list
@@ -1141,113 +1129,11 @@ rules:
       - rbac.authorization.k8s.io
     resources:
       - clusterrolebindings
-      - rolebindings
-    verbs:
-      - '*'
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resources:
-      - clusterroles
-    verbs:
-      - '*'
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - cert-manager-operator-controller-manager-clusterrole
-      - cert-manager-operator-metrics-reader
-    resources:
-      - clusterroles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - metrics-reader
-      - servicemesh-operator3-clusterrole
-    resources:
-      - clusterroles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - openshift-lws-operator-clusterrole
-    resources:
       - clusterroles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resources:
+      - rolebindings
       - roles
     verbs:
       - '*'
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - cert-manager-operator-controller-manager-role
-    resources:
-      - roles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - openshift-lws-operator-role
-    resources:
-      - roles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rbac.authorization.k8s.io
-    resourceNames:
-      - servicemesh-operator3-role
-    resources:
-      - roles
-    verbs:
-      - bind
-      - delete
-      - escalate
-      - get
-      - list
-      - patch
-      - update
-      - watch
   - apiGroups:
       - route.openshift.io
     resources:
@@ -1275,18 +1161,6 @@ rules:
       - create
       - patch
       - update
-  - apiGroups:
-      - sailoperator.io
-    resources:
-      - istios
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
   - apiGroups:
       - security.openshift.io
     resources:
@@ -1421,6 +1295,18 @@ rules:
       - delete
       - get
       - patch
+  - apiGroups:
+      - telemetry.istio.io
+    resources:
+      - telemetries
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
   - apiGroups:
       - template.openshift.io
     resources: