Skip to content

fixed indent errors #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions charts/saleor-core/templates/deployment-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ spec:
{{- end }}
# Volume for the images and unstructured data
- name: saleor-data-media
{{- if and .Values.persistence.enabled .Values.persistence.existingPvc }}
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingPvc }}
{{- else if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ default (include "saleor-core.fullname" .) }}
{{- else }}
emptyDir:
medium: Memory
{{- end }}
{{- if and .Values.persistence.enabled .Values.persistence.existingPvc }}
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingPvc }}
{{- else if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ default (include "saleor-core.fullname" .) }}
{{- else }}
emptyDir:
medium: Memory
{{- end }}
initContainers:
# Wait for successful response from redis and postgresql
- name: "{{- include "saleor-core.apiContainerName" . }}-init-1"
Expand Down
48 changes: 24 additions & 24 deletions charts/saleor-core/templates/deployment-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ spec:
name: {{ include "saleor-core.fullname" . }}-web
# Volume for the images and unstructured data
- name: saleor-data-media
{{- if and .Values.persistence.enabled .Values.persistence.existingPvc }}
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingPvc }}
{{- else if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ default (include "saleor-core.fullname" .) }}
{{- else }}
emptyDir:
medium: Memory
{{- end }}
{{- if and .Values.persistence.enabled .Values.persistence.existingPvc }}
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingPvc }}
{{- else if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ default (include "saleor-core.fullname" .) }}
{{- else }}
emptyDir:
medium: Memory
{{- end }}
# Volume for the web assets data
- name: saleor-data-static
emptyDir:
Expand Down Expand Up @@ -128,20 +128,20 @@ spec:
- --without-mingle
- --heartbeat-interval={{ .Values.worker.heartBeatIntervalSeconds }}
- --loglevel={{ .Values.worker.logLevel }}
{{- if (eq (.Values.worker.concurrency.type) "fixed") }}
- --concurrency={{ .Values.worker.concurrency.fixed }}
{{- else if (eq (.Values.worker.concurrency.type) "auto") }}
- --autoscale={{ .Values.worker.concurrency.autoMaximum }},{{ .Values.worker.concurrency.autoMinimum }}
{{- end }}
{{- if (.Values.worker.hardTimeLimitSeconds) }}
- --time-limit={{ .Values.worker.hardTimeLimitSeconds }}
{{- end }}
{{- if (.Values.worker.softTimeLimitSeconds) }}
- --soft-time-limit={{ .Values.worker.softTimeLimitSeconds }}
{{- end }}
{{- if (eq .Values.worker.taskEventsMonitoring.enabled true) }}
- --task-events
{{- end }}
{{- if (eq (.Values.worker.concurrency.type) "fixed") }}
- --concurrency={{ .Values.worker.concurrency.fixed }}
{{- else if (eq (.Values.worker.concurrency.type) "auto") }}
- --autoscale={{ .Values.worker.concurrency.autoMaximum }},{{ .Values.worker.concurrency.autoMinimum }}
{{- end }}
{{- if (.Values.worker.hardTimeLimitSeconds) }}
- --time-limit={{ .Values.worker.hardTimeLimitSeconds }}
{{- end }}
{{- if (.Values.worker.softTimeLimitSeconds) }}
- --soft-time-limit={{ .Values.worker.softTimeLimitSeconds }}
{{- end }}
{{- if (eq .Values.worker.taskEventsMonitoring.enabled true) }}
- --task-events
{{- end }}
# Disabled by default due to issues with failures that need to be worked out
{{- if .Values.worker.livenessProbeSettings.enabled }}
livenessProbe: {{ toYaml .Values.worker.livenessProbeSettings | nindent 12 }}
Expand Down