Merge branch 'main' into custom-probes

twuni · Aug 9, 2022 · 13eb4cc · 13eb4cc
2 parents a2ac4e0 + f158323
commit 13eb4cc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -116,6 +116,7 @@ their default values.
 | `extraEnvVars`              | Additional environment variables to the pod                                                | `[]`            |
 | `livenessProbe`             | Optional livenessProbe definition                                                          | `nil`           |
 | `readinessProbe`            | Optional readinessProbe definition                                                         | `nil`           |
+| `initContainers`            | Init containers to be created in the pod                                                   | `[]`            |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`.

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -28,7 +28,7 @@ Create a livenessProbe.
 Allow the default value to be completely overriden by an optional value.
 Retain he original livenessProbe logic.
 */}}
-{{- define "livenessProbe" -}}
+{{- define "docker-registry.livenessProbe" -}}
 livenessProbe:
 {{- if .Values.livenessProbe }}
 {{ .Values.livenessProbe | toYaml | indent 2 }}
@@ -47,7 +47,7 @@ Create a readinessProbe.
 Allow the default value to be completely overriden by an optional value.
 Retain he original readinessProbe logic.
 */}}
-{{- define "readinessProbe" -}}
+{{- define "docker-registry.readinessProbe" -}}
 readinessProbe:
 {{- if .Values.readinessProbe }}
 {{ .Values.readinessProbe | toYaml | indent 2 }}

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -48,6 +48,10 @@ spec:
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
+{{- end }}
+{{- with .Values.initContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -64,8 +68,8 @@ spec:
               name: http-metrics
               protocol: TCP
 {{- end }}
-{{ include "livenessProbe" . | indent 10 }}
-{{ include "readinessProbe" . | indent 10 }}
+{{ include "docker-registry.livenessProbe" . | indent 10 }}
+{{ include "docker-registry.readinessProbe" . | indent 10 }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           env:

diff --git a/values.yaml b/values.yaml
@@ -168,8 +168,8 @@ autoscaling:
   minReplicas: 1
   maxReplicas: 2
   targetCPUUtilizationPercentage: 60
-  targetMemoryUtilizationPercentage: 60  # available only on Kubernetes ≥1.23 [required "autoscaling/v2"]
-  behavior: {}  # available only on Kubernetes ≥1.23 [required "autoscaling/v2"]
+  targetMemoryUtilizationPercentage: 60 # available only on Kubernetes ≥1.23 [required "autoscaling/v2"]
+  behavior: {} # available only on Kubernetes ≥1.23 [required "autoscaling/v2"]
 #   scaleDown:
 #     stabilizationWindowSeconds: 300
 #     policies:
@@ -223,3 +223,9 @@ extraEnvVars: []
 # readinessProbe:
 #   tcpSocket:
 #     port: 5000
+
+initContainers: []
+## Init containers to add to the Deployment
+# - name: init
+#   image: busybox
+#   command: []