chore(manifests): refactor manifests for kustomize5 compatibility. Pa…

…rt of #10053 (#10087) * refactor ml-pipeline component for kustomize5 compatibility Signed-off-by: Alin Spinu <[email protected]> * rm bk folder Signed-off-by: Alin Spinu <[email protected]> * fix kustomizations using auto kustomize edit Signed-off-by: Alin Spinu <[email protected]> * fix env/aws Signed-off-by: Alin Spinu <[email protected]> * fix kustomize version v5.0.3 in tests Signed-off-by: Alin Spinu <[email protected]> * minor changes to manifest apply method in pipeline deployment script Signed-off-by: Alin Spinu <[email protected]> * fix Signed-off-by: Alin Spinu <[email protected]> * fix kustomize release Signed-off-by: Alin Spinu <[email protected]> * fix archive Signed-off-by: Alin Spinu <[email protected]> * fix bin Signed-off-by: Alin Spinu <[email protected]> * replace patchStrategicMerge refs in test manifests Signed-off-by: Alin Spinu <[email protected]> * replace kustomize version with 5.2.1 Signed-off-by: Alin Spinu <[email protected]> * replace all kustomize versions with 5.2.1 Signed-off-by: Alin Spinu <[email protected]> --------- Signed-off-by: Alin Spinu <[email protected]>
kubeflow · Apr 4, 2024 · af08576 · af08576
1 parent a78dc77
commit af08576
Show file tree

Hide file tree

Showing 51 changed files with 283 additions and 287 deletions.
diff --git a/manifests/kustomize/base/installs/generic/kustomization.yaml b/manifests/kustomize/base/installs/generic/kustomization.yaml
@@ -1,48 +1,47 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-bases:
-- ../../pipeline
-- ../../cache
-- ../../cache-deployer
 resources:
-- pipeline-install-config.yaml
-- mysql-secret.yaml
+  - ../../pipeline
+  - ../../cache
+  - ../../cache-deployer
+  - pipeline-install-config.yaml
+  - mysql-secret.yaml
 vars:
-- name: kfp-namespace
-  objref:
-    kind: Deployment
-    apiVersion: apps/v1
-    name: ml-pipeline
-  fieldref:
-    fieldpath: metadata.namespace
-- name: kfp-app-name
-  objref:
-    kind: ConfigMap
-    name: pipeline-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.appName
-- name: kfp-app-version
-  objref:
-    kind: ConfigMap
-    name: pipeline-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.appVersion
-- name: kfp-artifact-bucket-name
-  objref:
-    kind: ConfigMap
-    name: pipeline-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.bucketName
-- name: kfp-default-pipeline-root
-  objref:
-    kind: ConfigMap
-    name: pipeline-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.defaultPipelineRoot
+  - name: kfp-namespace
+    objref:
+      kind: Deployment
+      apiVersion: apps/v1
+      name: ml-pipeline
+    fieldref:
+      fieldpath: metadata.namespace
+  - name: kfp-app-name
+    objref:
+      kind: ConfigMap
+      name: pipeline-install-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.appName
+  - name: kfp-app-version
+    objref:
+      kind: ConfigMap
+      name: pipeline-install-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.appVersion
+  - name: kfp-artifact-bucket-name
+    objref:
+      kind: ConfigMap
+      name: pipeline-install-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.bucketName
+  - name: kfp-default-pipeline-root
+    objref:
+      kind: ConfigMap
+      name: pipeline-install-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.defaultPipelineRoot
 configurations:
- - params.yaml
+  - params.yaml
diff --git a/manifests/kustomize/base/installs/generic/postgres/kustomization.yaml b/manifests/kustomize/base/installs/generic/postgres/kustomization.yaml
@@ -1,11 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-bases:
+resources:
 - ../../../postgresql/pipeline
 - ../../../postgresql/cache
 - ../../../cache-deployer
-resources:
 - pipeline-install-config.yaml
 - postgres-secret-extended.yaml
 vars:

