🔧 Replace commonLabels with labels and selectors

Used `kustomize edit fix  --vars`

Signed-off-by: etheleon <[email protected]>

manifests/kustomize/base/cache-deployer/kustomization.yaml

@@ -4,8 +4,10 @@ resources:
   - cache-deployer-role.yaml
   - cache-deployer-rolebinding.yaml
   - cache-deployer-deployment.yaml
-commonLabels:
-  app: cache-deployer
 images:
   - name: gcr.io/ml-pipeline/cache-deployer
     newTag: 2.3.0
+labels:
+  - includeSelectors: true
+    pairs:
+      app: cache-deployer

manifests/kustomize/base/cache/kustomization.yaml

@@ -6,8 +6,10 @@ resources:
   - cache-rolebinding.yaml
   - cache-sa.yaml
   - cache-service.yaml
-commonLabels:
-  app: cache-server
 images:
   - name: gcr.io/ml-pipeline/cache-server
     newTag: 2.3.0
+labels:
+  - includeSelectors: true
+    pairs:
+      app: cache-server

manifests/kustomize/base/installs/multi-user/cache/kustomization.yaml

@@ -1,7 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-commonLabels:
-  app: cache-server
 resources:
 - cluster-role.yaml
 - cluster-role-binding.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: cache-server

manifests/kustomize/base/installs/multi-user/kustomization.yaml

@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-commonLabels:
-  app.kubernetes.io/name: kubeflow-pipelines
-  app.kubernetes.io/component: ml-pipeline
 resources:
 - ../../pipeline/cluster-scoped
 - ../../cache-deployer/cluster-scoped
@@ -31,3 +28,8 @@ patches:
 
 configurations:
 - params.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: ml-pipeline
+    app.kubernetes.io/name: kubeflow-pipelines

manifests/kustomize/base/installs/multi-user/pipelines-profile-controller/kustomization.yaml

@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-commonLabels:
-  app: kubeflow-pipelines-profile-controller
 resources:
 - service.yaml
 - deployment.yaml
@@ -13,4 +11,8 @@ configMapGenerator:
   - sync.py
 - name: kubeflow-pipelines-profile-controller-env
   envs:
-  - params.env
+    - sync.py
+labels:
+- includeSelectors: true
+  pairs:
+    app: kubeflow-pipelines-profile-controller

manifests/kustomize/base/installs/multi-user/pipelines-ui/kustomization.yaml

@@ -1,8 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
-commonLabels:
-  app: ml-pipeline-ui
 resources:
 - cluster-role.yaml
 - cluster-role-binding.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: ml-pipeline-ui

manifests/kustomize/env/aws/kustomization.yaml

@@ -30,5 +30,7 @@ patches:
 # 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
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/azure/kustomization.yaml

@@ -9,17 +9,21 @@ resources:
 - minio-azure-gateway
 
 configMapGenerator:
-- name: pipeline-install-config
-  env: params.env
-  behavior: merge
+- behavior: merge
+  envs:
+  - params.env
+  name: pipeline-install-config
 
 secretGenerator:
-- name: mysql-secret
-  env: mysql-secret.env
-  behavior: merge
+- behavior: merge
+  envs:
+  - mysql-secret.env
+  name: mysql-secret
 
 # 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
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/cert-manager/base/kustomization.yaml

@@ -1,13 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kubeflow 
+namespace: kubeflow
 
 resources:
-  - cache-cert-issuer.yaml
-  - cache-cert.yaml
-  - cache-webhook-config.yaml
-commonLabels:
-  app: cache-server-cert-manager
+- cache-cert-issuer.yaml
+- cache-cert.yaml
+- cache-webhook-config.yaml
 
 configurations:
 - params.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: cache-server-cert-manager

manifests/kustomize/env/dev/kustomization.yaml

@@ -1,19 +1,21 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
-  - ../../third-party/application
-  - ../../base/application
-  - ../platform-agnostic
-  - ../gcp/inverse-proxy
+resources:
+- ../../third-party/application
+- ../../base/application
+- ../platform-agnostic
+- ../gcp/inverse-proxy
 
 # 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 refer sample/cluster-scoped-resources to update the namespace for cluster-scoped-resources
 namespace: kubeflow
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/dev/postgresql/kustomization.yaml

