Skip to content
Snippets Groups Projects
Verified Commit 68c80da0 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

resolve feedback

parent d5467621
No related branches found
No related tags found
1 merge request!25Resolve "See if we can prevent cronjob from spawning if wordpress pod is not ready"
...@@ -36,7 +36,7 @@ spec: ...@@ -36,7 +36,7 @@ spec:
spec: spec:
# Set a custom service account which has access to the WordPress # Set a custom service account which has access to the WordPress
# statefulset's state # statefulset's state
serviceAccountName: {{ include "wordpress.fullname" . }}-account serviceAccountName: {{ include "wordpress.fullname" . }}-cron
restartPolicy: Never restartPolicy: Never
{{- if (default .Values.image.pullSecrets .Values.wordpress.mu_cron.cronjob.image.pullSecrets) }} {{- if (default .Values.image.pullSecrets .Values.wordpress.mu_cron.cronjob.image.pullSecrets) }}
imagePullSecrets: imagePullSecrets:
...@@ -52,8 +52,14 @@ spec: ...@@ -52,8 +52,14 @@ spec:
args: args:
- -c - -c
- | - |
set -o errexit
# NOTE: we use "{{` ... `}}" to make sure the curly braces are not templated by Helm. Returns <#readyReplicas>,<#replicasWanted> # NOTE: we use "{{` ... `}}" to make sure the curly braces are not templated by Helm. Returns <#readyReplicas>,<#replicasWanted>
equation=$(kubectl get statefulset {{ include "wordpress.fullname" . }} --template '{{ `{{.status.readyReplicas}},{{.status.replicas}}` }}') equation=$(kubectl get statefulset {{ include "wordpress.fullname" . }} --template '{{ `{{.status.readyReplicas}},{{.status.replicas}}` }}')
# Make sure kubectl command did not fail
if [ $? -ne 0 ]; then
echo "Kubernetes command failed";
exit 2;
fi
# Check if part before comma and after comma are equal # Check if part before comma and after comma are equal
if [[ "${equation%,*}" == "${equation#*,}" ]]; then if [[ "${equation%,*}" == "${equation#*,}" ]]; then
output=$(curl -s -w '%{http_code}' {{- if .Values.wordpress.mu_cron.cronjob.curlInsecure }} -k {{- end }} -L 'http://{{ include "wordpress.fullname" . }}:{{ .Values.service.port }}{{ .Values.wordpress.mu_cron.cronjob.path }}?doing_wp_cron&{{ .Values.wpSalts.WP_CRON_CONTROL_SECRET }}') output=$(curl -s -w '%{http_code}' {{- if .Values.wordpress.mu_cron.cronjob.curlInsecure }} -k {{- end }} -L 'http://{{ include "wordpress.fullname" . }}:{{ .Values.service.port }}{{ .Values.wordpress.mu_cron.cronjob.path }}?doing_wp_cron&{{ .Values.wpSalts.WP_CRON_CONTROL_SECRET }}')
......
...@@ -15,7 +15,7 @@ metadata: ...@@ -15,7 +15,7 @@ metadata:
name: read-{{ include "wordpress.fullname" . }}-statefulset name: read-{{ include "wordpress.fullname" . }}-statefulset
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "wordpress.fullname" . }}-account name: {{ include "wordpress.fullname" . }}-cron
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
roleRef: roleRef:
kind: Role kind: Role
...@@ -25,5 +25,5 @@ roleRef: ...@@ -25,5 +25,5 @@ roleRef:
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "wordpress.fullname" . }}-account name: {{ include "wordpress.fullname" . }}-cron
{{- end }} {{- end }}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment