fix(RHOAIENG-6720): Remove Kustomize v5 deprecation warnings (#425)

* fix: Remove Kustomize v5 deprecation warnings * fix: Add PR number * fix: Operator deployment name
trustyai-explainability · Feb 25, 2025 · ad5b87b · ad5b87b
1 parent 5986605
commit ad5b87b
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/smoke.yaml b/.github/workflows/smoke.yaml
@@ -8,6 +8,8 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    env:
+      PR_NUMBER: ${{ github.event.pull_request.number || 'default-pr-number' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -6,8 +6,11 @@ resources:
   - ../rbac
   - ../manager
 
-commonLabels:
-  app.kubernetes.io/part-of: trustyai
+labels:
+  - pairs:
+      app.kubernetes.io/part-of: trustyai
+    includeSelectors: true
+    includeTemplates: true
 
 configMapGenerator:
   - env: params.env
@@ -19,32 +22,17 @@ configurations:
 generatorOptions:
   disableNameSuffixHash: true
 
-vars:
-  - name: trustyaiServiceImage
-    objref:
+replacements:
+  # Operator image replacement
+  - source:
       kind: ConfigMap
       name: config
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.trustyaiServiceImage
-  - name: trustyaiOperatorImage
-    objref:
-      kind: ConfigMap
-      name: config
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.trustyaiOperatorImage
-  - name: oauthProxyImage
-    objref:
-      kind: ConfigMap
-      name: config
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.oauthProxyImage
-  - name: kServeServerless
-    objref:
-      kind: ConfigMap
-      name: config
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.kServeServerless
+      version: v1
+      fieldPath: data.trustyaiOperatorImage
+    targets:
+      - select:
+          group: apps
+          kind: Deployment
+          name: controller-manager
+        fieldPaths:
+          - spec.template.spec.containers.0.image
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - bases/trustyai.opendatahub.io_guardrailsorchestrators.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge: []
+patches: []
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -34,7 +34,7 @@ spec:
             - --leader-elect
             - --enable-services
             - "TAS,LMES,GORCH"
-          image: $(trustyaiOperatorImage)
+          image: "quay.io/trustyai/trustyai-service-operator:latest"
           name: manager
           securityContext:
             runAsNonRoot: true

diff --git a/config/overlays/lmes/kustomization.yaml b/config/overlays/lmes/kustomization.yaml
@@ -4,5 +4,5 @@ kind: Kustomization
 resources:
   - ../../base
 
-patchesStrategicMerge:
-  - lmes-only-patch.yaml
+patches:
+  - path: lmes-only-patch.yaml
diff --git a/config/overlays/odh-kueue/kustomization.yaml b/config/overlays/odh-kueue/kustomization.yaml
@@ -4,8 +4,8 @@ kind: Kustomization
 resources:
   - ../../base
 
-patchesStrategicMerge:
-  - patch.yaml
+patches:
+  - path: patch.yaml
 
 configMapGenerator:
   - env: params.env

diff --git a/config/overlays/testing/kustomization.yaml b/config/overlays/testing/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
   - ../../base
 
-patchesStrategicMerge:
-  - image-pull-policy.yaml
+patches:
+  - path: image-pull-policy.yaml
diff --git a/tests/smoke/test_smoke.sh b/tests/smoke/test_smoke.sh
@@ -10,6 +10,9 @@ CRD_PATH="./tests/smoke/manifests/trustyai-cr.yaml"
 PVC_NAME="trustyai-service-pvc"
 SERVICE_NAME_1="trustyai-service"
 SERVICE_NAME_2="trustyai-service-tls"
+DEPLOYMENT_NAME="trustyai-service-operator-controller-manager"
+
+EXPECTED_IMAGE="smoke/operator:pr-${PR_NUMBER:-default-pr-number}"
 
 log_success() {
     local message=$1
@@ -37,8 +40,8 @@ check_resource() {
 
 gen_cert() {
     openssl req -x509 -nodes -newkey rsa:2048 -keyout tls.key -days 365 -out tls.crt -subj '/CN=trustyai-service-tls'
-    oc create secret generic trustyai-service-internal  --from-file=./tls.crt --from-file=./tls.key -n "$NAMESPACE"
-    oc create secret generic trustyai-service-tls  --from-file=./tls.crt --from-file=./tls.key -n "$NAMESPACE"
+    kubectl create secret generic trustyai-service-internal  --from-file=./tls.crt --from-file=./tls.key -n "$NAMESPACE"
+    kubectl create secret generic trustyai-service-tls  --from-file=./tls.crt --from-file=./tls.key -n "$NAMESPACE"
     rm tls.key tls.crt
 }
 
@@ -56,6 +59,16 @@ check_resource service "$SERVICE_NAME_2" "$NAMESPACE"
 # Check for the PVC creation
 check_resource pvc "$PVC_NAME" "$NAMESPACE"
 
+# Check for correct Operator image assignment
+OPERATOR_IMAGE=$(kubectl get deployment "${DEPLOYMENT_NAME}" -n system \
+  -o jsonpath='{.spec.template.spec.containers[0].image}')
+
+if [[ "${OPERATOR_IMAGE}" == "${EXPECTED_IMAGE}" ]]; then
+  log_success "Operator image is correct: ${OPERATOR_IMAGE}"
+else
+  log_failure "Operator image mismatch! Expected ${EXPECTED_IMAGE}, got ${OPERATOR_IMAGE}"
+fi
+
 kubectl delete namespace "$NAMESPACE"
 
 sleep 10