Merge pull request #830 from youngnick/1-17-codegen

Fix CI failures for Go 1.17 and verifying invalid examples

hack/boilerplate/boilerplate.py

@@ -227,9 +227,11 @@ def get_regexs():
     # get_dates return 2014, 2015, 2016, 2017, or 2018 until the current year as a regex like: "(2014|2015|2016|2017|2018)";
     # company holder names can be anything
     regexs["date"] = re.compile(get_dates())
-    # strip // +build \n\n build constraints
+    # strip the following build constraints/tags:
+    # //go:build
+    # // +build \n\n
     regexs["go_build_constraints"] = re.compile(
-        r"^(// \+build.*\n)+\n", re.MULTILINE)
+        r"^(//(go:build| \+build).*\n)+\n", re.MULTILINE)
     # strip #!.* from scripts
     regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
     # Search for generated files

hack/verify-all.sh

@@ -69,7 +69,12 @@ do
       ret=1
     fi
   else
-    bash "$t" || ret=1
+    if bash "$t"; then
+      echo -e "${color_green}SUCCESS: $t ${color_norm}"
+    else
+      echo -e "${color_red}Test FAILED: $t ${color_norm}"
+      ret=1
+    fi
   fi
 done
 

hack/verify-examples-kind.sh

@@ -51,24 +51,44 @@ res=0
 KIND_CREATE_ATTEMPTED=true
 kind create cluster --name "${CLUSTER_NAME}" --kubeconfig "${KUBECONFIG}" || res=$?
 
-for VERSION in v1alpha1 v1alpha2
-do
-  # Install CRDs
-  kubectl apply --kubeconfig "${KUBECONFIG}" -f config/crd/"${VERSION}" || res=$?
+##### Test v1alpha1 CRD apply
+# Install CRDs
+kubectl apply --kubeconfig "${KUBECONFIG}" -f config/crd/v1alpha1 || res=$?
 
-  # Temporary workaround for https://github.com/kubernetes/kubernetes/issues/104090
-  sleep 8
+# Temporary workaround for https://github.com/kubernetes/kubernetes/issues/104090
+sleep 8
 
-  # Install all example gateway-api resources.
-  kubectl apply --kubeconfig "${KUBECONFIG}" --recursive -f examples/"${VERSION}" || res=$?
+# Install all example gateway-api resources.
+kubectl apply --kubeconfig "${KUBECONFIG}" --recursive -f examples/v1alpha1 || res=$?
 
-  # Uninstall CRDs
-  kubectl delete --kubeconfig "${KUBECONFIG}" -f config/crd/"${VERSION}" || res=$?
-done
+# Uninstall CRDs
+kubectl delete --kubeconfig "${KUBECONFIG}" -f config/crd/v1alpha1 || res=$?
 
-# None of these examples should be successfully configured
-kubectl apply --recursive -f hack/invalid-examples | grep configured && res=2
+##### Test v1alpha2 CRD apply and that invalid examples are invalid.
+# Install CRDs
+kubectl apply --kubeconfig "${KUBECONFIG}" -f config/crd/v1alpha2 || res=$?
+
+# Temporary workaround for https://github.com/kubernetes/kubernetes/issues/104090
+sleep 8
 
+# Install all example gateway-api resources.
+kubectl apply --kubeconfig "${KUBECONFIG}" --recursive -f examples/v1alpha2 || res=$?
+
+# Install invalid gateway-api resources.
+# None of these examples should be successfully configured
+# This is very hacky, sorry.
+# Firstly, apply the examples, remembering that errors are on stdout
+kubectl apply --kubeconfig "${KUBECONFIG}" --recursive -f hack/invalid-examples 2>&1 | \
+      # First, we grep out the expected responses.
+      # After this, if everything is as expected, the output should be empty.
+      grep -v 'is invalid' | \
+      grep -v 'missing required field' | \
+      # Then, we grep for anything else.
+      # If anything else is found, this will return 0
+      # which is *not* what we want.
+      grep -e '.' && \
+      res=2 || \
+      echo Examples failed as expected
 # Clean up and exit
 cleanup || res=$?
 exit $res