fix: Add podLabels to deployment (#139)

evry-ace · Aug 1, 2022 · bb9b5ae · bb9b5ae
1 parent a55d4b5
commit bb9b5ae
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/dotnet/Chart.yaml b/dotnet/Chart.yaml
@@ -4,5 +4,5 @@ name: dotnet
 version: 11.0.1
 dependencies:
   - name: libchart
-    version: 2.0.1
+    version: 2.0.2
     repository: file://../libchart
diff --git a/golang/Chart.yaml b/golang/Chart.yaml
@@ -4,5 +4,5 @@ name: golang
 version: 15.0.1
 dependencies:
   - name: libchart
-    version: 2.0.1
+    version: 2.0.2
     repository: file://../libchart
diff --git a/java/Chart.yaml b/java/Chart.yaml
@@ -4,5 +4,5 @@ name: java
 version: 8.0.1
 dependencies:
   - name: libchart
-    version: 2.0.1
+    version: 2.0.2
     repository: file://../libchart
diff --git a/libchart/Chart.yaml b/libchart/Chart.yaml
@@ -15,7 +15,7 @@ type: library
 # 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: 2.0.1
+version: 2.0.2
 
 # 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

diff --git a/libchart/templates/_deployment.tpl b/libchart/templates/_deployment.tpl
@@ -21,6 +21,9 @@ spec:
       {{- end }}
       labels:
         {{- include "libchart.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+          {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "libchart.pod" . | nindent 6 -}}
 {{- end }}

diff --git a/libchart/templates/_statefulset.tpl b/libchart/templates/_statefulset.tpl
@@ -14,17 +14,16 @@ spec:
       {{- include "libchart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels:
-        {{- include "libchart.labels" . | nindent 8 }}
-        {{- if .Values.podLabels }}
-        {{ toYaml .Values.podLabels | nindent 8 }}
-        {{- end -}}
       {{- if .Values.podAnnotations }}
       annotations:
         {{ toYaml .Values.podAnnotations | nindent 8 }}
       {{- end }}
+      labels:
+        {{- include "libchart.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+          {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
-      spec:
       {{- include "libchart.pod" . | nindent 6 -}}
 {{- end }}
 {{- end }}
diff --git a/nodejs/Chart.yaml b/nodejs/Chart.yaml
@@ -4,5 +4,5 @@ name: nodejs
 version: 15.0.1
 dependencies:
   - name: libchart
-    version: 2.0.1
+    version: 2.0.2
     repository: file://../libchart
diff --git a/web/Chart.yaml b/web/Chart.yaml
@@ -5,5 +5,5 @@ name: web
 version: 12.0.1
 dependencies:
   - name: libchart
-    version: 2.0.1
+    version: 2.0.2
     repository: file://../libchart