diff --git a/manifests/kustomize/base/installs/multi-user/kustomization.yaml b/manifests/kustomize/base/installs/multi-user/kustomization.yaml
@@ -19,15 +19,15 @@ resources:
 - metadata-writer
 - istio-authorization-config.yaml
 - virtual-service.yaml
-patchesStrategicMerge:
-- api-service/deployment-patch.yaml
-- pipelines-ui/deployment-patch.yaml
-- pipelines-ui/configmap-patch.yaml
-- scheduled-workflow/deployment-patch.yaml
-- viewer-controller/deployment-patch.yaml
-- persistence-agent/deployment-patch.yaml
-- metadata-writer/deployment-patch.yaml
-- cache/deployment-patch.yaml
+patches:
+- path: api-service/deployment-patch.yaml
+- path: pipelines-ui/deployment-patch.yaml
+- path: pipelines-ui/configmap-patch.yaml
+- path: scheduled-workflow/deployment-patch.yaml
+- path: viewer-controller/deployment-patch.yaml
+- path: persistence-agent/deployment-patch.yaml
+- path: metadata-writer/deployment-patch.yaml
+- path: cache/deployment-patch.yaml
 
 configurations:
 - params.yaml
diff --git a/manifests/kustomize/base/metadata/overlays/db/kustomization.yaml b/manifests/kustomize/base/metadata/overlays/db/kustomization.yaml
@@ -2,15 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 
-bases:
-- ../../base
 resources:
+- ../../base
 - metadata-db-pvc.yaml
 - metadata-db-deployment.yaml
 - metadata-db-service.yaml
 
-patchesStrategicMerge:
-- patches/metadata-grpc-deployment.yaml
+patches:
+- path: patches/metadata-grpc-deployment.yaml
 
 configMapGenerator:
 - name: metadata-db-parameters

diff --git a/manifests/kustomize/base/metadata/overlays/postgres/kustomization.yaml b/manifests/kustomize/base/metadata/overlays/postgres/kustomization.yaml
@@ -2,15 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 
-bases:
-- ../../base
 resources:
+- ../../base
 - metadata-db-pvc.yaml
 - metadata-db-deployment.yaml
 - metadata-db-service.yaml
 
-patchesStrategicMerge:
-- patches/metadata-grpc-deployment.yaml
+patches:
+- path: patches/metadata-grpc-deployment.yaml
 
 configMapGenerator:
 - name: metadata-postgres-db-parameters

diff --git a/manifests/kustomize/base/pipeline/kfp-launcher-configmap.yaml b/manifests/kustomize/base/pipeline/kfp-launcher-configmap.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: kfp-launcher
 data:
-   defaultPipelineRoot: $(kfp-default-pipeline-root)
+  defaultPipelineRoot: $(kfp-default-pipeline-root)
diff --git a/manifests/kustomize/base/pipeline/kustomization.yaml b/manifests/kustomize/base/pipeline/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-  - metadata-writer
+
 resources:
+  - metadata-writer
   - ml-pipeline-apiserver-deployment.yaml
   - ml-pipeline-apiserver-role.yaml
   - ml-pipeline-apiserver-rolebinding.yaml

diff --git a/manifests/kustomize/base/postgresql/cache/kustomization.yaml b/manifests/kustomize/base/postgresql/cache/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
+resources:
 - ../../cache
-patchesStrategicMerge:
-- cache-deployment-patch.yaml
+patches:
+- path: cache-deployment-patch.yaml
diff --git a/manifests/kustomize/base/postgresql/pipeline/kustomization.yaml b/manifests/kustomize/base/postgresql/pipeline/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
+resources:
   - ../../pipeline
-patchesStrategicMerge:
-  - ml-pipeline-apiserver-deployment-patch.yaml
+patches:
+  - path: ml-pipeline-apiserver-deployment-patch.yaml
diff --git a/manifests/kustomize/cluster-scoped-resources/kustomization.yaml b/manifests/kustomize/cluster-scoped-resources/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: kubeflow
 
 resources:
 - namespace.yaml
-bases:
 - ../third-party/application/cluster-scoped
 - ../third-party/argo/installs/namespace/cluster-scoped
 - ../base/pipeline/cluster-scoped

