Merge remote-tracking branch 'upstream/main'

Author: moulalis

.github/workflows/rhai-on-xks-chart-test.yaml

@@ -74,7 +74,7 @@ jobs:
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
 
       - name: Install and verify chart
-        timeout-minutes: 30
+        timeout-minutes: 60
         env:
           RHAI_PULL_SECRET: ${{ secrets.RHAI_PULL_SECRET }}
         run: |
@@ -125,7 +125,7 @@ jobs:
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
 
       - name: Upgrade test
-        timeout-minutes: 30
+        timeout-minutes: 60
         env:
           RHAI_PULL_SECRET: ${{ secrets.RHAI_PULL_SECRET }}
         run: |

charts/rhai-on-xks-chart/scripts/verify-helpers.sh

@@ -345,15 +345,25 @@ helm_deploy() {
     read -ra helm_extra <<< "$HELM_EXTRA_ARGS"
   fi
   log "helm upgrade --install $RELEASE_NAME ${version_args[*]:+(${version_args[*]})}"
-  helm upgrade --install "$RELEASE_NAME" "$chart_ref" \
+  if ! helm upgrade --install "$RELEASE_NAME" "$chart_ref" \
     -n "$NAMESPACE" --create-namespace \
     --set "${CLOUD_PROVIDER}.enabled=true" \
     ${version_args[@]+"${version_args[@]}"} \
     ${values_args[@]+"${values_args[@]}"} \
     ${secret_args[@]+"${secret_args[@]}"} \
     ${helm_extra[@]+"${helm_extra[@]}"} \
     ${extra_args[@]+"${extra_args[@]}"} \
-    --timeout 10m
+    --timeout 10m; then
+    log "Helm deploy failed — dumping hook job logs..."
+    local hook_jobs=(rhai-post-install-crs rhai-post-create-gateway rhai-post-create-maas-gateway rhai-pre-delete-crs)
+    for job in "${hook_jobs[@]}"; do
+      if kubectl get "job/${job}" -n "$NAMESPACE" &>/dev/null; then
+        echo "  --- job: ${job} ---"
+        kubectl logs "job/${job}" -n "$NAMESPACE" --tail=100 2>/dev/null || true
+      fi
+    done
+    return 1
+  fi
 }
 
 wait_ke_ready() {

charts/rhai-on-xks-chart/templates/crds/customresourcedefinition-kserves.components.platform.opendatahub.io.yaml

@@ -79,6 +79,24 @@ spec:
                           pattern: ^(Managed|Unmanaged|Force|Removed)$
                           type: string
                       type: object
+                    kserve:
+                      description: Kserve controls the kserve module operator lifecycle.
+                      properties:
+                        managementState:
+                          description: |-
+                            Set to one of the following values:
+
+                            - "Managed" : the operator is actively managing the component and trying to keep it active.
+                                          It will only upgrade the component if it is safe to do so
+
+                            - "Removed" : the operator is actively managing the component and will not install it,
+                                          or if it is installed, the operator will try to remove it
+                          enum:
+                            - Managed
+                            - Removed
+                          pattern: ^(Managed|Unmanaged|Force|Removed)$
+                          type: string
+                      type: object
                     mcplifecycleoperator:
                       description: MCPLifecycleOperator controls the MCP Lifecycle Operator module lifecycle.
                       properties:
@@ -97,6 +115,24 @@ spec:
                           pattern: ^(Managed|Unmanaged|Force|Removed)$
                           type: string
                       type: object
+                    mlflowoperator:
+                      description: MLflowOperator controls the MLflow module operator lifecycle.
+                      properties:
+                        managementState:
+                          description: |-
+                            Set to one of the following values:
+
+                            - "Managed" : the operator is actively managing the component and trying to keep it active.
+                                          It will only upgrade the component if it is safe to do so
+
+                            - "Removed" : the operator is actively managing the component and will not install it,
+                                          or if it is installed, the operator will try to remove it
+                          enum:
+                            - Managed
+                            - Removed
+                          pattern: ^(Managed|Unmanaged|Force|Removed)$
+                          type: string
+                      type: object
                     monitoring:
                       description: Monitoring controls the monitoring module operator lifecycle.
                       properties:

charts/rhai-on-xks-chart/templates/crds/customresourcedefinition-platforms.config.opendatahub.io.yaml

@@ -50,6 +50,8 @@ To add a new module: add an entry here. All templates update automatically.
 {{- define "rhai-on-xks-chart.moduleCRRegistry" -}}
 aigateway:
   platformModuleKey: aigateway
+kserve:
+  platformModuleKey: kserve
 {{- end -}}
 
 {{/*
@@ -155,7 +157,7 @@ Returns "true" if provider + KE are both enabled, empty string otherwise. Used f
 
 {{/*
 Returns a JSON list of enabled component names for guard conditions (non-empty = at least one enabled).
-Do NOT range over this and access fields with .field syntax — use crApplyCommands / crDeleteCommands instead.
+Do NOT range over this and access fields with .field syntax — use crApplyCommands / componentDeleteCommands instead.
 */}}
 {{- define "rhai-on-xks-chart.enabledComponentCRs" -}}
 {{- $registry := include "rhai-on-xks-chart.componentCRRegistry" . | fromYaml }}
@@ -203,6 +205,11 @@ EOF
   {{- $meta := index $compRegistry $name }}
   {{- $compVals := index $.Values.components $name | default dict }}
   {{- if $compVals.enabled }}
+echo "Waiting for CRD {{ index $meta "resource" }}.{{ index $meta "apiGroup" }} to exist..."
+elapsed=0; while [ $elapsed -lt 300 ]; do
+  kubectl get crd/{{ index $meta "resource" }}.{{ index $meta "apiGroup" }} &>/dev/null && break
+  sleep 5; elapsed=$((elapsed + 5))
+done
 echo "Waiting for CRD {{ index $meta "resource" }}.{{ index $meta "apiGroup" }} to be established..."
 kubectl wait --for condition=established --timeout=300s crd/{{ index $meta "resource" }}.{{ index $meta "apiGroup" }}
 echo "Creating {{ index $meta "kind" }} CR..."
@@ -225,10 +232,10 @@ EOF
 {{- end -}}
 
 {{/*
-Emit kubectl delete commands for all enabled component CRs and provider KE CRs.
-Include with: {{- include "rhai-on-xks-chart.crDeleteCommands" . | nindent 14 }}
+Emit kubectl delete commands for all enabled component CRs.
+Include with: {{- include "rhai-on-xks-chart.componentDeleteCommands" . | nindent 14 }}
 */}}
-{{- define "rhai-on-xks-chart.crDeleteCommands" -}}
+{{- define "rhai-on-xks-chart.componentDeleteCommands" -}}
 {{- $compRegistry := include "rhai-on-xks-chart.componentCRRegistry" . | fromYaml }}
 {{- range $name := keys $compRegistry | sortAlpha }}
   {{- $meta := index $compRegistry $name }}
@@ -238,6 +245,13 @@ echo "Deleting {{ index $meta "kind" }} CR '{{ index $meta "crName" }}'..."
 kubectl delete {{ index $meta "resourceSingular" }} {{ index $meta "crName" }} --ignore-not-found --timeout=300s
   {{- end }}
 {{- end }}
+{{- end -}}
+
+{{/*
+Emit kubectl delete command for the provider KE CR.
+Include with: {{- include "rhai-on-xks-chart.providerKEDeleteCommands" . | nindent 14 }}
+*/}}
+{{- define "rhai-on-xks-chart.providerKEDeleteCommands" -}}
 {{- $provider := include "rhai-on-xks-chart.activeProvider" . | fromYaml }}
 {{- if and $provider (index $provider "keEnabled") }}
 echo "Deleting {{ index $provider "keKind" }} CR '{{ index $provider "keName" }}'..."

charts/rhai-on-xks-chart/templates/hooks/_crs-definitions.tpl

@@ -51,8 +51,9 @@ spec:
             - -c
             - |
               set -euo pipefail
-              {{- include "rhai-on-xks-chart.crDeleteCommands" . | trimPrefix "\n" | nindent 14 }}
+              {{- include "rhai-on-xks-chart.componentDeleteCommands" . | trimPrefix "\n" | nindent 14 }}
               {{- include "rhai-on-xks-chart.moduleDeleteCommands" . | nindent 14 }}
+              {{- include "rhai-on-xks-chart.providerKEDeleteCommands" . | nindent 14 }}
 
               {{- if $.Values.uninstall.cleanupNamespaces }}
               {{- range $ns := $depNamespaces }}

charts/rhai-on-xks-chart/templates/hooks/pre-delete-crs-job.yaml

@@ -1008,14 +1008,6 @@ rules:
       - patch
       - update
       - watch
-  - apiGroups:
-      - discovery.k8s.io
-    resources:
-      - endpointslices
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - networking.k8s.io
     resources: