Revert "fix(RHOAIENG-6720): Remove Kustomize v5 deprecation warnings (trustyai-explainability#425)" (trustyai-explainability#432)

This reverts commit ad5b87b

Author: ruivieira

config/base/kustomization.yaml

@@ -6,11 +6,8 @@ resources:
   - ../rbac
   - ../manager
 
-labels:
-  - pairs:
-      app.kubernetes.io/part-of: trustyai
-    includeSelectors: true
-    includeTemplates: true
+commonLabels:
+  app.kubernetes.io/part-of: trustyai
 
 configMapGenerator:
   - env: params.env
@@ -22,17 +19,32 @@ configurations:
 generatorOptions:
   disableNameSuffixHash: true
 
-replacements:
-  # Operator image replacement
-  - source:
+vars:
+  - name: trustyaiServiceImage
+    objref:
       kind: ConfigMap
       name: config
-      version: v1
-      fieldPath: data.trustyaiOperatorImage
-    targets:
-      - select:
-          group: apps
-          kind: Deployment
-          name: trustyai-service-operator-controller-manager
-        fieldPaths:
-          - spec.template.spec.containers.0.image
+      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

config/crd/kustomization.yaml

@@ -4,7 +4,7 @@ resources:
   - bases/trustyai.opendatahub.io_guardrailsorchestrators.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patches: []
+patchesStrategicMerge: []
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 

config/manager/manager.yaml

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

config/overlays/lmes/kustomization.yaml

@@ -4,5 +4,5 @@ kind: Kustomization
 resources:
   - ../../base
 
-patches:
-  - path: lmes-only-patch.yaml
+patchesStrategicMerge:
+  - lmes-only-patch.yaml

config/overlays/odh-kueue/kustomization.yaml

@@ -4,8 +4,8 @@ kind: Kustomization
 resources:
   - ../../base
 
-patches:
-  - path: patch.yaml
+patchesStrategicMerge:
+  - patch.yaml
 
 configMapGenerator:
   - env: params.env

config/overlays/testing/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
   - ../../base
 
-patches:
-  - path: image-pull-policy.yaml
+patchesStrategicMerge:
+  - image-pull-policy.yaml