diff --git a/...mize/env/aws/aws-configuration-patch.yaml → ...aws/aws-configuration-pipeline-patch.yaml b/...mize/env/aws/aws-configuration-patch.yaml → ...aws/aws-configuration-pipeline-patch.yaml
@@ -1,34 +1,5 @@
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: ml-pipeline-ui
-spec:
-  template:
-    metadata:
-      labels:
-        app: ml-pipeline-ui
-    spec:
-      volumes:
-        - name: config-volume
-          configMap:
-            name: ml-pipeline-ui-configmap
-      containers:
-        - name: ml-pipeline-ui
-          env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: mlpipeline-minio-artifact
-                  key: accesskey
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: mlpipeline-minio-artifact
-                  key: secretkey
-
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   name: ml-pipeline
 spec:
@@ -58,4 +29,4 @@ spec:
                   key: minioServiceRegion
             - name: OBJECTSTORECONFIG_PORT
               value: ""
-          name: ml-pipeline-api-server
+          name: ml-pipeline-api-server
diff --git a/manifests/kustomize/env/aws/aws-configuration-pipeline-ui-patch.yaml b/manifests/kustomize/env/aws/aws-configuration-pipeline-ui-patch.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ml-pipeline-ui
+spec:
+  template:
+    metadata:
+      labels:
+        app: ml-pipeline-ui
+    spec:
+      volumes:
+        - name: config-volume
+          configMap:
+            name: ml-pipeline-ui-configmap
+      containers:
+        - name: ml-pipeline-ui
+          env:
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: mlpipeline-minio-artifact
+                  key: accesskey
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: mlpipeline-minio-artifact
+                  key: secretkey
diff --git a/manifests/kustomize/env/aws/kustomization.yaml b/manifests/kustomize/env/aws/kustomization.yaml
@@ -1,31 +1,32 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-bases:
-- ../../env/platform-agnostic
+resources:
+  - ../../env/platform-agnostic
 configMapGenerator:
-- name: pipeline-install-config
-  env: params.env
-  behavior: merge
-- name: workflow-controller-configmap
-  behavior: replace
-  files:
-  - config
-- name: ml-pipeline-ui-configmap
-  behavior: replace
-  files:
-  - viewer-pod-template.json
+  - name: pipeline-install-config
+    env: params.env
+    behavior: merge
+  - name: workflow-controller-configmap
+    behavior: replace
+    files:
+      - config
+  - name: ml-pipeline-ui-configmap
+    behavior: replace
+    files:
+      - viewer-pod-template.json
 secretGenerator:
-- name: mysql-secret
-  env: secret.env
-  behavior: merge
-- name: mlpipeline-minio-artifact
-  env: minio-artifact-secret-patch.env
-  behavior: merge
+  - name: mysql-secret
+    env: secret.env
+    behavior: merge
+  - name: mlpipeline-minio-artifact
+    env: minio-artifact-secret-patch.env
+    behavior: merge
 generatorOptions:
   disableNameSuffixHash: true
-patchesStrategicMerge:
-- aws-configuration-patch.yaml
+patches:
+  - path: aws-configuration-pipeline-patch.yaml
+  - path: aws-configuration-pipeline-ui-patch.yaml
 # Identifier for application manager to apply ownerReference.
 # The ownerReference ensures the resources get garbage collected
 # when application is deleted.

diff --git a/manifests/kustomize/env/azure/kustomization.yaml b/manifests/kustomize/env/azure/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 
-bases:
+resources:
 - ../../base/installs/generic
 - ../../base/metadata/base
 - ../../third-party/argo/installs/namespace

diff --git a/manifests/kustomize/env/cert-manager/cluster-scoped-resources/kustomization.yaml b/manifests/kustomize/env/cert-manager/cluster-scoped-resources/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-bases:
+resources:
 - ../../../third-party/application/cluster-scoped
 - ../../../third-party/argo/installs/namespace/cluster-scoped
 - ../../../base/pipeline/cluster-scoped