master
Marius Ensrud 5 years ago
parent 548c780a43
commit 4f7ef07faa

@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # 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. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "5.6" appVersion: "5.7"

@ -46,6 +46,46 @@ spec:
{{- end }} {{- end }}
- name: WORDPRESS_DB_PASSWORD_FILE - name: WORDPRESS_DB_PASSWORD_FILE
value: "/run/secrets/mysql/password" 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: volumeMounts:
- name: secret - name: secret
mountPath: "/run/secrets/mysql" mountPath: "/run/secrets/mysql"

@ -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 }}

@ -8,7 +8,7 @@ image:
repository: wordpress repository: wordpress
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "5.6" tag: "5.7"
imagePullSecrets: [] imagePullSecrets: []
nameOverride: "" nameOverride: ""
@ -67,7 +67,7 @@ resources:
cpu: 500m cpu: 500m
memory: 512Mi memory: 512Mi
requests: requests:
cpu: 100m cpu: 250m
memory: 128Mi memory: 128Mi
autoscaling: autoscaling:

@ -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 }}
Loading…
Cancel
Save