Fix operator templates (#486)

* fix operator templates

* changelog

* codegen

Author: chunter0

changelog/v0.34.0/fix-formatting.yaml

@@ -0,0 +1,4 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >
+      Fix formatting of operator template files.

codegen/cmd_test.go

@@ -147,8 +147,8 @@ var _ = Describe("Cmd", func() {
 		deployment, err := os.ReadFile(absPath)
 		Expect(err).NotTo(HaveOccurred(), "failed to read deployment.yaml")
 
-		Expect(deployment).To(ContainSubstring(fmt.Sprintf("{{- if %s -}}", agentConditional)))
-		Expect(deployment).To(ContainSubstring(fmt.Sprintf("{{- if %s }}", "and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar)")))
+		Expect(deployment).To(ContainSubstring(fmt.Sprintf("{{ if %s }}", agentConditional)))
+		Expect(deployment).To(ContainSubstring(fmt.Sprintf("{{ if %s }}", "and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar)")))
 		Expect(deployment).To(ContainSubstring("name: agent-volume"))
 		Expect(deployment).To(ContainSubstring("{{ $glooAgent.ports.grpc }}"))
 	})
@@ -1262,7 +1262,7 @@ var _ = Describe("Cmd", func() {
 		fileContents, err := os.ReadFile("codegen/test/chart/templates/deployment.yaml")
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(string(fileContents)).To(ContainSubstring("{{- if and $painter.enabled $.Values.test1.enabled $.Values.test2.enabled }}"))
+		Expect(string(fileContents)).To(ContainSubstring("{{ if and $painter.enabled $.Values.test1.enabled $.Values.test2.enabled }}"))
 
 		expectedSA := "kind: ServiceAccount\nmetadata:\n  labels:\n    app: painter\n  name: painter\n"
 		expectedCR := "kind: ClusterRole\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n  name: painter"

codegen/templates/chart/operator-deployment.yamltmpl

@@ -19,9 +19,9 @@ Expressions evaluating SKv2 Config use "[[" and "]]"
 
 {{- $[[ $operatorVar ]] := [[ (opVar $operator) ]] }}
 ---
-[[- $operatorEnabledCondition := printf "\n{{- if $%s.enabled -}}\n" $operatorVar ]]
+[[- $operatorEnabledCondition := printf "\n{{ if $%s.enabled }}\n" $operatorVar ]]
 [[- if (gt (len $operator.CustomEnableCondition) 0) ]]
-[[- $operatorEnabledCondition = printf "\n{{- if %s }}\n" $operator.CustomEnableCondition ]]
+[[- $operatorEnabledCondition = printf "\n{{ if %s }}\n" $operator.CustomEnableCondition ]]
 [[- end ]]
 
 {{- define "[[ $operator.Name ]].deploymentSpec" }}
@@ -81,7 +81,7 @@ spec:
 [[- end ]]
 [[- range $container := $containers -]]
 [[- if and (gt (len $container.EnableStatement) 0) ($container.Volumes) ]]
-[[- printf "\n{{- if %s -}}" $container.EnableStatement ]]
+[[- printf "\n{{ if %s }}" $container.EnableStatement ]]
 [[- range $volume := $container.Volumes ]]
 [[ toYaml (toListItem $volume) | indent 6 ]]
 [[- end ]]
@@ -91,7 +91,7 @@ spec:
       containers:
 [[- range $container := $containers ]]
 [[- if (gt (len $container.EnableStatement) 0) ]]
-[[- printf "\n{{- if %s -}}" $container.EnableStatement ]]
+[[- printf "\n{{ if %s }}" $container.EnableStatement ]]
 [[- end ]]
 [[- $containerName := lower_camel $container.Name ]]
 [[- $containerVar := printf "$%s" $containerName ]]
@@ -270,7 +270,7 @@ spec:
 [[ printf "\n---" ]]
 [[ $containerVar := printf "$%s" ($container.Name | lower_camel) ]]
 {{- [[ $containerVar ]] := [[ $container.ValuesVar ]] }}
-[[- printf "\n{{- if %s -}}" $container.EnableStatement ]]
+[[- printf "\n{{ if %s }}" $container.EnableStatement ]]
 apiVersion: v1
 kind: Service
 metadata:

codegen/templates/chart/operator-rbac.yamltmpl

@@ -11,9 +11,9 @@ Expressions evaluating SKv2 Config use [[ "[[" ]] and [[ "]]" ]]
 
 {{- $[[ $operatorVar ]] := [[ (opVar $operator)]] }}
 
-[[- $operatorEnabledCondition := printf "\n{{- if $%s.enabled }}\n" $operatorVar -]]
+[[- $operatorEnabledCondition := printf "\n{{ if $%s.enabled }}\n" $operatorVar -]]
 [[- if (gt (len $operator.CustomEnableCondition) 0) -]]
-[[- $operatorEnabledCondition = printf "\n{{- if %s }}\n" $operator.CustomEnableCondition -]]
+[[- $operatorEnabledCondition = printf "\n{{ if %s }}\n" $operator.CustomEnableCondition -]]
 [[- end -]]
 [[- $operatorEnabledCondition -]]
 [[- if $operator.ClusterRbac ]]
@@ -33,7 +33,7 @@ rules:
 [[ toYaml $operator.ClusterRbac ]]
 [[- range $container := containerConfigs $operator -]]
 [[- if and ($container.Rbac) (gt (len $container.EnableStatement) 0) ]]
-[[ printf "{{- if %s }}" $container.EnableStatement ]]
+[[ printf "{{ if %s }}" $container.EnableStatement ]]
 [[- end ]]
 [[- range $rule := $container.Rbac ]]
 [[ toYaml (toListItem $rule) ]]

codegen/test/chart-envvars/templates/deployment.yaml

@@ -86,7 +86,7 @@ spec:
 {{- end }} {{/* define "painter.deploymentSpec" */}}
 
 {{/* Render painter deployment template with overrides from values*/}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{- $painterDeploymentOverrides := dict }}
 {{- if $painter.deploymentOverrides }}
 {{- $painterDeploymentOverrides = $painter.deploymentOverrides  }}
@@ -95,7 +95,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $painterDeploymentOverrides "painter.deploymentSpec") }}
 {{- end }}
 ---
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -117,7 +117,7 @@ metadata:
 {{- define "painter.serviceSpec"}}
 
 {{- end }} {{/* define "painter.serviceSpec" */}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{/* Render painter service template with overrides from values*/}}
 {{- $painterServiceOverrides := dict }}
 {{- if $painter.serviceOverrides }}

