[deconz] Fix externalIPs logic, bump app version (#339)

charts/deconz/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: deconz
 description: A Helm chart for deploying deCONZ
-version: 1.0.1
+version: 1.0.2
-appVersion: 2.05.79
+appVersion: 2.05.80
 keywords:
   - deconz
   - home-automation

charts/deconz/templates/NOTES.txt

@@ -14,7 +14,7 @@
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "deconz.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "deconz.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
+  echo http://$SERVICE_IP:{{ $svcPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "deconz.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"

charts/deconz/templates/service.yaml

@@ -4,6 +4,13 @@ metadata:
   name: {{ include "deconz.fullname" . }}
   labels:
     {{- include "deconz.labels" . | nindent 4 }}
+  {{- if .Values.service.labels }}
+    {{ toYaml .Values.service.labels | nindent 4 }}
+  {{- end }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   {{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
   type: ClusterIP
@@ -20,16 +27,25 @@ spec:
   {{- end }}
   {{- if .Values.service.loadBalancerSourceRanges }}
   loadBalancerSourceRanges:
-  {{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+    {{ toYaml .Values.service.loadBalancerSourceRanges | nindent 4 }}
   {{- end -}}
   {{- else }}
-  {{- if .Values.service.externalIPs }}
-  externalIPs:
-  {{ toYaml .Values.service.externalIPs | indent 4 }}
-  {{- end }}
-  publishNotReadyAddresses: {{ .Values.service.publishNotReadyAddresses }}
   type: {{ .Values.service.type }}
   {{- end }}
+  {{- if .Values.service.sessionAffinity }}
+  sessionAffinity: {{ .Values.service.sessionAffinity }}
+  {{- if .Values.service.sessionAffinityConfig }}
+  sessionAffinityConfig:
+    {{ toYaml .Values.service.sessionAffinityConfig | nindent 4 }}
+  {{- end -}}
+  {{- end }}
+  {{- with .Values.service.externalIPs }}
+  externalIPs:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.service.publishNotReadyAddresses }}
+  publishNotReadyAddresses: {{ .Values.service.publishNotReadyAddresses }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.httpPort }}
       targetPort: http

charts/deconz/values.yaml

@@ -13,7 +13,7 @@ image:
   repository: marthoc/deconz
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "amd64-2.05.79"
+  tag: "amd64-2.05.80"
 
 imagePullSecrets: []