optimization: helm charts matchLabels 补充 (closed TencentBlueKing#1024)

ZhuoZhuoCrayon · Aug 30, 2022 · 65315cd · 65315cd
1 parent eae6037
commit 65315cd
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 0 deletions.
diff --git a/dev_log/2.2.22/crayon_202208301930.yaml b/dev_log/2.2.22/crayon_202208301930.yaml
@@ -0,0 +1,3 @@
+---
+optimization:
+  - "helm charts matchLabels 补充 (closed #1024)"
diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-api/deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-api/deployment.yaml
@@ -22,6 +22,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/baworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/baworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/bworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/bworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/...ort-files/kubernetes/helm/bk-nodeman/templates/backend-celery/celery-beat-deployment.yaml b/...ort-files/kubernetes/helm/bk-nodeman/templates/backend-celery/celery-beat-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/...-files/kubernetes/helm/bk-nodeman/templates/backend-celery/common-pworker-deployment.yaml b/...-files/kubernetes/helm/bk-nodeman/templates/backend-celery/common-pworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/...t-files/kubernetes/helm/bk-nodeman/templates/backend-celery/common-worker-deployment.yaml b/...t-files/kubernetes/helm/bk-nodeman/templates/backend-celery/common-worker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/dworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/dworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/paworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/paworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/psworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/psworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/pworker-deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/backend-celery/pworker-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -29,6 +30,7 @@ spec:
       {{- end }}
       labels:
         {{- include "bk-nodeman.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: "{{ $fullName }}"
     spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/saas-api/deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/saas-api/deployment.yaml
@@ -22,6 +22,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/web/deployment.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/web/deployment.yaml
@@ -22,6 +22,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bk-nodeman.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: "{{ $fullName }}"
   template:
     metadata:
       {{- with .Values.podAnnotations }}