diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/5.7/Chart.yaml similarity index 97% rename from charts/wordpress/Chart.yaml rename to charts/wordpress/5.7/Chart.yaml index 3c191ee..43da648 100644 --- a/charts/wordpress/Chart.yaml +++ b/charts/wordpress/5.7/Chart.yaml @@ -15,10 +15,10 @@ 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: 0.1.0 +version: 0.1.1 # 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.6" +appVersion: "5.7" diff --git a/charts/wordpress/templates/NOTES.txt b/charts/wordpress/5.7/templates/NOTES.txt similarity index 100% rename from charts/wordpress/templates/NOTES.txt rename to charts/wordpress/5.7/templates/NOTES.txt diff --git a/charts/wordpress/templates/_helpers.tpl b/charts/wordpress/5.7/templates/_helpers.tpl similarity index 100% rename from charts/wordpress/templates/_helpers.tpl rename to charts/wordpress/5.7/templates/_helpers.tpl diff --git a/charts/wordpress/templates/deployment.yaml b/charts/wordpress/5.7/templates/deployment.yaml similarity index 66% rename from charts/wordpress/templates/deployment.yaml rename to charts/wordpress/5.7/templates/deployment.yaml index a7a18df..c96e9ca 100644 --- a/charts/wordpress/templates/deployment.yaml +++ b/charts/wordpress/5.7/templates/deployment.yaml @@ -46,6 +46,46 @@ spec: {{- end }} - name: WORDPRESS_DB_PASSWORD_FILE value: "/run/secrets/mysql/password" + - name: AUTH_KEY + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: AUTH_KEY + - name: SECURE_AUTH_KEY + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: SECURE_AUTH_KEY + - name: LOGGED_IN_KEY + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: LOGGED_IN_KEY + - name: NONCE_KEY + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: NONCE_KEY + - name: AUTH_SALT + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: AUTH_SALT + - name: SECURE_AUTH_SALT + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: SECURE_AUTH_SALT + - name: LOGGED_IN_SALT + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: LOGGED_IN_SALT + - name: NONCE_SALT + valueFrom: + secretKeyRef: + name: {{ include "wordpress.fullname" . }} + key: NONCE_SALT volumeMounts: - name: secret mountPath: "/run/secrets/mysql" diff --git a/charts/wordpress/templates/hpa.yaml b/charts/wordpress/5.7/templates/hpa.yaml similarity index 100% rename from charts/wordpress/templates/hpa.yaml rename to charts/wordpress/5.7/templates/hpa.yaml diff --git a/charts/wordpress/templates/ingress.yaml b/charts/wordpress/5.7/templates/ingress.yaml similarity index 100% rename from charts/wordpress/templates/ingress.yaml rename to charts/wordpress/5.7/templates/ingress.yaml diff --git a/charts/wordpress/templates/networkpolicy.yaml b/charts/wordpress/5.7/templates/networkpolicy.yaml similarity index 100% rename from charts/wordpress/templates/networkpolicy.yaml rename to charts/wordpress/5.7/templates/networkpolicy.yaml diff --git a/charts/wordpress/templates/pvc.yaml b/charts/wordpress/5.7/templates/pvc.yaml similarity index 100% rename from charts/wordpress/templates/pvc.yaml rename to charts/wordpress/5.7/templates/pvc.yaml diff --git a/charts/wordpress/5.7/templates/secrets.yaml b/charts/wordpress/5.7/templates/secrets.yaml new file mode 100644 index 0000000..5959a84 --- /dev/null +++ b/charts/wordpress/5.7/templates/secrets.yaml @@ -0,0 +1,20 @@ +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/templates/service.yaml b/charts/wordpress/5.7/templates/service.yaml similarity index 100% rename from charts/wordpress/templates/service.yaml rename to charts/wordpress/5.7/templates/service.yaml diff --git a/charts/wordpress/templates/serviceaccount.yaml b/charts/wordpress/5.7/templates/serviceaccount.yaml similarity index 100% rename from charts/wordpress/templates/serviceaccount.yaml rename to charts/wordpress/5.7/templates/serviceaccount.yaml diff --git a/charts/wordpress/values.yaml b/charts/wordpress/5.7/values.yaml similarity index 98% rename from charts/wordpress/values.yaml rename to charts/wordpress/5.7/values.yaml index 2ae8d5a..7781e32 100644 --- a/charts/wordpress/values.yaml +++ b/charts/wordpress/5.7/values.yaml @@ -8,7 +8,7 @@ image: repository: wordpress pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "5.6" + tag: "5.7" imagePullSecrets: [] nameOverride: "" @@ -67,7 +67,7 @@ resources: cpu: 500m memory: 512Mi requests: - cpu: 100m + cpu: 250m memory: 128Mi autoscaling: diff --git a/charts/wordpress/templates/secrets.yaml b/charts/wordpress/templates/secrets.yaml deleted file mode 100644 index fa996f2..0000000 --- a/charts/wordpress/templates/secrets.yaml +++ /dev/null @@ -1,12 +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.somePassword | b64enc | quote }}