codegen/test/chart-no-desc/templates/deployment.yaml

@@ -160,7 +160,7 @@ spec:
 {{- end }} {{/* define "painter.deploymentSpec" */}}
 
 {{/* Render painter deployment template with overrides from values*/}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{- $painterDeploymentOverrides := dict }}
 {{- if $painter.deploymentOverrides }}
 {{- $painterDeploymentOverrides = $painter.deploymentOverrides  }}
@@ -169,7 +169,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $painterDeploymentOverrides "painter.deploymentSpec") }}
 {{- end }}
 ---
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -191,7 +191,7 @@ metadata:
 {{- define "painter.serviceSpec"}}
 
 {{- end }} {{/* define "painter.serviceSpec" */}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{/* Render painter service template with overrides from values*/}}
 {{- $painterServiceOverrides := dict }}
 {{- if $painter.serviceOverrides }}

codegen/test/chart-sidecar/templates/deployment.yaml

@@ -131,7 +131,7 @@ spec:
 {{- end }} {{/* define "painter.deploymentSpec" */}}
 
 {{/* Render painter deployment template with overrides from values*/}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{- $painterDeploymentOverrides := dict }}
 {{- if $painter.deploymentOverrides }}
 {{- $painterDeploymentOverrides = $painter.deploymentOverrides  }}
@@ -140,7 +140,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $painterDeploymentOverrides "painter.deploymentSpec") }}
 {{- end }}
 ---
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -162,7 +162,7 @@ metadata:
 {{- define "painter.serviceSpec"}}
 
 {{- end }} {{/* define "painter.serviceSpec" */}}
-{{- if $painter.enabled -}}
+{{ if $painter.enabled }}
 {{/* Render painter service template with overrides from values*/}}
 {{- $painterServiceOverrides := dict }}
 {{- if $painter.serviceOverrides }}

codegen/test/chart/conditional-sidecar/templates/deployment.yaml

@@ -37,7 +37,7 @@ spec:
       - name: license-keys
         secret:
           secretName: license-keys
-{{- if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) -}}
+{{ if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) }}
       - name: agent-volume
         secret:
           secretName: agent-volume
@@ -95,7 +95,7 @@ spec:
             drop:
             - ALL
 {{- end }}
-{{- if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) -}}
+{{ if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) }}
 {{- $glooAgent := $.Values.glooAgent }}
 {{- $glooAgentImage := $glooAgent.image }}
       - name: gloo-agent
