[autoroll] Remove newlines in backend template
Different formatters are fighting back and forth over the yaml files.
Change-Id: I0d24dbe436b707186b2ba433e003b14ff6aa3cca
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/576816
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/autoroll/go/autoroll-config-converter/autoroll-be.yaml.template b/autoroll/go/autoroll-config-converter/autoroll-be.yaml.template
index 3327244..4202ddd 100644
--- a/autoroll/go/autoroll-config-converter/autoroll-be.yaml.template
+++ b/autoroll/go/autoroll-config-converter/autoroll-be.yaml.template
@@ -1,4 +1,4 @@
-{{$svcAcctSplit := .serviceAccount | split "@"}}{{$svcAcct := $svcAcctSplit._0}}
+{{- $svcAcctSplit := .serviceAccount | split "@" -}}{{- $svcAcct := $svcAcctSplit._0 -}}
{{- if and (eq .useWorkloadIdentity "true") (.oldCluster) -}}
apiVersion: v1
kind: ServiceAccount
@@ -41,7 +41,7 @@
{{- if and (eq .useWorkloadIdentity "true") (.oldCluster)}}
serviceAccountName: {{$svcAcct}}
{{- end}}
-{{if .kubernetes.disk}}
+{{ if .kubernetes.disk -}}
initContainers:
- name: init-autoroll-be-{{.rollerName}}
image: {{.kubernetes.image}}
@@ -52,7 +52,7 @@
volumeMounts:
- name: autoroll-be-{{.rollerName}}-storage
mountPath: /data
-{{end}}
+{{- end}}
containers:
- name: autoroll-be-{{.rollerName}}
image: {{.kubernetes.image}}
diff --git a/autoroll/go/autoroll-config-converter/autoroll-ns.yaml.template b/autoroll/go/autoroll-config-converter/autoroll-ns.yaml.template
index 54bfac8..bf78dd0 100644
--- a/autoroll/go/autoroll-config-converter/autoroll-ns.yaml.template
+++ b/autoroll/go/autoroll-config-converter/autoroll-ns.yaml.template
@@ -3,7 +3,6 @@
kind: Namespace
metadata:
name: {{$svcAcct}}
-
---
apiVersion: v1
kind: ServiceAccount
@@ -13,7 +12,6 @@
annotations:
# Explicitly mapping the Kubernetes Service account to a Google Service Account.
iam.gke.io/gcp-service-account: "{{.serviceAccount}}"
-
---
# This binding permits to schedule Pods in this namespace using the "restricted" PodSecurityPolicy.
apiVersion: rbac.authorization.k8s.io/v1
@@ -26,8 +24,8 @@
name: can-use-restricted-psp
apiGroup: rbac.authorization.k8s.io
subjects:
-# Authorize all service accounts in the {{$svcAcct}} namespace to run. This defines a single
-# PodSecurityPolicy for the namespace, and it's much easier to maintain over time.
-- kind: Group
- apiGroup: rbac.authorization.k8s.io
- name: system:serviceaccounts
+ # Authorize all service accounts in the {{$svcAcct}} namespace to run. This defines a single
+ # PodSecurityPolicy for the namespace, and it's much easier to maintain over time.
+ - kind: Group
+ apiGroup: rbac.authorization.k8s.io
+ name: system:serviceaccounts
