Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(backend): remove usage of deprecated commonLabels in Kustomize manifests #11289

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions manifests/kustomize/base/cache-deployer/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ 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
application-crd-id: kubeflow-pipelines
6 changes: 4 additions & 2 deletions manifests/kustomize/base/cache/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ resources:
- ../../../cache-deployer
- pipeline-install-config.yaml
- postgres-secret-extended.yaml
labels:
- includeSelectors: true
pairs:
application-crd-id: kubeflow-pipelines
vars:
- name: kfp-namespace
objref:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -31,3 +28,8 @@ patches:

configurations:
- params.yaml
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/component: ml-pipeline
app.kubernetes.io/name: kubeflow-pipelines
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions manifests/kustomize/base/postgresql/cache/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ resources:
- ../../cache
patches:
- path: cache-deployment-patch.yaml
labels:
- includeSelectors: true
pairs:
application-crd-id: kubeflow-pipelines
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ resources:
- ../../pipeline
patches:
- path: ml-pipeline-apiserver-deployment-patch.yaml
labels:
- includeSelectors: true
pairs:
application-crd-id: kubeflow-pipelines
6 changes: 4 additions & 2 deletions manifests/kustomize/env/aws/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions manifests/kustomize/env/azure/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions manifests/kustomize/env/cert-manager/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 5 additions & 7 deletions manifests/kustomize/env/dev/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 5 additions & 7 deletions manifests/kustomize/env/dev/postgresql/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 5 additions & 7 deletions manifests/kustomize/env/gcp/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -30,3 +24,7 @@ configMapGenerator:
- name: pipeline-install-config
env: params.env
behavior: merge
labels:
- includeSelectors: true
pairs:
application-crd-id: kubeflow-pipelines
10 changes: 4 additions & 6 deletions manifests/kustomize/env/plain-multi-user/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions manifests/kustomize/sample/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonLabels:
"app.kubernetes.io/part-of": "dex"
resources:
- dex-cm.yaml
- dex-role.yaml
- dex-sa.yaml
- dex-rb.yaml
- dex-deploy.yaml
- dev-svc.yaml
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/part-of: dex
Original file line number Diff line number Diff line change
Expand Up @@ -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
# Upstream file: https://github.com/metacontroller/metacontroller/blob/master/manifests/production/metacontroller-crds-v1.yaml
Loading