diff --git a/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml b/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml index d4c3ae3a867..95f88099c84 100644 --- 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 index f853a321239..b08fea16b96 100644 --- 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 index 824a95726e6..021f74d657f 100644 --- 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 index c34e0e80acd..bc3be7e7311 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 e530e519d65..c29b030007b 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/generic/postgres/pipeline-install-config.yaml b/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml index fbfa8da41a1..b307e854ea2 100644 --- 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 index b67369ba1c7..95d374810a7 100644 --- 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 index ec4dfa88604..71117ae04ac 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 cca7b491c0f..33c4127f0af 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 6ed73f19874..5caf61f2a96 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 c84d97c05c5..a607fb9fa33 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/base/postgresql/cache/cache-deployment-patch.yaml b/manifests/kustomize/base/postgresql/cache/cache-deployment-patch.yaml index 324925767a9..5f3000be3de 100644 --- 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 index 7d621691c3f..991b0ac86c0 100644 --- 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 index c3f3ab9afc1..5fe3e2a8703 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 3bc71cfdf7e..eb70f6c1a13 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 14cacd93162..0dfef84f438 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 acb58bd4b29..7c080422a90 100644 --- 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 index 2a6c495d086..268ed164a2e 100644 --- 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 index d4a81b02415..db0604646be 100644 --- 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 index 47c8daea9cf..9f4c3042743 100644 --- 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 index e9f79980472..9d66bbf386a 100644 --- 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 index 0abc5ed4dd3..9eda71671fe 100644 --- 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 index c13945a7a6f..d91e46b4917 100644 --- 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 index 9c6389a415d..5a81260d417 100644 --- 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 \ No newline at end of file + 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 index 9ea37762cbf..60435bc6c59 100644 --- 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: diff --git a/manifests/kustomize/sample/kustomization.yaml b/manifests/kustomize/sample/kustomization.yaml index 6c4d0666a19..6aaed4fcab9 100644 --- a/manifests/kustomize/sample/kustomization.yaml +++ b/manifests/kustomize/sample/kustomization.yaml @@ -11,12 +11,6 @@ resources: # - ../third_party/prometheus # - ../third_party/grafana -# 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: - name: pipeline-install-config @@ -36,3 +30,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 8ea85c17de0..ce69999dba7 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 9b16b60c157..4c73af82864 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