Use rendered contour Gateway API yamls

By doing that we avoid restarting contour. This
a) speeds deployment up
b) avoids Contour occasionally not noticing Gateway API enablement change in its
config map

Co-authored-by: Danail Branekov <[email protected]>

scripts/install-dependencies.sh

@@ -7,6 +7,9 @@ TEST_DIR="$SCRIPT_DIR/../tests"
 DEP_DIR="$TEST_DIR/dependencies"
 VENDOR_DIR="$TEST_DIR/vendor"
 
+TEMP_FILES=()
+trap 'for file in ${TEMP_FILES[@]}; do rm -rf $file; done' EXIT
+
 function usage_text() {
   cat <<EOF
 Usage:
@@ -66,27 +69,18 @@ echo "********************"
 echo " Installing Contour"
 echo "********************"
 
-kubectl apply -f "$VENDOR_DIR/gateway-api"
-kubectl apply -f "$VENDOR_DIR/contour"
+TEMP_FILES+=("$DEP_DIR/contour/contour-gateway.yaml")
+cp "$VENDOR_DIR/contour/contour-gateway.yaml" "$DEP_DIR/contour/contour-gateway.yaml"
+kubectl apply -k "$DEP_DIR/contour"
+
 kubectl apply -f - <<EOF
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: contour
-  namespace: projectcontour
-data:
-  contour.yaml: |
-    gateway:
-      controllerName: projectcontour.io/gateway-controller
----
 kind: GatewayClass
 apiVersion: gateway.networking.k8s.io/v1beta1
 metadata:
   name: contour
 spec:
   controllerName: projectcontour.io/gateway-controller
 EOF
-kubectl -n projectcontour rollout restart deployment/contour
 
 echo "************************************"
 echo " Installing Service Binding Runtime"
@@ -102,7 +96,7 @@ if ! kubectl get apiservice v1beta1.metrics.k8s.io >/dev/null 2>&1; then
     echo " Installing Metrics Server Insecure TLS options"
     echo "************************************************"
 
-    trap "rm $DEP_DIR/insecure-metrics-server/components.yaml" EXIT
+    TEMP_FILES+=("$DEP_DIR/insecure-metrics-server/components.yaml")
     cp "$VENDOR_DIR/metrics-server-local/components.yaml" "$DEP_DIR/insecure-metrics-server/components.yaml"
     kubectl apply -k "$DEP_DIR/insecure-metrics-server"
   else

scripts/installer/install-korifi-kind.yaml

@@ -73,6 +73,8 @@ spec:
         - bash
         - -c
         - |
+          set -euo pipefail
+
           scripts/install-dependencies.sh --insecure-tls-metrics-server
 
           helm repo add twuni https://helm.twun.io

tests/dependencies/contour/kustomization.yaml

@@ -0,0 +1,20 @@
+resources:
+  - contour-gateway.yaml
+
+patches:
+  - patch: |
+      $patch: delete
+      apiVersion: gateway.networking.k8s.io/v1beta1
+      kind: GatewayClass
+      metadata:
+        name: example
+    target:
+      kind: GatewayClass
+  - patch: |
+      $patch: delete
+      apiVersion: gateway.networking.k8s.io/v1beta1
+      kind: Gateway
+      metadata:
+        name: example
+    target:
+      kind: Gateway

tests/vendir.yml

@@ -32,14 +32,13 @@ directories:
       depth: 1
       refSelection:
         semver:
-          constraints: ">=1.19.1"
+          constraints: ">=1.27.0"
     includePaths:
-      - examples/contour/*.yaml
-    newRootPath: examples/contour
+      - examples/render/contour-gateway.yaml
+    newRootPath: examples/render
   - path: gateway-api
     githubRelease:
       slug: kubernetes-sigs/gateway-api
       latest: true
       disableAutoChecksumValidation: true
       assetNames: ["experimental-install.yaml"]
-