Fixes issues Allow custom liveness/readiness probe #192 and Update/Redeploy a...

Fixes issues Allow custom liveness/readiness probe #192 and Update/Redeploy a pod when ConfigMap or Secrets have changed #169 (#222)

charts/wordpress/Chart.lock

 dependencies:
 - name: mariadb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.5
-digest: sha256:3f2710b71e239a9fbb6df3214753b1a7117492e0fb586b405d837e0e17ec9994
-generated: "2021-01-15T17:40:50.1833958+01:00"
+  version: 0.2.8
+digest: sha256:6ae732ab7bb3c3996253ea9520fd42c5a4bad7d298d55f7cb848634139b267d6
+generated: "2021-02-03T17:34:00.1294277+01:00"

charts/wordpress/Chart.yaml

@@ -8,13 +8,13 @@ maintainers:
 type: application
 
 # This is the chart version.
-version: 0.2.4
+version: 0.2.5
 
 # This is the version number of the application being deployed.
 appVersion: "5.6.0-apache"
 
 dependencies:
   - name: mariadb
-    version: 0.2.5
+    version: 0.2.8
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled

charts/wordpress/README.md

 #  Wordpress
 
-![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.6.0-apache](https://img.shields.io/badge/AppVersion-5.5.3-informational?style=flat-square)
+![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.6.0-apache](https://img.shields.io/badge/AppVersion-5.5.3-informational?style=flat-square)
 
 A Helm chart for Wordpress on Kubernetes
 
@@ -43,7 +43,7 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mariadb | 0.2.5 |
+| @groundhog2k | mariadb | 0.2.8 |
 
 ## Common parameters
 
@@ -60,8 +60,11 @@ $ helm uninstall my-release
 | image.repository | string | `"wordpress"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
+| strategy | object | `{}` | Pod deployment strategy |
 | livenessProbe | object | `see values.yaml` | Liveness probe configuration |
 | readinessProbe | object | `see values.yaml` | Readiness probe configuration |
+| customLivenessProbe | object | `{}` | Custom liveness probe (overwrites default liveness probe configuration) |
+| customReadinessProbe | object | `{}` | Custom readiness probe (overwrites default readiness probe configuration) |
 | resources | object | `{}` | Resource limits and requests |
 | nodeSelector | object | `{}` | Deployment node selector |
 | podAnnotations | object | `{}` | Additional pod annotations |

charts/wordpress/templates/deployment.yaml

@@ -9,10 +9,16 @@ spec:
   selector:
     matchLabels:
       {{- include "wordpress.selectorLabels" . | nindent 6 }}
+  {{- with .Values.strategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   template:
     metadata:
-    {{- with .Values.podAnnotations }}
       annotations:
+        checksum/secureconfig: {{ include (print $.Template.BasePath "/secureconfig.yaml") . | sha256sum }}
+        checksum/extendedconfig: {{ include (print $.Template.BasePath "/extendedconfig.yaml") . | sha256sum }}
+    {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
@@ -52,6 +58,10 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
+          {{- if .Values.customLivenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.customLivenessProbe | nindent 12 }}
+          {{- else }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
@@ -68,6 +78,11 @@ spec:
             periodSeconds: {{ .periodSeconds }}
           {{- end }}
           {{- end }}
+          {{- end }}
+          {{- if .Values.customReadinessProbe }}
+          readinessProbe:
+            {{- toYaml .Values.customReadinessProbe | nindent 12 }}
+          {{- else }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
@@ -84,6 +99,7 @@ spec:
             periodSeconds: {{ .periodSeconds }}
           {{- end }}
           {{- end }}
+          {{- end }}
           {{- with .Values.resources }}
           resources:
             {{- toYaml . | nindent 12 }}

charts/wordpress/templates/secureconfig.yaml

@@ -4,24 +4,24 @@ metadata:
   name: {{ include "wordpress.fullname" . }}
   labels:
     {{- include "wordpress.labels" . | nindent 4 }}
-stringData:
+data:
 {{- if .Values.mariadb.enabled }}
-  WORDPRESS_DB_HOST: {{ include "mariadb.servicename" . }}
+  WORDPRESS_DB_HOST: {{ (include "mariadb.servicename" .) | b64enc }}
   {{- with .Values.mariadb.userDatabase }}
-  WORDPRESS_DB_NAME: {{ .name }}
-  WORDPRESS_DB_USER: {{ .user }}
-  WORDPRESS_DB_PASSWORD: {{ .password }}
+  WORDPRESS_DB_NAME: {{ .name | b64enc }}
+  WORDPRESS_DB_USER: {{ .user | b64enc }}
+  WORDPRESS_DB_PASSWORD: {{ .password | b64enc }}
   {{- end }}
 {{- else }}
 {{- with .Values.externalDatabase }}
-  WORDPRESS_DB_NAME: {{ .name }}
-  WORDPRESS_DB_USER: {{ .user }}
-  WORDPRESS_DB_PASSWORD: {{ .password }}
-  WORDPRESS_DB_HOST: {{ .host }}
+  WORDPRESS_DB_NAME: {{ .name | b64enc }}
+  WORDPRESS_DB_USER: {{ .user | b64enc }}
+  WORDPRESS_DB_PASSWORD: {{ .password | b64enc }}
+  WORDPRESS_DB_HOST: {{ .host | b64enc }}
 {{- end }}
 {{- end }}
 {{- with .Values.settings }}
   {{- if .tablePrefix }}
-  WORDPRESS_TABLE_PREFIX: {{ .tablePrefix }}
+  WORDPRESS_TABLE_PREFIX: {{ .tablePrefix | b64enc }}
   {{- end }}
 {{- end }}

charts/wordpress/values.yaml

@@ -15,6 +15,9 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+## Pod deployment strategy
+strategy: {}
+
 ## Optional service account
 serviceAccount:
   # Specifies whether a service account should be created
@@ -86,6 +89,9 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+## Custom liveness probe (overwrites default liveness probe)
+customLivenessProbe: {}
+
 ## Default liveness probe
 livenessProbe:
   enabled: true
@@ -95,6 +101,9 @@ livenessProbe:
   successThreshold: 1
   periodSeconds: 10
 
+## Custom readiness probe (overwrites default readiness probe)
+customReadinessProbe: {}
+
 ## Default readiness probe
 readinessProbe:
   enabled: true
@@ -118,18 +127,18 @@ env: []
 args: []
 
 ## External database settings (is used when mariadb.enabled is false)
-externalDatabase:
+externalDatabase: {}
   ## Name of the database (default: wordpress)
-  name: wordpress
+  # name: wordpress
 
   ## Database user
-  user:
+  # user:
 
   ## Database password
-  password:
+  # password:
 
   ## Database host
-  host:
+  # host:
 
 ## Wordpress specific settings
 settings: