Merge pull request #1219 from RothAndrew/feature/add_configurable_probes_2

[bitnami/nginx] Add ability to configure Liveness and Readiness Probes (take 2)

bitnami/nginx/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx
-version: 3.2.2
+version: 3.3.0
 appVersion: 1.16.0
 description: Chart for the nginx server
 keywords:

bitnami/nginx/README.md

@@ -77,6 +77,8 @@ The following tables lists the configurable parameters of the NGINX Open Source
 | `ingress.secrets[0].name`        | TLS Secret Name                                  | `nil`                                                        |
 | `ingress.secrets[0].certificate` | TLS Secret Certificate                           | `nil`                                                        |
 | `ingress.secrets[0].key`         | TLS Secret Key                                   | `nil`                                                        |
+| `livenessProbe`                  | Deployment Liveness Probe                        | See `values.yaml`                                            |
+| `readinessProbe`                 | Deployment Readiness Probe                       | See `values.yaml`                                            |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

bitnami/nginx/templates/deployment.yaml

@@ -38,20 +38,8 @@ spec:
         ports:
         - name: http
           containerPort: 8080
-        livenessProbe:
-          httpGet:
-            path: /
-            port: http
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-          failureThreshold: 6
-        readinessProbe:
-          httpGet:
-            path: /
-            port: http
-          initialDelaySeconds: 5
-          timeoutSeconds: 3
-          periodSeconds: 5
+        livenessProbe: {{ toYaml .Values.livenessProbe | nindent 10 }}
+        readinessProbe: {{ toYaml .Values.readinessProbe | nindent 10 }}
         volumeMounts:
         {{- if .Values.serverBlock }}
         - name: nginx-server-block

bitnami/nginx/values.yaml

@@ -110,6 +110,27 @@ ingress:
 #     }
 #   }
 
+## Liveness Probe. The block is directly forwarded into the deployment, so you can use whatever livenessProbe configuration you want.
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
+##
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 30
+  timeoutSeconds: 5
+  failureThreshold: 6
+
+## Readiness Probe. The block is directly forwarded into the deployment, so you can use whatever readinessProbe configuration you want.
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 5
+  timeoutSeconds: 3
+  periodSeconds: 5
+
 ## Pod annotations
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##