Skip to content
Snippets Groups Projects
Unverified Commit c13e1713 authored by groundhog2k's avatar groundhog2k Committed by GitHub
Browse files

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)
parent 10520a46
No related branches found
Tags mongodb-0.6.4
No related merge requests found
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://groundhog2k.github.io/helm-charts repository: https://groundhog2k.github.io/helm-charts
version: 0.2.5 version: 0.2.8
digest: sha256:3f2710b71e239a9fbb6df3214753b1a7117492e0fb586b405d837e0e17ec9994 digest: sha256:6ae732ab7bb3c3996253ea9520fd42c5a4bad7d298d55f7cb848634139b267d6
generated: "2021-01-15T17:40:50.1833958+01:00" generated: "2021-02-03T17:34:00.1294277+01:00"
...@@ -8,13 +8,13 @@ maintainers: ...@@ -8,13 +8,13 @@ maintainers:
type: application type: application
# This is the chart version. # This is the chart version.
version: 0.2.4 version: 0.2.5
# This is the version number of the application being deployed. # This is the version number of the application being deployed.
appVersion: "5.6.0-apache" appVersion: "5.6.0-apache"
dependencies: dependencies:
- name: mariadb - name: mariadb
version: 0.2.5 version: 0.2.8
repository: "https://groundhog2k.github.io/helm-charts" repository: "https://groundhog2k.github.io/helm-charts"
condition: mariadb.enabled condition: mariadb.enabled
# Wordpress # 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 A Helm chart for Wordpress on Kubernetes
...@@ -43,7 +43,7 @@ $ helm uninstall my-release ...@@ -43,7 +43,7 @@ $ helm uninstall my-release
| Repository | Name | Version | | Repository | Name | Version |
|------------|------|---------| |------------|------|---------|
| @groundhog2k | mariadb | 0.2.5 | | @groundhog2k | mariadb | 0.2.8 |
## Common parameters ## Common parameters
...@@ -60,8 +60,11 @@ $ helm uninstall my-release ...@@ -60,8 +60,11 @@ $ helm uninstall my-release
| image.repository | string | `"wordpress"` | Image name | | image.repository | string | `"wordpress"` | Image name |
| image.tag | string | `""` | Image tag | | image.tag | string | `""` | Image tag |
| imagePullSecrets | list | `[]` | Image pull secrets | | imagePullSecrets | list | `[]` | Image pull secrets |
| strategy | object | `{}` | Pod deployment strategy |
| livenessProbe | object | `see values.yaml` | Liveness probe configuration | | livenessProbe | object | `see values.yaml` | Liveness probe configuration |
| readinessProbe | object | `see values.yaml` | Readiness 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 | | resources | object | `{}` | Resource limits and requests |
| nodeSelector | object | `{}` | Deployment node selector | | nodeSelector | object | `{}` | Deployment node selector |
| podAnnotations | object | `{}` | Additional pod annotations | | podAnnotations | object | `{}` | Additional pod annotations |
......
File deleted
File added
...@@ -9,10 +9,16 @@ spec: ...@@ -9,10 +9,16 @@ spec:
selector: selector:
matchLabels: matchLabels:
{{- include "wordpress.selectorLabels" . | nindent 6 }} {{- include "wordpress.selectorLabels" . | nindent 6 }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }}
annotations: 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 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
...@@ -52,6 +58,10 @@ spec: ...@@ -52,6 +58,10 @@ spec:
- name: http - name: http
containerPort: {{ .Values.containerPort }} containerPort: {{ .Values.containerPort }}
protocol: TCP protocol: TCP
{{- if .Values.customLivenessProbe }}
livenessProbe:
{{- toYaml .Values.customLivenessProbe | nindent 12 }}
{{- else }}
{{- if .Values.livenessProbe.enabled }} {{- if .Values.livenessProbe.enabled }}
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -68,6 +78,11 @@ spec: ...@@ -68,6 +78,11 @@ spec:
periodSeconds: {{ .periodSeconds }} periodSeconds: {{ .periodSeconds }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.customReadinessProbe }}
readinessProbe:
{{- toYaml .Values.customReadinessProbe | nindent 12 }}
{{- else }}
{{- if .Values.readinessProbe.enabled }} {{- if .Values.readinessProbe.enabled }}
readinessProbe: readinessProbe:
httpGet: httpGet:
...@@ -84,6 +99,7 @@ spec: ...@@ -84,6 +99,7 @@ spec:
periodSeconds: {{ .periodSeconds }} periodSeconds: {{ .periodSeconds }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}
{{- with .Values.resources }} {{- with .Values.resources }}
resources: resources:
{{- toYaml . | nindent 12 }} {{- toYaml . | nindent 12 }}
......
...@@ -4,24 +4,24 @@ metadata: ...@@ -4,24 +4,24 @@ metadata:
name: {{ include "wordpress.fullname" . }} name: {{ include "wordpress.fullname" . }}
labels: labels:
{{- include "wordpress.labels" . | nindent 4 }} {{- include "wordpress.labels" . | nindent 4 }}
stringData: data:
{{- if .Values.mariadb.enabled }} {{- if .Values.mariadb.enabled }}
WORDPRESS_DB_HOST: {{ include "mariadb.servicename" . }} WORDPRESS_DB_HOST: {{ (include "mariadb.servicename" .) | b64enc }}
{{- with .Values.mariadb.userDatabase }} {{- with .Values.mariadb.userDatabase }}
WORDPRESS_DB_NAME: {{ .name }} WORDPRESS_DB_NAME: {{ .name | b64enc }}
WORDPRESS_DB_USER: {{ .user }} WORDPRESS_DB_USER: {{ .user | b64enc }}
WORDPRESS_DB_PASSWORD: {{ .password }} WORDPRESS_DB_PASSWORD: {{ .password | b64enc }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- with .Values.externalDatabase }} {{- with .Values.externalDatabase }}
WORDPRESS_DB_NAME: {{ .name }} WORDPRESS_DB_NAME: {{ .name | b64enc }}
WORDPRESS_DB_USER: {{ .user }} WORDPRESS_DB_USER: {{ .user | b64enc }}
WORDPRESS_DB_PASSWORD: {{ .password }} WORDPRESS_DB_PASSWORD: {{ .password | b64enc }}
WORDPRESS_DB_HOST: {{ .host }} WORDPRESS_DB_HOST: {{ .host | b64enc }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .Values.settings }} {{- with .Values.settings }}
{{- if .tablePrefix }} {{- if .tablePrefix }}
WORDPRESS_TABLE_PREFIX: {{ .tablePrefix }} WORDPRESS_TABLE_PREFIX: {{ .tablePrefix | b64enc }}
{{- end }} {{- end }}
{{- end }} {{- end }}
...@@ -15,6 +15,9 @@ imagePullSecrets: [] ...@@ -15,6 +15,9 @@ imagePullSecrets: []
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
## Pod deployment strategy
strategy: {}
## Optional service account ## Optional service account
serviceAccount: serviceAccount:
# Specifies whether a service account should be created # Specifies whether a service account should be created
...@@ -86,6 +89,9 @@ resources: {} ...@@ -86,6 +89,9 @@ resources: {}
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
## Custom liveness probe (overwrites default liveness probe)
customLivenessProbe: {}
## Default liveness probe ## Default liveness probe
livenessProbe: livenessProbe:
enabled: true enabled: true
...@@ -95,6 +101,9 @@ livenessProbe: ...@@ -95,6 +101,9 @@ livenessProbe:
successThreshold: 1 successThreshold: 1
periodSeconds: 10 periodSeconds: 10
## Custom readiness probe (overwrites default readiness probe)
customReadinessProbe: {}
## Default readiness probe ## Default readiness probe
readinessProbe: readinessProbe:
enabled: true enabled: true
...@@ -118,18 +127,18 @@ env: [] ...@@ -118,18 +127,18 @@ env: []
args: [] args: []
## External database settings (is used when mariadb.enabled is false) ## External database settings (is used when mariadb.enabled is false)
externalDatabase: externalDatabase: {}
## Name of the database (default: wordpress) ## Name of the database (default: wordpress)
name: wordpress # name: wordpress
## Database user ## Database user
user: # user:
## Database password ## Database password
password: # password:
## Database host ## Database host
host: # host:
## Wordpress specific settings ## Wordpress specific settings
settings: settings:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment