From 302a58c22b08a5cb6682a683dce501e030413bf4 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Thu, 10 Nov 2022 23:24:39 +0100
Subject: [PATCH] helm: fix consistent indentation, chomping, and use of with
(#19918)
---
chart/templates/cronjob-media-remove.yaml | 6 +++---
chart/templates/deployment-sidekiq.yaml | 12 +++++++-----
chart/templates/deployment-streaming.yaml | 16 +++++++++++-----
chart/templates/deployment-web.yaml | 22 ++++++++++++++--------
chart/templates/hpa.yaml | 10 +++++-----
chart/templates/ingress.yaml | 2 +-
chart/templates/job-assets-precompile.yaml | 4 ++--
chart/templates/job-chewy-upgrade.yaml | 6 +++---
chart/templates/job-create-admin.yaml | 6 +++---
chart/templates/job-db-migrate.yaml | 4 ++--
chart/templates/pvc-assets.yaml | 6 ++++--
chart/templates/pvc-system.yaml | 6 ++++--
chart/templates/secrets.yaml | 4 ++--
13 files changed, 61 insertions(+), 43 deletions(-)
diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml
index d3566e32d4..b175f0ee75 100644
--- a/chart/templates/cronjob-media-remove.yaml
+++ b/chart/templates/cronjob-media-remove.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.mastodon.cron.removeMedia.enabled }}
+{{ if .Values.mastodon.cron.removeMedia.enabled -}}
apiVersion: batch/v1
kind: CronJob
metadata:
@@ -12,10 +12,10 @@ spec:
template:
metadata:
name: {{ include "mastodon.fullname" . }}-media-remove
- {{- with .Values.jobAnnotations }}
+ {{- with .Values.jobAnnotations }}
annotations:
{{- toYaml . | nindent 12 }}
- {{- end }}
+ {{- end }}
spec:
restartPolicy: OnFailure
{{- if (not .Values.mastodon.s3.enabled) }}
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index 57051870f8..878b01150f 100644
--- a/chart/templates/deployment-sidekiq.yaml
+++ b/chart/templates/deployment-sidekiq.yaml
@@ -5,9 +5,9 @@ metadata:
labels:
{{- include "mastodon.labels" . | nindent 4 }}
spec:
-{{- if not .Values.autoscaling.enabled }}
+ {{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
-{{- end }}
+ {{- end }}
selector:
matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }}
@@ -31,8 +31,10 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- if (not .Values.mastodon.s3.enabled) }}
# ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce
@@ -95,7 +97,7 @@ spec:
secretKeyRef:
name: {{ .Values.mastodon.s3.existingSecret }}
key: AWS_ACCESS_KEY_ID
- {{- end -}}
+ {{- end }}
{{- if .Values.mastodon.smtp.existingSecret }}
- name: "SMTP_LOGIN"
valueFrom:
@@ -108,7 +110,7 @@ spec:
secretKeyRef:
name: {{ .Values.mastodon.smtp.existingSecret }}
key: password
- {{- end -}}
+ {{- end }}
{{- if (not .Values.mastodon.s3.enabled) }}
volumeMounts:
- name: assets
diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml
index a5007222c2..5d565765eb 100644
--- a/chart/templates/deployment-streaming.yaml
+++ b/chart/templates/deployment-streaming.yaml
@@ -5,9 +5,9 @@ metadata:
labels:
{{- include "mastodon.labels" . | nindent 4 }}
spec:
-{{- if not .Values.autoscaling.enabled }}
+ {{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
-{{- end }}
+ {{- end }}
selector:
matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }}
@@ -29,12 +29,16 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: {{ .Chart.Name }}
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
@@ -68,8 +72,10 @@ spec:
httpGet:
path: /api/v1/streaming/health
port: streaming
+ {{- with .Values.resources }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml
index 5fb316396c..ec67481bf1 100644
--- a/chart/templates/deployment-web.yaml
+++ b/chart/templates/deployment-web.yaml
@@ -5,9 +5,9 @@ metadata:
labels:
{{- include "mastodon.labels" . | nindent 4 }}
spec:
-{{- if not .Values.autoscaling.enabled }}
+ {{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
-{{- end }}
+ {{- end }}
selector:
matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }}
@@ -16,9 +16,9 @@ spec:
template:
metadata:
annotations:
- {{- with .Values.podAnnotations }}
+ {{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
# roll the pods to pick up any db migrations or other changes
{{- include "mastodon.rollingPodAnnotations" . | nindent 8 }}
labels:
@@ -31,8 +31,10 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- if (not .Values.mastodon.s3.enabled) }}
volumes:
- name: assets
@@ -44,8 +46,10 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
@@ -83,7 +87,7 @@ spec:
secretKeyRef:
name: {{ .Values.mastodon.s3.existingSecret }}
key: AWS_ACCESS_KEY_ID
- {{- end -}}
+ {{- end }}
{{- if (not .Values.mastodon.s3.enabled) }}
volumeMounts:
- name: assets
@@ -108,8 +112,10 @@ spec:
port: http
failureThreshold: 30
periodSeconds: 5
+ {{- with .Values.resources }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
diff --git a/chart/templates/hpa.yaml b/chart/templates/hpa.yaml
index 3f9aa8a93b..b23b2cb168 100644
--- a/chart/templates/hpa.yaml
+++ b/chart/templates/hpa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
@@ -13,16 +13,16 @@ spec:
minReplicas: {{ .Values.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
metrics:
- {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+ {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource
resource:
name: cpu
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
- {{- end }}
- {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+ {{- end }}
+ {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource
resource:
name: memory
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
- {{- end }}
+ {{- end }}
{{- end }}
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 0866382973..e5c5e1dc67 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "mastodon.fullname" . -}}
{{- $webPort := .Values.mastodon.web.port -}}
{{- $streamingPort := .Values.mastodon.streaming.port -}}
-{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
+{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml
index 9bdec2ab7c..30d54b76f5 100644
--- a/chart/templates/job-assets-precompile.yaml
+++ b/chart/templates/job-assets-precompile.yaml
@@ -12,10 +12,10 @@ spec:
template:
metadata:
name: {{ include "mastodon.fullname" . }}-assets-precompile
- {{- with .Values.jobAnnotations }}
+ {{- with .Values.jobAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
spec:
restartPolicy: Never
{{- if (not .Values.mastodon.s3.enabled) }}
diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml
index 556133dd32..5b22a86105 100644
--- a/chart/templates/job-chewy-upgrade.yaml
+++ b/chart/templates/job-chewy-upgrade.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.elasticsearch.enabled }}
+{{- if .Values.elasticsearch.enabled -}}
apiVersion: batch/v1
kind: Job
metadata:
@@ -13,10 +13,10 @@ spec:
template:
metadata:
name: {{ include "mastodon.fullname" . }}-chewy-upgrade
- {{- with .Values.jobAnnotations }}
+ {{- with .Values.jobAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
spec:
restartPolicy: Never
{{- if (not .Values.mastodon.s3.enabled) }}
diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml
index 94d39dcbb5..f28cdab418 100644
--- a/chart/templates/job-create-admin.yaml
+++ b/chart/templates/job-create-admin.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.mastodon.createAdmin.enabled }}
+{{- if .Values.mastodon.createAdmin.enabled -}}
apiVersion: batch/v1
kind: Job
metadata:
@@ -13,10 +13,10 @@ spec:
template:
metadata:
name: {{ include "mastodon.fullname" . }}-create-admin
- {{- with .Values.jobAnnotations }}
+ {{- with .Values.jobAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
spec:
restartPolicy: Never
{{- if (not .Values.mastodon.s3.enabled) }}
diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml
index e1544d2b66..db09c6ea2b 100644
--- a/chart/templates/job-db-migrate.yaml
+++ b/chart/templates/job-db-migrate.yaml
@@ -12,10 +12,10 @@ spec:
template:
metadata:
name: {{ include "mastodon.fullname" . }}-db-migrate
- {{- with .Values.jobAnnotations }}
+ {{- with .Values.jobAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
spec:
restartPolicy: Never
{{- if (not .Values.mastodon.s3.enabled) }}
diff --git a/chart/templates/pvc-assets.yaml b/chart/templates/pvc-assets.yaml
index 58b2179df0..36d555898e 100644
--- a/chart/templates/pvc-assets.yaml
+++ b/chart/templates/pvc-assets.yaml
@@ -1,4 +1,4 @@
-{{- if (not .Values.mastodon.s3.enabled) }}
+{{- if (not .Values.mastodon.s3.enabled) -}}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -8,7 +8,9 @@ metadata:
spec:
accessModes:
- {{ .Values.mastodon.persistence.system.accessMode }}
+ {{- with .Values.mastodon.persistence.assets.resources }}
resources:
- {{- toYaml .Values.mastodon.persistence.assets.resources | nindent 4}}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
storageClassName: {{ .Values.mastodon.persistence.assets.storageClassName }}
{{- end }}
diff --git a/chart/templates/pvc-system.yaml b/chart/templates/pvc-system.yaml
index 52398f0daf..9865346eaa 100644
--- a/chart/templates/pvc-system.yaml
+++ b/chart/templates/pvc-system.yaml
@@ -1,4 +1,4 @@
-{{- if (not .Values.mastodon.s3.enabled) }}
+{{- if (not .Values.mastodon.s3.enabled) -}}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -8,7 +8,9 @@ metadata:
spec:
accessModes:
- {{ .Values.mastodon.persistence.system.accessMode }}
+ {{- with .Values.mastodon.persistence.system.resources }}
resources:
- {{- toYaml .Values.mastodon.persistence.system.resources | nindent 4}}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }}
{{- end }}
diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
index d7ac936ce5..d1776ac590 100644
--- a/chart/templates/secrets.yaml
+++ b/chart/templates/secrets.yaml
@@ -1,4 +1,4 @@
-{{- if (include "mastodon.createSecret" .) }}
+{{- if (include "mastodon.createSecret" .) -}}
apiVersion: v1
kind: Secret
metadata:
@@ -40,4 +40,4 @@ data:
password: "{{ .Values.postgresql.auth.password | b64enc }}"
{{- end }}
{{- end }}
-{{- end -}}
+{{- end }}
--
GitLab