fix comments

kubeflow · Jan 15, 2025 · cc8d65c · cc8d65c
1 parent c53d0fc
commit cc8d65c
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 22 deletions.
diff --git a/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml b/manifests/kustomize/base/cache-deployer/cache-deployer-deployment.yaml
@@ -4,12 +4,10 @@ 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,7 +3,6 @@ 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,8 +2,6 @@ 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
@@ -11,3 +11,4 @@ labels:
   - includeSelectors: true
     pairs:
       app: cache-deployer
+      application-crd-id: kubeflow-pipelines
diff --git a/manifests/kustomize/base/installs/generic/postgres/kustomization.yaml b/manifests/kustomize/base/installs/generic/postgres/kustomization.yaml
@@ -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:

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,8 +2,6 @@ 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,8 +2,6 @@ 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/postgresql/cache/cache-deployment-patch.yaml b/manifests/kustomize/base/postgresql/cache/cache-deployment-patch.yaml
@@ -2,12 +2,7 @@ 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/cache/kustomization.yaml b/manifests/kustomize/base/postgresql/cache/kustomization.yaml
@@ -4,3 +4,7 @@ resources:
 - ../../cache
 patches:
 - path: cache-deployment-patch.yaml
+labels:
+- includeSelectors: true
+  pairs: 
+    application-crd-id: kubeflow-pipelines
diff --git a/manifests/kustomize/base/postgresql/pipeline/kustomization.yaml b/manifests/kustomize/base/postgresql/pipeline/kustomization.yaml
@@ -4,3 +4,7 @@ resources:
   - ../../pipeline
 patches:
   - path: ml-pipeline-apiserver-deployment-patch.yaml
+labels:
+  - includeSelectors: true
+    pairs:
+      application-crd-id: kubeflow-pipelines
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,16 +2,8 @@ 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