helm test refactor and gw yaml fix [1.13] (#8509)

* helm test refactor and gw fix

* cl

* update k8s-utils

* empty

* fix test

* refactor

* comment and const

* extract ssl into func

---------

Co-authored-by: soloio-bulldozer[bot] <48420018+soloio-bulldozer[bot]@users.noreply.github.com>

changelog/v1.13.23/helm-gw-fix.yaml

@@ -0,0 +1,12 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/gloo/issues/8404
+    resolvesIssue: false
+    description: Fix typo in helm template when rendering multiple Gateways.
+  - type: NON_USER_FACING
+    description: Refactor helm tests to more thoroughly check that Gateways are rendered correctly.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: k8s-utils
+    dependencyTag: v0.1.10
+    description: Pick up manifest test utils update.

go.mod

@@ -49,7 +49,7 @@ require (
 	github.com/sergi/go-diff v1.1.0
 	github.com/solo-io/go-list-licenses v0.1.0
 	github.com/solo-io/go-utils v0.22.4
-	github.com/solo-io/k8s-utils v0.1.7
+	github.com/solo-io/k8s-utils v0.1.10
 	github.com/solo-io/protoc-gen-ext v0.0.17
 	github.com/solo-io/protoc-gen-openapi v0.1.0
 	github.com/solo-io/skv2 v0.26.0

go.sum

@@ -1392,8 +1392,8 @@ github.com/solo-io/go-utils v0.22.4/go.mod h1:0gLjjgdtI5diEgdMvtGtceAdL/5z4C0Nco
 github.com/solo-io/k8s-utils v0.0.1/go.mod h1:53N9+9Gl2MwqIZJ7/ocA9gKvWt+6z7MPD2qKQix7oFE=
 github.com/solo-io/k8s-utils v0.0.8/go.mod h1:Cg2ymG0xhLdyS3NJ0D98yxiSWjAKYPNopzPTwVDl7e4=
 github.com/solo-io/k8s-utils v0.1.0/go.mod h1:Cg2ymG0xhLdyS3NJ0D98yxiSWjAKYPNopzPTwVDl7e4=
-github.com/solo-io/k8s-utils v0.1.7 h1:fZISv4SpeWHru0HF+fYYXrPzT4aHz6gBkYTV6QLZc1Y=
-github.com/solo-io/k8s-utils v0.1.7/go.mod h1:DFUAy3AeYZvAVfMhyRLdsZbQ5aCDWIUya7DEYFplpd4=
+github.com/solo-io/k8s-utils v0.1.10 h1:AiU0FJGwhTPk2BH5/Zcknz7cC9OSjhyO8RpxXAqEQrE=
+github.com/solo-io/k8s-utils v0.1.10/go.mod h1:DFUAy3AeYZvAVfMhyRLdsZbQ5aCDWIUya7DEYFplpd4=
 github.com/solo-io/protoc-gen-ext v0.0.13/go.mod h1:/U/jMDtVI7R6N323sfaUXK9Mmo54D7SY3pP7JtI/kMo=
 github.com/solo-io/protoc-gen-ext v0.0.16/go.mod h1:j5wvKW5B7oes0hf46IxPDEkDK0pNNQ1Nbfrr1P+xBQo=
 github.com/solo-io/protoc-gen-ext v0.0.17 h1:T/rihlhzsbASnYJ/JkvwhF62LHsHki54Howe5SmPP2Y=

install/helm/gloo/templates/_8-default-gateways.tpl

@@ -154,7 +154,7 @@ spec:
 {{- if not $gatewaySettings.disableGeneratedGateways }}
 {{- if not $gatewaySettings.disableHttpGateway }}
 {{- $defaultGatewayOverride := $spec.gatewaySettings.httpGatewayKubeOverride }}
-{{- "---" }}
+---
 {{- include "gloo.util.merge" (list $ctx $defaultGatewayOverride "defaultGateway.gateway") -}}
 {{- end }}{{/* if not $gatewaySettings.disableHttpGateway */}}
 {{- if not $gatewaySettings.disableHttpsGateway }}

install/test/helm_suite_test.go

@@ -44,6 +44,9 @@ const (
 	releaseName    = "gloo"
 	chartDir       = "../helm/gloo"
 	debugOutputDir = "../../_output/helm/charts"
+
+	// the Gateway CR helm templates are stored as yaml in a configmap with this name
+	customResourceConfigMapName = "gloo-custom-resource-config"
 )
 
 var (