Merge pull request #52 from ndustrialio/fix-anno-2

fix annotation render issue
ndustrialio · Aug 22, 2022 · d636f56 · d636f56
2 parents 7aa1a08 + 2dfa4b9
commit d636f56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ndustrial/deployment/Chart.yaml b/ndustrial/deployment/Chart.yaml
@@ -4,6 +4,7 @@ description: A Helm chart for deploying k8s deployment
 type: application
 dependencies:
   - name: common
+    # repository: file://../common
     repository: https://ndustrialio.github.io/charts
     version: ~0.2.15
     tags:
@@ -12,5 +13,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.33
-appVersion: 0.1.33
+version: 0.1.34
+appVersion: 0.1.34
diff --git a/ndustrial/deployment/templates/svc.yaml b/ndustrial/deployment/templates/svc.yaml
@@ -10,11 +10,13 @@ metadata:
     {{- end }}
   {{- if or .Values.annotations .Values.service.annotations }}
   annotations:
-  {{- with .Values.annotations }}
-  {{- toYaml . | nindent 4 }}
+  {{- if .Values.annotations }}
+  {{- include "nio-common.tplvalues.render" ( dict "value" .Values.annotations "context" $ ) | nindent 4 }}
   {{- end }}
+  {{- if .Values.service.annotations }}
   {{- include "nio-common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }}
   {{- end }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }}

diff --git a/ndustrial/statefulset/Chart.yaml b/ndustrial/statefulset/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.30
-appVersion: 0.1.30
+version: 0.1.31
+appVersion: 0.1.31
diff --git a/ndustrial/statefulset/templates/svc.yaml b/ndustrial/statefulset/templates/svc.yaml
@@ -10,11 +10,13 @@ metadata:
     {{- end }}
   {{- if or .Values.annotations .Values.service.annotations }}
   annotations:
-  {{- with .Values.annotations }}
-  {{- toYaml . | nindent 4 }}
+  {{- if .Values.annotations }}
+  {{- include "nio-common.tplvalues.render" ( dict "value" .Values.annotations "context" $ ) | nindent 4 }}
   {{- end }}
+  {{- if .Values.service.annotations }}
   {{- include "nio-common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }}
   {{- end }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }}