fix helm2 compatibility and ingress with tls

Author: a60814billy

charts/codimd/Chart.yaml

@@ -20,7 +20,7 @@ kubeVersion: ">=1.14.0-0"
 
 # 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.
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/codimd/templates/NOTES.txt

@@ -14,8 +14,8 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
       Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "codimd.fullname" . }} '
 {{ else if .Values.ingress.enabled }}
   {{ if .Values.ingress.tlsSecret }}
-  Your CodiMD is located in: http://{{ .Values.ingress.hostname }}/
-  {{ else }}
   Your CodiMD is located in: https://{{ .Values.ingress.hostname }}/
+  {{ else }}
+  Your CodiMD is located in: http://{{ .Values.ingress.hostname }}/
   {{ end }}
 {{ end }}

charts/codimd/templates/_helpers.tpl

@@ -117,28 +117,24 @@ Helm 2.11 supports the assignment of a value to a variable defined in a differen
 but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
 */}}
 {{- if .Values.global -}}
-    {{- if .Values.global.storageClass -}}
-        {{- if (eq "-" .Values.global.storageClass) -}}
-            {{- printf "storageClassName: \"\"" -}}
-        {{- else }}
-            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
-        {{- end -}}
-    {{- else -}}
-        {{- if .Values.codimd.imageStorePersistentVolume.storageClass -}}
-              {{- if (eq "-" .Values.codimd.imageStorePersistentVolume.storageClass) -}}
-                  {{- printf "storageClassName: \"\"" -}}
-              {{- else }}
-                  {{- printf "storageClassName: %s" .Values.codimd.imageStorePersistentVolume.storageClass -}}
-              {{- end -}}
-        {{- end -}}
+  {{- if .Values.global.storageClass -}}
+    {{- if (eq "-" .Values.global.storageClass) -}}
+      {{- printf "storageClassName: \"\"" -}}
+    {{- else }}
+      {{- printf "storageClassName: %s" .Values.global.storageClass -}}
     {{- end -}}
-{{- else -}}
-    {{- if .Values.codimd.imageStorePersistentVolume.storageClass -}}
-        {{- if (eq "-" .Values.codimd.imageStorePersistentVolume.storageClass) -}}
-            {{- printf "storageClassName: \"\"" -}}
-        {{- else }}
-            {{- printf "storageClassName: %s" .Values.codimd.imageStorePersistentVolume.storageClass -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
+  {{- end -}}
+{{- else if .Values.storageClass -}}
+  {{- if (eq "-" .Values.storageClass) -}}
+    {{- printf "storageClassName: \"\"" -}}
+  {{- else }}
+    {{- printf "storageClassName: %s" .Values.storageClass -}}
+  {{- end -}}
+{{- else if .Values.codimd.imageStorePersistentVolume.storageClass -}}
+  {{- if (eq "-" .Values.codimd.imageStorePersistentVolume.storageClass) -}}
+    {{- printf "storageClassName: \"\"" -}}
+  {{- else }}
+    {{- printf "storageClassName: %s" .Values.codimd.imageStorePersistentVolume.storageClass -}}
+  {{- end -}}
 {{- end -}}
+{{- end -}}

charts/codimd/templates/ingress.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ template "codimd.fullname" . }}
   {{ if .Values.ingress.annotation}}
   annotations:
-    {{ .Values.ingress.annotation | nindent 4 }}
+    {{ toYaml .Values.ingress.annotation | nindent 4 }}
   {{ end }}
 spec:
   rules:
@@ -17,7 +17,8 @@ spec:
               servicePort: 80
   {{ if .Values.ingress.tlsSecret }}
   tls:
-    - hosts: {{ .Values.ingress.hostname }}
+    - hosts:
+        - {{ .Values.ingress.hostname }}
       secretName: {{ .Values.ingress.tlsSecret }}
   {{ end }}
   {{ end }}