From 2ac97d120f866c48898c3c4328806047ee0486af Mon Sep 17 00:00:00 2001 From: etheleon Date: Wed, 16 Oct 2024 10:15:10 +0800 Subject: [PATCH] :wrench: Replace commonLabels with labels and selectors Used `kustomize edit fix --vars` Signed-off-by: etheleon --- .../base/cache-deployer/kustomization.yaml | 6 +++-- .../kustomize/base/cache/kustomization.yaml | 6 +++-- .../multi-user/cache/kustomization.yaml | 6 +++-- .../installs/multi-user/kustomization.yaml | 8 ++++--- .../kustomization.yaml | 8 ++++--- .../pipelines-ui/kustomization.yaml | 6 +++-- .../kustomize/env/aws/kustomization.yaml | 6 +++-- .../kustomize/env/azure/kustomization.yaml | 6 +++-- .../env/cert-manager/base/kustomization.yaml | 8 ++++--- .../kustomize/env/dev/kustomization.yaml | 8 ++++--- .../env/dev/postgresql/kustomization.yaml | 8 ++++--- .../kustomize/env/gcp/kustomization.yaml | 24 ++++++++++--------- .../env/plain-multi-user/kustomization.yaml | 6 +++-- .../kustomization.yaml | 6 +++-- .../kustomization.yaml | 6 +++-- .../kustomization.yaml | 8 ++++--- manifests/kustomize/sample/kustomization.yaml | 8 +++++-- .../quick-start/sso/dex/kustomization.yaml | 6 +++-- .../metacontroller/base/kustomization.yaml | 8 ++++--- 19 files changed, 94 insertions(+), 54 deletions(-) diff --git a/manifests/kustomize/base/cache-deployer/kustomization.yaml b/manifests/kustomize/base/cache-deployer/kustomization.yaml index c34e0e80acdd..bc3be7e73118 100644 --- 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 index e530e519d65d..c29b030007be 100644 --- 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/multi-user/cache/kustomization.yaml b/manifests/kustomize/base/installs/multi-user/cache/kustomization.yaml index ec4dfa886042..71117ae04ace 100644 --- 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 index cca7b491c0fa..33c4127f0af6 100644 --- 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 index 6ed73f19874a..5caf61f2a96e 100644 --- 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 index c84d97c05c52..a607fb9fa33d 100644 --- 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/env/aws/kustomization.yaml b/manifests/kustomize/env/aws/kustomization.yaml index c3f3ab9afc15..5fe3e2a8703d 100644 --- 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 index 3bc71cfdf7e5..eb70f6c1a133 100644 --- 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 index 14cacd93162d..0dfef84f438d 100644 --- 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 index acb58bd4b293..687112b09b2d 100644 --- a/manifests/kustomize/env/dev/kustomization.yaml +++ b/manifests/kustomize/env/dev/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 - ../platform-agnostic @@ -11,9 +11,11 @@ resources: # 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 index 2a6c495d086c..f3546dcf22ca 100644 --- a/manifests/kustomize/env/dev/postgresql/kustomization.yaml +++ b/manifests/kustomize/env/dev/postgresql/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 - ../../platform-agnostic-postgresql @@ -11,9 +11,11 @@ resources: # 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 index d4a81b02415b..220f9899a019 100644 --- a/manifests/kustomize/env/gcp/kustomization.yaml +++ b/manifests/kustomize/env/gcp/kustomization.yaml @@ -1,22 +1,20 @@ 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 @@ -30,3 +28,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 index 47c8daea9cf7..f3c3bc80467c 100644 --- a/manifests/kustomize/env/plain-multi-user/kustomization.yaml +++ b/manifests/kustomize/env/plain-multi-user/kustomization.yaml @@ -14,9 +14,11 @@ resources: # 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 index e9f79980472b..6a418e436453 100644 --- a/manifests/kustomize/env/platform-agnostic-multi-user-legacy/kustomization.yaml +++ b/manifests/kustomize/env/platform-agnostic-multi-user-legacy/kustomization.yaml @@ -15,9 +15,11 @@ resources: # 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 index 0abc5ed4dd39..64f8ef01688a 100644 --- a/manifests/kustomize/env/platform-agnostic-multi-user/kustomization.yaml +++ b/manifests/kustomize/env/platform-agnostic-multi-user/kustomization.yaml @@ -15,9 +15,11 @@ resources: # 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-tekton-multi-user/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-tekton-multi-user/kustomization.yaml index 9c6389a415de..9faf4cf25185 100644 --- a/manifests/kustomize/env/platform-agnostic-tekton-multi-user/kustomization.yaml +++ b/manifests/kustomize/env/platform-agnostic-tekton-multi-user/kustomization.yaml @@ -9,8 +9,6 @@ resources: # 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 @@ -65,4 +63,8 @@ patches: - name: ml-pipeline-ui env: - name: POD_LOG_CONTAINER_NAME - value: step-user-main \ No newline at end of file + value: step-user-main +labels: +- includeSelectors: true + pairs: + application-crd-id: kubeflow-pipelines diff --git a/manifests/kustomize/sample/kustomization.yaml b/manifests/kustomize/sample/kustomization.yaml index 6c4d0666a190..2725ec0e4acc 100644 --- a/manifests/kustomize/sample/kustomization.yaml +++ b/manifests/kustomize/sample/kustomization.yaml @@ -14,8 +14,6 @@ resources: # 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 # Used by Kustomize configMapGenerator: @@ -36,3 +34,9 @@ namespace: kubeflow # 2. Change values in params-db-secret.env file for CloudSQL username and password # 3. kustomize build ./ | kubectl apply -f - #### +labels: + - includeSelectors: true + pairs: + application-crd-id: kubeflow-pipelines + + diff --git a/manifests/kustomize/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml b/manifests/kustomize/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml index 8ea85c17de05..ce69999dba73 100644 --- a/manifests/kustomize/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml +++ b/manifests/kustomize/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - "app.kubernetes.io/part-of": "dex" resources: - dex-cm.yaml - dex-role.yaml @@ -9,3 +7,7 @@ resources: - dex-rb.yaml - dex-deploy.yaml - dev-svc.yaml +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/part-of: dex diff --git a/manifests/kustomize/third-party/metacontroller/base/kustomization.yaml b/manifests/kustomize/third-party/metacontroller/base/kustomization.yaml index 9b16b60c1572..4c73af828645 100644 --- a/manifests/kustomize/third-party/metacontroller/base/kustomization.yaml +++ b/manifests/kustomize/third-party/metacontroller/base/kustomization.yaml @@ -6,9 +6,11 @@ resources: - crd.yaml - service-account.yaml - stateful-set.yaml -commonLabels: - kustomize.component: metacontroller +labels: + - includeSelectors: true + pairs: + kustomize.component: metacontroller # Update metacontroller CRD: # Copy the upstream file to crd.yaml in this folder. -# Upstream file: https://github.com/metacontroller/metacontroller/blob/master/manifests/production/metacontroller-crds-v1.yaml \ No newline at end of file +# Upstream file: https://github.com/metacontroller/metacontroller/blob/master/manifests/production/metacontroller-crds-v1.yaml