Merge pull request #609 from mtchoum1/main

RHOAIENG-11681: Running 'kustomize edit fix --vars' on each component to upgrade to kustomize v5

Author: harshad16

components/base/kustomization.yaml

@@ -1,6 +1,5 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-  - ../notebook-controller/config/overlays/openshift
-  - ../odh-notebook-controller/config/base
+resources:
+- ../notebook-controller/config/overlays/openshift
+- ../odh-notebook-controller/config/base

components/notebook-controller/config/crd/kustomization.yaml

@@ -5,8 +5,6 @@ resources:
 - bases/kubeflow.org_notebooks.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
-- patches/trivial_conversion_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
@@ -22,11 +20,13 @@ patchesStrategicMerge:
 configurations:
 - kustomizeconfig.yaml
 
-patchesJson6902:
-  - target:
-      group: apiextensions.k8s.io
-      version: v1
-      kind: CustomResourceDefinition
-      name: notebooks.kubeflow.org
-    path: patches/validation_patches.yaml
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patches/validation_patches.yaml
+  target:
+    group: apiextensions.k8s.io
+    kind: CustomResourceDefinition
+    name: notebooks.kubeflow.org
+    version: v1
+- path: patches/trivial_conversion_patch.yaml

components/notebook-controller/config/default/kustomization.yaml

@@ -9,15 +9,8 @@ namespace: notebook-controller-system
 namePrefix: notebook-controller-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app: notebook-controller
-  kustomize.component: notebook-controller
 
 
-bases:
-- ../rbac
-- ../manager
-- ../crd
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
 #- ../webhook
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
@@ -45,31 +38,14 @@ bases:
 #- webhookcainjection_patch.yaml
 
 # the following config is for teaching kustomize how to do var substitution
-vars:
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
-# - name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
-#   objref:
-#     kind: Certificate
-#     group: certmanager.k8s.io
-#     version: v1alpha1
-#     name: serving-cert # this name should match the one in certificate.yaml
-#   fieldref:
-#     fieldpath: metadata.namespace
-# - name: CERTIFICATE_NAME
-#   objref:
-#     kind: Certificate
-#     group: certmanager.k8s.io
-#     version: v1alpha1
-#     name: serving-cert # this name should match the one in certificate.yaml
-# - name: SERVICE_NAMESPACE # namespace of the service
-#   objref:
-#     kind: Service
-#     version: v1
-#     name: webhook-service
-#   fieldref:
-#     fieldpath: metadata.namespace
-# - name: SERVICE_NAME
-#   objref:
-#     kind: Service
-#     version: v1
-#     name: webhook-service
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../rbac
+- ../manager
+- ../crd
+labels:
+- includeSelectors: true
+  pairs:
+    app: notebook-controller
+    kustomize.component: notebook-controller

components/notebook-controller/config/manager/kustomization.yaml

@@ -3,8 +3,10 @@ resources:
 - service-account.yaml
 - service.yaml
 configMapGenerator:
-- name: config
-  envs:
+- envs:
   - params.env
+  name: config
 generatorOptions:
-  disableNameSuffixHash: true
+  disableNameSuffixHash: true
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization

components/notebook-controller/config/overlays/kubeflow/kustomization.yaml

@@ -3,11 +3,11 @@ kind: Kustomization
 resources:
 - ../../base
 namespace: kubeflow
-patchesStrategicMerge:
-- patches/remove-namespace.yaml
 configMapGenerator:
-- name: config
-  behavior: merge
+- behavior: merge
   literals:
   - USE_ISTIO=true
   - ISTIO_GATEWAY=kubeflow/kubeflow-gateway
+  name: config
+patches:
+- path: patches/remove-namespace.yaml

components/notebook-controller/config/overlays/openshift/kustomization.yaml

@@ -1,34 +1,42 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+- ../../base
 namespace: opendatahub
-commonLabels:
-  app.kubernetes.io/part-of: odh-notebook-controller
-  component.opendatahub.io/name: kf-notebook-controller
-  opendatahub.io/component: "true"
 configurations:
-  - params.yaml
+- params.yaml
 configMapGenerator:
-  - name: kf-notebook-controller-image-parameters
-    env: params.env
-  - name: config
-    behavior: merge
-    literals:
-      - USE_ISTIO=false
-      - ADD_FSGROUP=false
+- envs:
+  - params.env
+  name: kf-notebook-controller-image-parameters
+- behavior: merge
+  literals:
+  - USE_ISTIO=false
+  - ADD_FSGROUP=false
+  name: config
 generatorOptions:
   disableNameSuffixHash: true