@@ -149,7 +149,7 @@ spec:
 {{- end }} {{/* define "gloo-mgmt-server.deploymentSpec" */}}
 
 {{/* Render gloo-mgmt-server deployment template with overrides from values*/}}
-{{- if $glooMgmtServer.enabled -}}
+{{ if $glooMgmtServer.enabled }}
 {{- $glooMgmtServerDeploymentOverrides := dict }}
 {{- if $glooMgmtServer.deploymentOverrides }}
 {{- $glooMgmtServerDeploymentOverrides = $glooMgmtServer.deploymentOverrides  }}
@@ -158,7 +158,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $glooMgmtServerDeploymentOverrides "gloo-mgmt-server.deploymentSpec") }}
 {{- end }}
 ---
-{{- if $glooMgmtServer.enabled -}}
+{{ if $glooMgmtServer.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -200,7 +200,7 @@ spec:
     port: {{ $glooMgmtServer.ports.grpc }}
 
 {{- end }} {{/* define "gloo-mgmt-server.serviceSpec" */}}
-{{- if $glooMgmtServer.enabled -}}
+{{ if $glooMgmtServer.enabled }}
 {{/* Render gloo-mgmt-server service template with overrides from values*/}}
 {{- $glooMgmtServerServiceOverrides := dict }}
 {{- if $glooMgmtServer.serviceOverrides }}
@@ -215,7 +215,7 @@ spec:
 ---
 
 {{- $glooAgent := $.Values.glooAgent }}
-{{- if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) -}}
+{{ if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -319,7 +319,7 @@ spec:
 {{- end }} {{/* define "gloo-agent.deploymentSpec" */}}
 
 {{/* Render gloo-agent deployment template with overrides from values*/}}
-{{- if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
+{{ if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
 {{- $glooAgentDeploymentOverrides := dict }}
 {{- if $glooAgent.deploymentOverrides }}
 {{- $glooAgentDeploymentOverrides = $glooAgent.deploymentOverrides  }}
@@ -328,7 +328,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $glooAgentDeploymentOverrides "gloo-agent.deploymentSpec") }}
 {{- end }}
 ---
-{{- if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
+{{ if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -350,7 +350,7 @@ metadata:
 {{- define "gloo-agent.serviceSpec"}}
 
 {{- end }} {{/* define "gloo-agent.serviceSpec" */}}
-{{- if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
+{{ if and ($.Values.glooAgent.enabled) (not $.Values.glooAgent.runAsSidecar) }}
 {{/* Render gloo-agent service template with overrides from values*/}}
 {{- $glooAgentServiceOverrides := dict }}
 {{- if $glooAgent.serviceOverrides }}

codegen/test/chart/conditional-sidecar/templates/rbac.yaml

@@ -4,7 +4,7 @@
 # Rbac manifests for gloo-mgmt-server
 
 {{- $glooMgmtServer := $.Values.glooMgmtServer }}
-{{- if $glooMgmtServer.enabled }}
+{{ if $glooMgmtServer.enabled }}
 
 ---
 
@@ -21,7 +21,7 @@ rules:
   - leases
   verbs:
   - '*'
-{{- if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) }}
+{{ if and ($.Values.glooAgent.enabled) ($.Values.glooAgent.runAsSidecar) }}
 - apiGroups:
   - apiextensions.k8s.io
   resources:

codegen/test/chart/templates/deployment.yaml

@@ -86,7 +86,7 @@ spec:
 {{- end }} {{/* define "painter.deploymentSpec" */}}
 
 {{/* Render painter deployment template with overrides from values*/}}
-{{- if $painter.enabled }}
+{{ if $painter.enabled }}
 {{- $painterDeploymentOverrides := dict }}
 {{- if $painter.deploymentOverrides }}
 {{- $painterDeploymentOverrides = $painter.deploymentOverrides  }}
@@ -95,7 +95,7 @@ spec:
 {{ include "skv2.utils.merge" (list . $painterDeploymentOverrides "painter.deploymentSpec") }}
 {{- end }}
 ---
-{{- if $painter.enabled }}
+{{ if $painter.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -117,7 +117,7 @@ metadata:
 {{- define "painter.serviceSpec"}}
 
 {{- end }} {{/* define "painter.serviceSpec" */}}
-{{- if $painter.enabled }}
+{{ if $painter.enabled }}
 {{/* Render painter service template with overrides from values*/}}
 {{- $painterServiceOverrides := dict }}
 {{- if $painter.serviceOverrides }}