From ab7441a1eb45a40ca6f6707f7d38235206a6e7da Mon Sep 17 00:00:00 2001
From: groundhog2k <10630407+groundhog2k@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:37:17 +0100
Subject: [PATCH] Removed node selector and improved chart configuration (#142)
* Removed node selector and improved chart configuration
* Improved resources in chart
---
charts/wordpress/Chart.lock | 6 ++---
charts/wordpress/Chart.yaml | 4 ++--
charts/wordpress/README.md | 19 +++++++++-------
charts/wordpress/charts/mariadb-0.2.0.tgz | Bin 4563 -> 0 bytes
charts/wordpress/charts/mariadb-0.2.2.tgz | Bin 0 -> 4620 bytes
charts/wordpress/templates/deployment.yaml | 20 +++++++++++++----
charts/wordpress/templates/service.yaml | 6 +++++
charts/wordpress/values.yaml | 25 ++++++++++++---------
8 files changed, 53 insertions(+), 27 deletions(-)
delete mode 100644 charts/wordpress/charts/mariadb-0.2.0.tgz
create mode 100644 charts/wordpress/charts/mariadb-0.2.2.tgz
diff --git a/charts/wordpress/Chart.lock b/charts/wordpress/Chart.lock
index b0c311be..245402d0 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 8725d3fb..99c4cceb 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 cc139a28..d42f550f 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
GIT binary patch
literal 0
HcmV?d00001
literal 4563
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
bOGVoy?O&`t{);m({Qti!L*pew3<CoIn8wx}
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
GIT binary patch
literal 4620
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
literal 0
HcmV?d00001
diff --git a/charts/wordpress/templates/deployment.yaml b/charts/wordpress/templates/deployment.yaml
index fcc6a405..91550a98 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 2da55e90..36077910 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 f9279cc8..61b6956f 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: {}
--
GitLab