diff --git a/charts/wordpress/Chart.lock b/charts/wordpress/Chart.lock
index b0c311bee349d8fd9c280072bdf8a9537ecc8aa9..245402d0ecac08bf435f182416d326ba86c48699 100644
--- a/charts/wordpress/Chart.lock
+++ b/charts/wordpress/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://groundhog2k.github.io/helm-charts
- version: 0.2.0
-digest: sha256:2a0e926c463f81bd790a89a0828030021ff40040a521703e17e66f51e4a8afde
-generated: "2020-12-11T18:30:28.9506443+01:00"
+ version: 0.2.2
+digest: sha256:b66987f8e3bb7d047dd5be819ac40d6dec301961d980c8a1bbb837cbe4c99aa5
+generated: "2020-12-13T20:28:14.0291669+01:00"
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index 8725d3fb74f9e869bd62ab755df2474b2b3243ab..99c4ccebcdf4accf27fec1b3e631577aa4a5b992 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,13 +8,13 @@ maintainers:
type: application
# This is the chart version.
-version: 0.2.0
+version: 0.2.1
# This is the version number of the application being deployed.
appVersion: "5.6.0-apache"
dependencies:
- name: mariadb
- version: 0.2.0
+ version: 0.2.2
repository: "https://groundhog2k.github.io/helm-charts"
condition: mariadb.enabled
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index cc139a288026614be71c36c04cc138f26b3bf565..d42f550f207b47d314ecb5e02c469cd00335174d 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
# Wordpress
-  
+  
A Helm chart for Wordpress on Kubernetes
@@ -15,7 +15,7 @@ $ helm install my-release groundhog2k/wordpress
This chart uses the original [Wordpress from Docker](https://hub.docker.com/_/wordpress) to deploy Wordpress in Kubernetes.
-It fully supports deployment of arm64v8 and amd64 multi-architecture docker image. Just set the `nodeSelector` value to `kubernetes.io/arch: "arm64"` (default is `"amd64"`)
+It fully supports deployment of the multi-architecture docker image.
## Prerequisites
@@ -43,7 +43,7 @@ $ helm uninstall my-release
| Repository | Name | Version |
|------------|------|---------|
-| @groundhog2k | mariadb | 0.2.0 |
+| @groundhog2k | mariadb | 0.2.2 |
## Common parameters
@@ -63,11 +63,12 @@ $ helm uninstall my-release
| livenessProbe | object | `see values.yaml` | Liveness probe configuration |
| readinessProbe | object | `see values.yaml` | Readiness probe configuration |
| resources | object | `{}` | Resource limits and requests |
-| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | Deployment node selector |
+| nodeSelector | object | `{}` | Deployment node selector |
| podAnnotations | object | `{}` | Additional pod annotations |
| podSecurityContext | object | `see values.yaml` | Pod security context |
| securityContext | object | `see values.yaml` | Container security context |
| env | list | `[]` | Additional container environmment variables |
+| args | list | `[]` | Arguments for the container entrypoint process |
| serviceAccount.create | bool | `false` | Enable service account creation |
| serviceAccount.name | string | `""` | Optional name of the service account |
| serviceAccount.annotations | object | `{}` | Additional service account annotations |
@@ -80,8 +81,10 @@ $ helm uninstall my-release
| Key | Type | Default | Description |
|-----|------|---------|-------------|
-| service.port | int | `80` | Commento HTTP service port |
+| service.port | int | `80` | Wordpress HTTP service port |
| service.type | string | `"ClusterIP"` | Service type |
+| service.nodePort | int | `nil` | Service node port (only relevant for type NodePort) |
+| service.clusterIP | string | `nil` | Service cluster IP (only relevant for type LoadBalancer) |
## Ingress parameters
@@ -124,6 +127,6 @@ $ helm uninstall my-release
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| storage.accessModes[0] | string | `"ReadWriteOnce"` | Storage access mode |
-| storage.persistentVolumeClaimName | string | `""` | PVC name when existing storage volume should be used |
-| storage.requestedSize | string | `""` | Size for new PVC, when no existing PVC is used |
-| storage.className | string | `""` | Storage class name |
+| storage.persistentVolumeClaimName | string | `nil` | PVC name when existing storage volume should be used |
+| storage.requestedSize | string | `nil` | Size for new PVC, when no existing PVC is used |
+| storage.className | string | `nil` | Storage class name |
diff --git a/charts/wordpress/charts/mariadb-0.2.0.tgz b/charts/wordpress/charts/mariadb-0.2.0.tgz
deleted file mode 100644
index 1f8bed147c8db14c89e4dad9b39a250210a10a1c..0000000000000000000000000000000000000000
Binary files a/charts/wordpress/charts/mariadb-0.2.0.tgz and /dev/null differ
diff --git a/charts/wordpress/charts/mariadb-0.2.2.tgz b/charts/wordpress/charts/mariadb-0.2.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a6ff94ea3d778099e3c13c57749481292dee4a69
Binary files /dev/null and b/charts/wordpress/charts/mariadb-0.2.2.tgz differ
diff --git a/charts/wordpress/templates/deployment.yaml b/charts/wordpress/templates/deployment.yaml
index fcc6a4059e5481e8f1254abeabf77c6d5d65382f..91550a98f6fd70ae10225a04d378805d617a1fa1 100644
--- a/charts/wordpress/templates/deployment.yaml
+++ b/charts/wordpress/templates/deployment.yaml
@@ -23,21 +23,31 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "wordpress.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: {{ .Chart.Name }}
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
envFrom:
- secretRef:
name: {{ include "wordpress.fullname" . }}
- env:
{{- with .Values.env }}
+ env:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- if .Values.args }}
+ args:
+ {{- range .Values.args }}
+ - {{ . }}
+ {{- end }}
+ {{- end }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
@@ -74,8 +84,10 @@ spec:
periodSeconds: {{ .periodSeconds }}
{{- end }}
{{- end }}
+ {{- with .Values.resources }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
volumeMounts:
- mountPath: /var/www/html
name: wordpress-vol
diff --git a/charts/wordpress/templates/service.yaml b/charts/wordpress/templates/service.yaml
index 2da55e9037b1efcd3923daaa57df9425b96aeb7c..360779106c2b22ac49a623714f448d910568ae69 100644
--- a/charts/wordpress/templates/service.yaml
+++ b/charts/wordpress/templates/service.yaml
@@ -11,5 +11,11 @@ spec:
targetPort: http
protocol: TCP
name: http
+ {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+ nodePort: {{ .Values.service.nodePort }}
+ {{- end }}
+ {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+ clusterIP: {{ .Values.service.clusterIP }}
+ {{- end }}
selector:
{{- include "wordpress.selectorLabels" . | nindent 4 }}
diff --git a/charts/wordpress/values.yaml b/charts/wordpress/values.yaml
index f9279cc873a020fcb8a56fcca81eafee1abdb63e..61b6956f8eba82318049c67e7962dacadafbb32d 100644
--- a/charts/wordpress/values.yaml
+++ b/charts/wordpress/values.yaml
@@ -25,10 +25,8 @@ serviceAccount:
# If not set and create is true, a name is generated using the fullname template
name: ""
-## Default node type for the image
-## use arm64 for the arm64v8 image
-nodeSelector:
- kubernetes.io/arch: amd64
+## Additional node selector
+nodeSelector: {}
## Additional pod annotations
podAnnotations: {}
@@ -48,6 +46,10 @@ securityContext:
service:
type: ClusterIP
port: 80
+ ## The node port (only relevant for type NodePort)
+ nodePort: {}
+ ## The cluster ip address (only relevant for type LoadBalancer)
+ clusterIP: {}
## Ingress configuration
ingress:
@@ -110,6 +112,9 @@ containerPort: 8000
## Additional environment variables
env: []
+## Additional arguments for the container entrypoint process
+args: []
+
## External database settings (is used when mariadb.enabled is false)
externalDatabase:
## Name of the database (default: wordpress)
@@ -145,13 +150,13 @@ apacheDefaultSiteConfig: |
## Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}
## Default access mode (ReadWriteOnce)
accessModes:
@@ -179,10 +184,10 @@ mariadb:
# Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}