🔧 Replace commonLabels with labels and selectors

Used `kustomize edit fix --vars` Signed-off-by: etheleon <[email protected]>
kubeflow · Nov 6, 2024 · c53d0fc · c53d0fc
1 parent 391de8c
commit c53d0fc
Show file tree

Hide file tree

Showing 28 changed files with 108 additions and 88 deletions.
diff --git a/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml b/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml
@@ -4,10 +4,12 @@ metadata:
   name: cache-deployer-deployment
   labels:
     app: cache-deployer
+    application-crd-id: kubeflow-pipelines
 spec:
   replicas: 1
   selector:
     matchLabels:
+      application-crd-id: kubeflow-pipelines
       app: cache-deployer
   strategy:
     type: Recreate

diff --git a/manifests/kustomize/base/cache-deployer/cache-deployer-role.yaml b/manifests/kustomize/base/cache-deployer/cache-deployer-role.yaml
@@ -3,6 +3,7 @@ kind: Role
 metadata:
   labels:
     app: kubeflow-pipelines-cache-deployer-role
+    application-crd-id: kubeflow-pipelines
   name: kubeflow-pipelines-cache-deployer-role
 rules:
 - apiGroups:

diff --git a/manifests/kustomize/base/cache-deployer/cache-deployer-rolebinding.yaml b/manifests/kustomize/base/cache-deployer/cache-deployer-rolebinding.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: kubeflow-pipelines-cache-deployer-rolebinding
+  labels:
+    application-crd-id: kubeflow-pipelines
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/kustomize/base/cache-deployer/kustomization.yaml b/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
diff --git a/manifests/kustomize/base/cache/kustomization.yaml b/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
diff --git a/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml b/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: pipeline-install-config
+  labels:
+    application-crd-id: kubeflow-pipelines
 data:
   warning: |
     1. Do not use kubectl to edit this configmap, because some values are used

diff --git a/manifests/kustomize/base/installs/generic/postgres/postgres-secret-extended.yaml b/manifests/kustomize/base/installs/generic/postgres/postgres-secret-extended.yaml
@@ -2,6 +2,8 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: postgres-secret-extended
+  labels:
+    application-crd-id: kubeflow-pipelines
 stringData:
   username: user
   password: "password"
diff --git a/manifests/kustomize/base/installs/multi-user/cache/kustomization.yaml b/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
diff --git a/manifests/kustomize/base/installs/multi-user/kustomization.yaml b/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
diff --git a/manifests/kustomize/base/installs/multi-user/pipelines-profile-controller/kustomization.yaml b/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
+    - params.env
+labels:
+- includeSelectors: true
+  pairs:
+    app: kubeflow-pipelines-profile-controller
diff --git a/manifests/kustomize/base/installs/multi-user/pipelines-ui/kustomization.yaml b/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
diff --git a/manifests/kustomize/base/postgresql/cache/cache-deployment-patch.yaml b/manifests/kustomize/base/postgresql/cache/cache-deployment-patch.yaml
@@ -2,7 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cache-server
+  label:
+    application-crd-id: kubeflow-pipelines
 spec:
+  selector:
+    matchLabels:
+      application-crd-id: kubeflow-pipelines
   template:
     spec:
       containers:

diff --git a/manifests/kustomize/base/postgresql/pipeline/ml-pipeline-apiserver-deployment-patch.yaml b/manifests/kustomize/base/postgresql/pipeline/ml-pipeline-apiserver-deployment-patch.yaml
@@ -2,8 +2,16 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ml-pipeline
+  label:
+    application-crd-id: kubeflow-pipelines
 spec:
+  selector:
+    matchLabels:
+      application-crd-id: kubeflow-pipelines
   template:
+    metadata:
+      label:
+        application-crd-id: kubeflow-pipelines
     spec:
       containers:
       - name: ml-pipeline-api-server

diff --git a/manifests/kustomize/env/aws/kustomization.yaml b/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
diff --git a/manifests/kustomize/env/azure/kustomization.yaml b/manifests/kustomize/env/azure/kustomization.yaml
@@ -21,5 +21,7 @@ secretGenerator:
 # 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
diff --git a/manifests/kustomize/env/cert-manager/base/kustomization.yaml b/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
 
 configurations:
 - params.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: cache-server-cert-manager
diff --git a/manifests/kustomize/env/dev/kustomization.yaml b/manifests/kustomize/env/dev/kustomization.yaml
@@ -1,19 +1,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
+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
diff --git a/manifests/kustomize/env/dev/postgresql/kustomization.yaml b/manifests/kustomize/env/dev/postgresql/kustomization.yaml
@@ -1,19 +1,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
+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
diff --git a/manifests/kustomize/env/gcp/kustomization.yaml b/manifests/kustomize/env/gcp/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
   # Application controller is used to provide Google Cloud Console integration.
+resources:
   - ../../third-party/application
   - ../../base/application
   - ../../base/installs/generic
@@ -12,12 +12,6 @@ resources:
   - 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
@@ -30,3 +24,7 @@ configMapGenerator:
   - name: pipeline-install-config
     env: params.env
     behavior: merge
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines
diff --git a/manifests/kustomize/env/plain-multi-user/kustomization.yaml b/manifests/kustomize/env/plain-multi-user/kustomization.yaml
@@ -11,12 +11,10 @@ resources:
   - ../../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
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-legacy/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-legacy/kustomization.yaml
@@ -12,12 +12,10 @@ resources:
   - ../../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
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user/kustomization.yaml
@@ -12,12 +12,10 @@ resources:
   - ../../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
diff --git a/manifests/kustomize/env/platform-agnostic-postgresql/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-postgresql/kustomization.yaml
@@ -8,12 +8,6 @@ resources:
   - ../../third-party/minio/base
   - ../../third-party/postgresql/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
@@ -6,12 +6,6 @@ resources:
   - ../../third-party/tekton-custom-task
   - ../plain-multi-user
 
-# 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
-
 patches:
 - path: tekton-config.yaml
 - patch: |-
@@ -65,4 +59,8 @@ patches:
             - name: ml-pipeline-ui
               env:
               - name: POD_LOG_CONTAINER_NAME
-                value: step-user-main
+                value: step-user-main
+labels:
+- includeSelectors: true
+  pairs:
+    application-crd-id: kubeflow-pipelines
diff --git a/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml
@@ -6,10 +6,6 @@ resources:
 - ../../third-party/tekton-custom-task
 - ../plain
 
-# Identifier for application manager to apply ownerReference.
-# The ownerReference ensures the resources get garbage collected
-# when application is deleted.
-
 labels:
 - includeSelectors: true
   pairs: