README.md

@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the Lib chart and their
 | `autoscaling.targetCPUUtilizationPercentage` |  | `80` |
 | `secrets` | Secrets that needs to be created | `{}` |
 | `configs` | ConfigMaps that needs to be created | `{}` |
-| `env` | environment variables the controller should have | `[{"name": "TZ", "value": "Europe/Stockholm"}]` |
+| `env.TZ` |  | `"Europe/Stockholm"` |
 | `volumes` |  | `[]` |
 | `volumeMounts` |  | `[]` |
 | `volumeClaimTemplates` | used for statefulset https://kubernetes.io/docs/concepts/workloads/controllers/statefulset | `[]` |

templates/_deployment.tpl

@@ -44,23 +44,18 @@ spec:
           {{- range $k, $v := $values.ports }}
             - name: {{ $k }}
               containerPort: {{ default $v.port $v.targetPort }}
+              protocol: {{ default "HTTP" $v.protocol }}
           {{- end -}}
           {{- end -}}
           {{- end }}
           env:
             {{- include "lib.environmentVariables" . | default "[]" | nindent 12 }}
-          {{- with .Values.livenessProbe }}
           livenessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          {{- end }}
-          {{- with .Values.readinessProbe }}
           readinessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          {{- end }}
-          {{- with .Values.resources }}
           resources:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.resources | nindent 12 }}
-          {{- end }}
           {{- with .Values.volumeMounts }}
           volumeMounts:
             {{- toYaml . | nindent 12 }}

templates/_service.tpl

@@ -19,7 +19,7 @@ spec:
   {{- range $k, $v := $values.ports }}
     - port: {{ $v.port }}
       targetPort: {{ default $v.port $v.targetPort }}
-      protocol: {{ default "TCP" $v.protocol }}
+      protocol: {{ default "HTTP" $v.protocol }}
       name: {{ $k }}
   {{- end }}
   selector:

templates/_statefulset.tpl

@@ -46,24 +46,18 @@ spec:
           {{- range $k, $v := $values.ports }}
             - name: {{ $k }}
               containerPort: {{ $v.targetPort | default $v.port }}
-              protocol: {{ default "TCP" $v.protocol }}
+              protocol: {{ $v.protocol }}
           {{- end -}}
           {{- end -}}
           {{- end }}
           env:
             {{- include "lib.environmentVariables" . | default "[]" | nindent 12 }}
-          {{- with .Values.livenessProbe }}
           livenessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          {{- end }}
-          {{- with .Values.readinessProbe }}
           readinessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          {{- end }}
-          {{- with .Values.resources }}
           resources:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.resources | nindent 12 }}
-          {{- end }}
           volumeMounts:
             {{- range $i, $values := .Values.volumeClaimTemplates }}
             - name: {{ $values.name }}

values.yaml

@@ -99,8 +99,7 @@ configs: {} # ConfigMaps that needs to be created
 #        KEY: VALUE
 
 env:  # environment variables the controller should have
-  - name: TZ
+  TZ: Europe/Stockholm
-    value: Europe/Stockholm
 # Additional volumes on the output Deployment definition.
 volumes: []
 # - name: foo