@@ -1,19 +1,21 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
-  - ../../../third-party/application
-  - ../../../base/application
-  - ../../platform-agnostic-postgresql
-  - ../../gcp/inverse-proxy
+resources:
+- ../../../third-party/application
+- ../../../base/application
+- ../../platform-agnostic-postgresql
+- ../../gcp/inverse-proxy
 
 # 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 refer sample/cluster-scoped-resources to update the namespace for cluster-scoped-resources
 namespace: kubeflow
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/gcp/kustomization.yaml

@@ -1,32 +1,35 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
-  - ../../third-party/application
-  - ../../base/application
-  - ../../base/installs/generic
-  - ../../base/metadata/base
-  - ../../third-party/argo/installs/namespace
-  - inverse-proxy
-  - minio-gcs-gateway
-  - cloudsql-proxy
+resources:
+- ../../third-party/application
+- ../../base/application
+- ../../base/installs/generic
+- ../../base/metadata/base
+- ../../third-party/argo/installs/namespace
+- inverse-proxy
+- minio-gcs-gateway
+- cloudsql-proxy
 
 # 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
 
 patches:
-  - path: gcp-configurations-patch.yaml
+- path: gcp-configurations-patch.yaml
 
 # Used by Kustomize
 configMapGenerator:
-  - name: pipeline-install-config
-    env: params.env
-    behavior: merge
+- behavior: merge
+  envs:
+  - params.env
+  name: pipeline-install-config
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/plain-multi-user/kustomization.yaml

@@ -2,21 +2,23 @@ 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
+- ../../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
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/platform-agnostic-multi-user-legacy/kustomization.yaml

@@ -2,22 +2,24 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../third-party/metacontroller/base
-  - ../../base/installs/multi-user
-  - ../../base/metadata/overlays/db
-  - ../../base/metadata/options/istio
-  - ../../third-party/argo/installs/cluster
-  - ../../third-party/mysql/base
-  - ../../third-party/mysql/options/istio
-  - ../../third-party/minio/base
-  - ../../third-party/minio/options/istio
+- ../../third-party/metacontroller/base
+- ../../base/installs/multi-user
+- ../../base/metadata/overlays/db
+- ../../base/metadata/options/istio
+- ../../third-party/argo/installs/cluster
+- ../../third-party/mysql/base
+- ../../third-party/mysql/options/istio
+- ../../third-party/minio/base
+- ../../third-party/minio/options/istio
 
 # 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
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/platform-agnostic-multi-user/kustomization.yaml

@@ -2,22 +2,24 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../third-party/metacontroller/base
-  - ../../base/installs/multi-user
-  - ../../base/metadata/base
-  - ../../base/metadata/options/istio
-  - ../../third-party/argo/installs/cluster
-  - ../../third-party/mysql/base
-  - ../../third-party/mysql/options/istio
-  - ../../third-party/minio/base
-  - ../../third-party/minio/options/istio
+- ../../third-party/metacontroller/base
+- ../../base/installs/multi-user
+- ../../base/metadata/base
+- ../../base/metadata/options/istio
+- ../../third-party/argo/installs/cluster
+- ../../third-party/mysql/base
+- ../../third-party/mysql/options/istio
+- ../../third-party/minio/base
+- ../../third-party/minio/options/istio
 
 # 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
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines

manifests/kustomize/env/platform-agnostic-postgresql/kustomization.yaml

@@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../base/installs/generic/postgres
-  - ../../base/metadata/overlays/postgres
-  - ../../third-party/argo/installs/namespace
-  - ../../third-party/minio/base
-  - ../../third-party/postgresql/base
+- ../../base/installs/generic/postgres
+- ../../base/metadata/overlays/postgres
+- ../../third-party/argo/installs/namespace
+- ../../third-party/minio/base
+- ../../third-party/postgresql/base
 
 # !!! If you want to customize the namespace,
 # please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml