fix component label selector not works

Author: JaredTan95

charts/cmdb/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/cmdb/templates/_helpers.tpl

@@ -68,3 +68,11 @@ Create the name of the service account to use
 {{- default "default" .Values.api.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "cmdb.api.component" -}}
+component: cmdb-api
+{{- end }}
+
+{{- define "cmdb.ui.component" -}}
+component: cmdb-ui
+{{- end }}

charts/cmdb/templates/api/deployment.yaml

@@ -11,6 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cmdb.labels" . | nindent 6 }}
+      {{- include "cmdb.api.component" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.api.podAnnotations }}
@@ -19,6 +20,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cmdb.labels" . | nindent 8 }}
+        {{- include "cmdb.api.component" . | nindent 8 }}
         {{- with .Values.api.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/cmdb/templates/api/service.yaml

@@ -13,3 +13,4 @@ spec:
       name: http
   selector:
     {{- include "cmdb.selectorLabels" . | nindent 4 }}
+    {{- include "cmdb.api.component" . | nindent 4 }}

charts/cmdb/templates/ui/deployment.yaml

@@ -11,6 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cmdb.labels" . | nindent 6 }}
+      {{- include "cmdb.ui.component" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.ui.podAnnotations }}
@@ -19,6 +20,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cmdb.labels" . | nindent 8 }}
+        {{- include "cmdb.ui.component" . | nindent 8 }}
         {{- with .Values.ui.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/cmdb/templates/ui/service.yaml

@@ -13,3 +13,4 @@ spec:
       name: http
   selector:
     {{- include "cmdb.selectorLabels" . | nindent 4 }}
+    {{- include "cmdb.ui.component" . | nindent 4 }}