-patchesStrategicMerge:
-  - remove_namespace_patch.yaml
-  - manager_openshift_patch.yaml
-  - manager_service_openshift_patch.yaml
-vars:
-- name: odh-kf-notebook-controller-image
-  objref:
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/part-of: odh-notebook-controller
+    component.opendatahub.io/name: kf-notebook-controller
+    opendatahub.io/component: "true"
+patches:
+- path: remove_namespace_patch.yaml
+- path: manager_openshift_patch.yaml
+- path: manager_service_openshift_patch.yaml
+replacements:
+- source:
+    fieldPath: data.odh-kf-notebook-controller-image
     kind: ConfigMap
     name: kf-notebook-controller-image-parameters
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.odh-kf-notebook-controller-image
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.template.spec.containers.0.image
+    select:
+      group: apps
+      kind: Deployment
+      name: deployment
+      version: v1

components/notebook-controller/config/overlays/openshift/manager_openshift_patch.yaml

@@ -32,7 +32,7 @@ spec:
                   name: notebook-controller-culler-config
                   key: IDLENESS_CHECK_PERIOD
                   optional: true
-          image: $(odh-kf-notebook-controller-image)
+          image: odh-kf-notebook-controller-image_PLACEHOLDER
           resources:
             limits:
               cpu: 500m

components/notebook-controller/config/overlays/service-mesh/kustomization.yaml

@@ -1,10 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- ../openshift
 
 configMapGenerator:
-- name: config
-  behavior: merge
+- behavior: merge
   envs:
   - ossm.env
+  name: config
+resources:
+- ../openshift

components/notebook-controller/config/overlays/standalone-service-mesh/kustomization.yaml

@@ -1,48 +1,46 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../openshift
-  - gateway.yaml
-  - gateway-route.yaml
-  - cert-secret.yaml
-  - smm.yaml
+- ../openshift
+- gateway.yaml
+- gateway-route.yaml
+- cert-secret.yaml
+- smm.yaml
 namespace: odh-notebook-controller-system
 
 configMapGenerator:
-  - name: config
-    behavior: merge
-    literals:
-      - USE_ISTIO=true
-      - ISTIO_GATEWAY=odh-notebook-controller-system/odh-gateway
-
-patchesJson6902:  
-  - patch: |-
-      - op: replace
-        path: /metadata/namespace
-        value: istio-system
-    target:
-      group: route.openshift.io
-      kind: Route
-      version: v1
-      namespace: odh-notebook-controller-system
-      name: opendatahub-odh-gateway
-  - patch: |-
-      - op: replace
-        path: /metadata/namespace
-        value: istio-system
-    target:
-      kind: Secret
-      version: v1
-      namespace: odh-notebook-controller-system
-      name: odh-dashboard-cert
-  - patch: |-
-      - op: replace
-        path: /spec/controlPlaneRef/namespace
-        value: istio-system
-    target:
-      group: maistra.io
-      version: v1
-      kind: ServiceMeshMember
-      name: default
+- behavior: merge
+  literals:
+  - USE_ISTIO=true
+  - ISTIO_GATEWAY=odh-notebook-controller-system/odh-gateway
+  name: config
 
+patches:
+- patch: |-
+    - op: replace
+      path: /metadata/namespace
+      value: istio-system
+  target:
+    group: route.openshift.io
+    kind: Route
+    name: opendatahub-odh-gateway
+    namespace: odh-notebook-controller-system
+    version: v1
+- patch: |-
+    - op: replace
+      path: /metadata/namespace
+      value: istio-system
+  target:
+    kind: Secret
+    name: odh-dashboard-cert
+    namespace: odh-notebook-controller-system
+    version: v1
+- patch: |-
+    - op: replace
+      path: /spec/controlPlaneRef/namespace
+      value: istio-system
+  target:
+    group: maistra.io
+    kind: ServiceMeshMember
+    name: default
+    version: v1

components/notebook-controller/config/overlays/standalone/kustomization.yaml

@@ -4,7 +4,7 @@ resources:
 - ../../base
 namespace: notebook-controller-system
 configMapGenerator:
-- name: config
-  behavior: merge
+- behavior: merge
   literals:
   - USE_ISTIO=false
+  name: config