Skip to content
Snippets Groups Projects
Verified Commit a0ca9135 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

redo accidentally overwritten changes from master

parent 2dad0279
No related branches found
No related tags found
1 merge request!2rsync backups to remote storage
Pipeline #4190 passed with stage
in 1 minute and 33 seconds
---
apiVersion: v1
appVersion: "5.2.3"
appVersion: "5.4.1"
description: WordPress with a replicated MariaDB backend
name: wordpress
# Please only change the chart version as part of the release procedure: see
# RELEASING.md
version: 0.1.0
version: 0.1.2
icon: https://make.wordpress.org/design/files/2016/09/WordPress-logotype-wmark.png
......@@ -4,9 +4,9 @@ When releasing a new version of the wordpress-helm chart, please remember to do
the following:
* change the chart version in `Chart.yaml`;
* change the default `image.tag` and `initImage.tag` in `values.yaml` to the new
version (e.g., "0.1.0");
* create a git tag for the new version (e.g., "0.1.0") and push it to Gitlab
version (e.g., "0.1.2");
* create a git tag for the new version (e.g., "0.1.2") and push it to Gitlab
(any branch will do); the CI will create and push docker images tagged by that
same version string.
(You can push all git tags using `git push --tags`, or this specific one using
`git push origin 0.1.0`.)
`git push origin 0.1.2`.)
......@@ -68,11 +68,29 @@ spec:
containerPort: 80
- name: https
containerPort: 443
# livenessProbe:
# httpGet:
# path: /wp-login.php
# port: http
# timeoutSeconds: 2
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: {{ .Values.wordpress.site.probe_path }}
port: http
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
{{- end }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: {{ .Values.wordpress.site.probe_path }}
port: http
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
{{- end }}
env:
- name: WORDPRESS_DB_HOST
value: {{ .Release.Name }}-database
......
......@@ -42,6 +42,10 @@ wordpress:
alt_enabled: false
# alt_config: PATH-SETTING-IN-OPTIONS-TABLE
# alt_path: SOME-LOGIN-PATH
# # Path used by the liveness and readiness probes to see if the site runs
# # correctly. Defaults to `/wp-login.php`. Be sure to make this the same as
# # alt_path if you use it!
# probe_path: /wp-login.php
wp_content:
# The directory to mount the files placed in wp-content. You shouldn't have to
# change this.
......
---
git_repo:
enabled: false
name: /my/repo
......@@ -81,20 +82,24 @@ wordpress:
multilingual:
enabled: false
plugins: []
config: []
config: []
# NOTE: Use a theme *slug* here
theme: twentytwenty
theme_fallback: twentytwenty
# NOTE: Make sure you use underscore and that the localisation is in full caps
locale: en_US
version: 5.2.3
version: 5.4.1
url: "http://localhost"
title: "Wordpress Helm"
## If including a plugin to alias wp login then set an alt_path and set the alt_config
# NOTE: A value for alt_enabled must be set. Select either true or false
alt_enabled: false
# If including a plugin to alias wp login then set an alt_path and set the
# alt_config
alt_enabled: false
# alt_config: PATH-SETTING-IN-OPTIONS-TABLE
# alt_path: SOME-LOGIN-PATH
# Path used by the liveness and readiness probes to see if the site runs
# correctly.
probe_path: /wp-login.php
wp_content:
## The directory to mount the files placed in wp-content. You shouldn't have to
## change this.
......@@ -167,12 +172,12 @@ wpSalts: {}
image:
repository: docker.greenhost.net/open/wordpress-helm/wordpress
tag: 0.1.0
tag: 0.1.1
pullPolicy: Always
initImage:
repository: docker.greenhost.net/open/wordpress-helm/wordpress-cli-ansible
tag: 0.1.0
tag: 0.1.1
pullPolicy: Always
imagePullSecretName: greenhost-registry-pull
......@@ -189,6 +194,9 @@ nodeSelector: {}
tolerations: []
affinity: {}
podAnnotations: {}
database:
db:
user: wordpress
......@@ -333,3 +341,22 @@ ansibleSecrets: |
SECURE_AUTH_SALT: {{ .Values.wpSalts.SECURE_AUTH_SALT | default ( randAlphaNum 32) }}
WP_CACHE_KEY_SALT: {{ .Values.wpSalts.WP_CACHE_KEY_SALT | default ( randAlphaNum 32) }}
WP_CRON_CONTROL_SECRET: {{ .Values.wpSalts.WP_CRON_CONTROL_SECRET | default ( randAlphaNum 32 ) }}
## Liveness and readiness probe values
## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
##
livenessProbe:
enabled: true
initialDelaySeconds: 60
periodSeconds: 15
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
readinessProbe:
enabled: true
initialDelaySeconds: 10
periodSeconds: 15
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
FROM wordpress:cli-2.1.0-php7.3
FROM wordpress:cli-2.4-php7.3
USER root
......
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