(cherrypick): fix(manifest): update manifests for proper third party …

…app role (#1352) (#1353)
kubeflow · Oct 2, 2023 · 2132d49 · 2132d49
1 parent 5b6afdb
commit 2132d49
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 15 deletions.
diff --git a/manifests/kustomize/env/plain-multi-user/kustomization.yaml b/manifests/kustomize/env/plain-multi-user/kustomization.yaml
@@ -0,0 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base/installs/multi-user
+  - ../../base/metadata/base
+  - ../../base/metadata/options/istio
+  - ../../third-party/mysql/base
+  - ../../third-party/mysql/options/istio
+  - ../../third-party/minio/base
+  - ../../third-party/minio/options/istio
+  - ../../third-party/metacontroller/base
+
+# Identifier for application manager to apply ownerReference.
+# The ownerReference ensures the resources get garbage collected
+# when application is deleted.
+commonLabels:
+  application-crd-id: kubeflow-pipelines
+
+# !!! If you want to customize the namespace,
+# please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml
+namespace: kubeflow
diff --git a/manifests/kustomize/env/plain/kustomization.yaml b/manifests/kustomize/env/plain/kustomization.yaml
@@ -0,0 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base/installs/generic
+  - ../../base/metadata/base
+  - ../../third-party/minio/base
+  - ../../third-party/mysql/base
+
+# Identifier for application manager to apply ownerReference.
+# The ownerReference ensures the resources get garbage collected
+# when application is deleted.
+commonLabels:
+  application-crd-id: kubeflow-pipelines
+
+# !!! If you want to customize the namespace,
+# please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml
+namespace: kubeflow
diff --git a/manifests/kustomize/env/platform-agnostic-tekton-multi-user/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-tekton-multi-user/kustomization.yaml
@@ -1,18 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-bases:
-  - ../../base/installs/multi-user
-  - ../../base/metadata/base
-  - ../../base/metadata/options/istio
+resources:
   - ../../third-party/tekton/installs/cluster
   - ../../third-party/tekton-custom-task
-  - ../../third-party/mysql/base
-  - ../../third-party/mysql/options/istio
-  - ../../third-party/minio/base
-  - ../../third-party/minio/options/istio
-  - ../../third-party/metacontroller/base
-  # - ../../third-party/kfp-csi-s3
+  - ../plain-multi-user
 
 # Identifier for application manager to apply ownerReference.
 # The ownerReference ensures the resources get garbage collected

diff --git a/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml
@@ -2,13 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- ../../base/installs/generic
-- ../../base/metadata/base
 - ../../third-party/tekton/installs/cluster
 - ../../third-party/tekton-custom-task
-- ../../third-party/minio/base
-- ../../third-party/mysql/base
-# - ../../third-party/kfp-csi-s3
+- ../plain
 
 # Identifier for application manager to apply ownerReference.
 # The ownerReference ensures the resources get garbage collected