From 1b5e3787ea685960b3bf7a5bc69b2ab5997e7712 Mon Sep 17 00:00:00 2001 From: etheleon Date: Sat, 12 Oct 2024 20:23:01 +0800 Subject: [PATCH] :fix: Add labels and selectors for postgresql Signed-off-by: etheleon --- .../base/cache-deployer/cache-deployer-deployment.yaml | 2 ++ .../base/cache-deployer/cache-deployer-role.yaml | 1 + .../base/cache-deployer/cache-deployer-rolebinding.yaml | 2 ++ .../generic/postgres/pipeline-install-config.yaml | 2 ++ .../generic/postgres/postgres-secret-extended.yaml | 4 +++- .../base/postgresql/cache/cache-deployment-patch.yaml | 5 +++++ .../pipeline/ml-pipeline-apiserver-deployment-patch.yaml | 8 ++++++++ .../env/platform-agnostic-postgresql/kustomization.yaml | 6 ------ 8 files changed, 23 insertions(+), 7 deletions(-) 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/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..9f899d8179c 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" + password: "password" \ No newline at end of file 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/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