diff --git a/charts/wordpress/5.8.4/Chart.yaml b/charts/wordpress/5.8.4/Chart.yaml deleted file mode 100644 index 4392796..0000000 --- a/charts/wordpress/5.8.4/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: wordpress -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.8.4 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "5.8.4" diff --git a/charts/wordpress/5.8.4/templates/NOTES.txt b/charts/wordpress/5.8.4/templates/NOTES.txt deleted file mode 100644 index 805433e..0000000 --- a/charts/wordpress/5.8.4/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "wordpress.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "wordpress.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "wordpress.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "wordpress.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/charts/wordpress/5.8.4/templates/_helpers.tpl b/charts/wordpress/5.8.4/templates/_helpers.tpl deleted file mode 100644 index 361e069..0000000 --- a/charts/wordpress/5.8.4/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "wordpress.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "wordpress.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "wordpress.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "wordpress.labels" -}} -helm.sh/chart: {{ include "wordpress.chart" . }} -{{ include "wordpress.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "wordpress.selectorLabels" -}} -app.kubernetes.io/name: {{ include "wordpress.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "wordpress.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "wordpress.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/wordpress/5.8.4/templates/deployment.yaml b/charts/wordpress/5.8.4/templates/deployment.yaml deleted file mode 100644 index 090e27b..0000000 --- a/charts/wordpress/5.8.4/templates/deployment.yaml +++ /dev/null @@ -1,128 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "wordpress.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "wordpress.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "wordpress.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: WORDPRESS_DB_HOST - value: {{ .Values.env.WORDPRESS_DB_HOST | quote }} - - name: WORDPRESS_DB_NAME - value: {{ .Values.env.WORDPRESS_DB_NAME | quote }} - - name: WORDPRESS_DB_USER - value: {{ .Values.env.WORDPRESS_DB_USER | quote }} - {{- with .Values.env.WORDPRESS_CONFIG_EXTRA }} - - name: WORDPRESS_CONFIG_EXTRA - value: {{ .Values.env.WORDPRESS_CONFIG_EXTRA }} - {{- end }} - - name: WORDPRESS_DB_PASSWORD_FILE - value: "/run/secrets/mysql/password" - - name: WORDPRESS_AUTH_KEY - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: AUTH_KEY - - name: WORDPRESS_SECURE_AUTH_KEY - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: SECURE_AUTH_KEY - - name: WORDPRESS_LOGGED_IN_KEY - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: LOGGED_IN_KEY - - name: WORDPRESS_NONCE_KEY - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: NONCE_KEY - - name: WORDPRESS_AUTH_SALT - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: AUTH_SALT - - name: WORDPRESS_SECURE_AUTH_SALT - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: SECURE_AUTH_SALT - - name: WORDPRESS_LOGGED_IN_SALT - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: LOGGED_IN_SALT - - name: WORDPRESS_NONCE_SALT - valueFrom: - secretKeyRef: - name: {{ include "wordpress.fullname" . }} - key: NONCE_SALT - volumeMounts: - - name: secret - mountPath: "/run/secrets/mysql" - readOnly: true - - name: data - mountPath: "/var/www/html/wp-content" - ports: - - name: http - containerPort: 80 - protocol: TCP -# livenessProbe: -# httpGet: -# path: / -# port: http - readinessProbe: - httpGet: - path: / - port: http -# initialDelaySeconds: 120 - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ include "wordpress.fullname" . }} - - name: secret - secret: - secretName: {{ include "wordpress.fullname" . }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/wordpress/5.8.4/templates/hpa.yaml b/charts/wordpress/5.8.4/templates/hpa.yaml deleted file mode 100644 index fe7258e..0000000 --- a/charts/wordpress/5.8.4/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "wordpress.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/wordpress/5.8.4/templates/ingress.yaml b/charts/wordpress/5.8.4/templates/ingress.yaml deleted file mode 100644 index d9e9292..0000000 --- a/charts/wordpress/5.8.4/templates/ingress.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "wordpress.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} diff --git a/charts/wordpress/5.8.4/templates/networkpolicy.yaml b/charts/wordpress/5.8.4/templates/networkpolicy.yaml deleted file mode 100644 index fe79c5a..0000000 --- a/charts/wordpress/5.8.4/templates/networkpolicy.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: np-{{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} -spec: - podSelector: - matchLabels: - app.kubernetes.io/name: {{ include "wordpress.name" . }} - policyTypes: - - Ingress - ingress: - - ports: - - port: 80 diff --git a/charts/wordpress/5.8.4/templates/pvc.yaml b/charts/wordpress/5.8.4/templates/pvc.yaml deleted file mode 100644 index ae31b99..0000000 --- a/charts/wordpress/5.8.4/templates/pvc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi diff --git a/charts/wordpress/5.8.4/templates/secrets.yaml b/charts/wordpress/5.8.4/templates/secrets.yaml deleted file mode 100644 index 5959a84..0000000 --- a/charts/wordpress/5.8.4/templates/secrets.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": "pre-install" - "helm.sh/hook-delete-policy": "before-hook-creation" -type: Opaque -data: - password: {{ default (randAlphaNum 10) .Values.env.password | b64enc | quote }} - AUTH_KEY: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.AUTH_KEY | b64enc | quote }} - SECURE_AUTH_KEY: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.SECURE_AUTH_KEY | b64enc | quote }} - LOGGED_IN_KEY: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.LOGGED_IN_KEY | b64enc | quote }} - NONCE_KEY: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.NONCE_KEY | b64enc | quote }} - AUTH_SALT: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.AUTH_SALT | b64enc | quote }} - SECURE_AUTH_SALT: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.SECURE_AUTH_SALT | b64enc | quote }} - LOGGED_IN_SALT: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.LOGGED_IN_SALT | b64enc | quote }} - NONCE_SALT: {{ default (randAlphaNum 20 | sha1sum ) .Values.env.NONCE_SALT | b64enc | quote }} diff --git a/charts/wordpress/5.8.4/templates/service.yaml b/charts/wordpress/5.8.4/templates/service.yaml deleted file mode 100644 index 2da55e9..0000000 --- a/charts/wordpress/5.8.4/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "wordpress.fullname" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "wordpress.selectorLabels" . | nindent 4 }} diff --git a/charts/wordpress/5.8.4/templates/serviceaccount.yaml b/charts/wordpress/5.8.4/templates/serviceaccount.yaml deleted file mode 100644 index 2db9c9c..0000000 --- a/charts/wordpress/5.8.4/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "wordpress.serviceAccountName" . }} - labels: - {{- include "wordpress.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/wordpress/5.8.4/values.yaml b/charts/wordpress/5.8.4/values.yaml deleted file mode 100644 index 48a8ac8..0000000 --- a/charts/wordpress/5.8.4/values.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# Default values for wordpress. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 2 - -image: - repository: wordpress - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "5.8.4" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -env: - WORDPRESS_DB_HOST: wp_dbhost - WORDPRESS_DB_USER: wp_user - WORDPRESS_DB_NAME: wb_database - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} -# capabilities: -# drop: -# - ALL -# # readOnlyRootFilesystem: true -# runAsNonRoot: true -# runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - limits: - cpu: 2000m - memory: 512Mi - requests: - cpu: 250m - memory: 128Mi - -autoscaling: - enabled: true - minReplicas: 2 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/charts/wordpress/5.9.3/templates/_helpers.tpl b/charts/wordpress/5.9.3/templates/_helpers.tpl index 361e069..9c7f876 100644 --- a/charts/wordpress/5.9.3/templates/_helpers.tpl +++ b/charts/wordpress/5.9.3/templates/_helpers.tpl @@ -60,3 +60,11 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{- define "common.tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} diff --git a/charts/wordpress/5.9.3/templates/deployment.yaml b/charts/wordpress/5.9.3/templates/deployment.yaml index 090e27b..d9a19ae 100644 --- a/charts/wordpress/5.9.3/templates/deployment.yaml +++ b/charts/wordpress/5.9.3/templates/deployment.yaml @@ -96,15 +96,17 @@ spec: - name: http containerPort: 80 protocol: TCP -# livenessProbe: -# httpGet: -# path: / -# port: http - readinessProbe: - httpGet: - path: / - port: http -# initialDelaySeconds: 120 + {{- if .Values.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }} + {{- else if .Values.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readinessProbe "enabled") "context" $) | nindent 12 }} + {{- else if .Values.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} + {{- end }} + resources: {{- toYaml .Values.resources | nindent 12 }} volumes: diff --git a/charts/wordpress/5.9.3/values.yaml b/charts/wordpress/5.9.3/values.yaml index 8c08d23..20d8c87 100644 --- a/charts/wordpress/5.9.3/values.yaml +++ b/charts/wordpress/5.9.3/values.yaml @@ -82,3 +82,49 @@ nodeSelector: {} tolerations: [] affinity: {} + +wordpressScheme: http + +livenessProbe: + enabled: true + httpGet: + path: /wp-admin/install.php + port: '{{ .Values.wordpressScheme }}' + scheme: '{{ .Values.wordpressScheme | upper }}' + ## If using an HTTPS-terminating load-balancer, the probes may need to behave + ## like the balancer to prevent HTTP 302 responses. According to the Kubernetes + ## docs, 302 should be considered "successful", but this issue on GitHub + ## (https://github.com/kubernetes/kubernetes/issues/47893) shows that it isn't. + ## E.g. + ## httpHeaders: + ## - name: X-Forwarded-Proto + ## value: https + ## + httpHeaders: [] + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 6 + successThreshold: 1 + +readinessProbe: + enabled: true + httpGet: + path: /wp-login.php + port: '{{ .Values.wordpressScheme }}' + scheme: '{{ .Values.wordpressScheme | upper }}' + ## If using an HTTPS-terminating load-balancer, the probes may need to behave + ## like the balancer to prevent HTTP 302 responses. According to the Kubernetes + ## docs, 302 should be considered "successful", but this issue on GitHub + ## (https://github.com/kubernetes/kubernetes/issues/47893) shows that it isn't. + ## E.g. + ## httpHeaders: + ## - name: X-Forwarded-Proto + ## value: https + ## + httpHeaders: [] + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 6 + successThreshold: 1