upgrade to latest dependencies (#1921)

bumping knative.dev/serving 3504239...d0529c2:
  > d0529c2 Update net-certmanager nightly (# 15015)
  > cd1e144 Update net-kourier nightly (# 15017)
  > 6a15707 Update net-gateway-api nightly (# 15016)
  > 8e7a61c Set e2e scripts to test Gateway API and Contour (# 14999)
  > e053fe2 Update net-istio nightly (# 15018)
  > e640345 Update net-contour nightly (# 15008)
bumping knative.dev/eventing bbb9051...0604334:
  > 0604334 Replace all usages of deprecated wait.PollImmediate with wait.PollUntilContextTimeout (# 7786)
  > b644dad [main] Upgrade to latest dependencies (# 7785)

Signed-off-by: Knative Automation <automation@knative.team>

go.mod

@@ -21,11 +21,11 @@ require (
 	k8s.io/client-go v0.29.2
 	k8s.io/code-generator v0.29.2
 	knative.dev/client-pkg v0.0.0-20240313113642-ca457df5ea78
-	knative.dev/eventing v0.40.1-0.20240312170432-bbb9051e9fd0
+	knative.dev/eventing v0.40.1-0.20240315095424-06043341299e
 	knative.dev/hack v0.0.0-20240313135155-b9f6bf0b323b
 	knative.dev/networking v0.0.0-20240313172330-f56f3aa1b1dc
 	knative.dev/pkg v0.0.0-20240313155908-adefab46f5e5
-	knative.dev/serving v0.40.1-0.20240313161246-3504239e99cd
+	knative.dev/serving v0.40.1-0.20240315100431-d0529c2c459a
 	sigs.k8s.io/yaml v1.4.0
 )
 

go.sum

@@ -843,16 +843,16 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 knative.dev/client-pkg v0.0.0-20240313113642-ca457df5ea78 h1:Dyk9poFb3XsKle6bgI3+XoyBZRpKkPXNuZmaw6BcWfE=
 knative.dev/client-pkg v0.0.0-20240313113642-ca457df5ea78/go.mod h1:CODwMfQexBzzgB2fv9hYF1+FZfrYc9TF3B26GxW69zQ=
-knative.dev/eventing v0.40.1-0.20240312170432-bbb9051e9fd0 h1:uCaJsFiTl06ULwsqY8NjCvnDxqvSNybUU5Qk9eFBPhg=
+knative.dev/eventing v0.40.1-0.20240315095424-06043341299e h1:QFFBe5aKUmJTnlPXVlyX9yMmU+h0dXvWPS3u3HejVMw=
-knative.dev/eventing v0.40.1-0.20240312170432-bbb9051e9fd0/go.mod h1:cR01SW6iIArmoqN9hSIme8kG1LVwHA7bGltSFvXH9LM=
+knative.dev/eventing v0.40.1-0.20240315095424-06043341299e/go.mod h1:7RaRYyWlKDCWhSBxvlyqku/Ec1Trp82emUa2AiyP2kc=
 knative.dev/hack v0.0.0-20240313135155-b9f6bf0b323b h1:u2D/mdleFeMwjlnMG4ni7vIcaWio8NeYWYtBJe8C6xE=
 knative.dev/hack v0.0.0-20240313135155-b9f6bf0b323b/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
 knative.dev/networking v0.0.0-20240313172330-f56f3aa1b1dc h1:z75Ycp/60e61XmTEdOh1YLa1dFSdwsUHL5uiuqTdGV0=
 knative.dev/networking v0.0.0-20240313172330-f56f3aa1b1dc/go.mod h1:bxY9ExF1Rb3ruW20W4Q0LCPFbGuh3p5n+fxC9ep/L+k=
 knative.dev/pkg v0.0.0-20240313155908-adefab46f5e5 h1:zuVGYM92M4Up6v8ficASZMme+pkrIAFbqVGDbVyQ5E8=
 knative.dev/pkg v0.0.0-20240313155908-adefab46f5e5/go.mod h1:4BYDECEnyN4FFK5uSyFCz4Wcxww/jLx4f2FL5RwYg/I=
-knative.dev/serving v0.40.1-0.20240313161246-3504239e99cd h1:6NEDEzo8O3hElcnRS/ThXuU3ZsWN/jFQuNgugMvVLX0=
+knative.dev/serving v0.40.1-0.20240315100431-d0529c2c459a h1:wJuEtmRgQdKTT/XsgCxHtpnyBv7KWFt8GTgfpHNzZvM=
-knative.dev/serving v0.40.1-0.20240313161246-3504239e99cd/go.mod h1:Hap8Jqynf4haO0teCc145GK9ChRVDvtugZf/rLTRoBY=
+knative.dev/serving v0.40.1-0.20240315100431-d0529c2c459a/go.mod h1:Hap8Jqynf4haO0teCc145GK9ChRVDvtugZf/rLTRoBY=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/knative.dev/serving/test/e2e-common.sh

@@ -15,13 +15,13 @@
 # limitations under the License.
 
 # This script provides helper methods to perform cluster actions.
-# shellcheck disable=SC1090
 source "$(dirname "${BASH_SOURCE[0]}")/../vendor/knative.dev/hack/e2e-tests.sh"
 source "$(dirname "${BASH_SOURCE[0]}")/e2e-networking-library.sh"
 
 export CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-"latest"}
 # Since default is istio, make default ingress as istio
 export INGRESS_CLASS=${INGRESS_CLASS:-istio.ingress.networking.knative.dev}
+export GATEWAY_API_IMPLEMENTATION=${GATEWAY_API_IMPLEMENTATION:-"istio"}
 export ISTIO_VERSION=${ISTIO_VERSION:-"latest"}
 export KOURIER_VERSION=${KOURIER_VERSION:-""}
 export CONTOUR_VERSION=${CONTOUR_VERSION:-""}
@@ -173,12 +173,18 @@ function parse_flags() {
       ;;
     --gateway-api-version)
       # currently, the value of --gateway-api-version is ignored
-      # latest version of Contour pinned in third_party will be installed
+      # latest version of Gateway API pinned in third_party will be installed
       readonly GATEWAY_API_VERSION=$2
       readonly INGRESS_CLASS="gateway-api.ingress.networking.knative.dev"
       readonly SHORT=1
       return 2
       ;;
+    --gateway-api-implementation)
+      readonly GATEWAY_API_IMPLEMENTATION=$2
+      readonly INGRESS_CLASS="gateway-api.ingress.networking.knative.dev"
+      readonly SHORT=1
+      return 2
+      ;;
     --system-namespace)
       [[ -z "$2" ]] || [[ $2 = --* ]] && fail_test "Missing argument to --system-namespace"
       export SYSTEM_NAMESPACE=$2
@@ -240,9 +246,16 @@ function knative_setup() {
     fi
   fi
 
-  # Install gateway-api and istio. Gateway API CRD must be installed before Istio.
+  # Install gateway-api and istio or contour. Gateway API CRD must be installed before Istio.
   if is_ingress_class gateway-api; then
-    stage_gateway_api_resources
+    if [[ -z "${GATEWAY_API_IMPLEMENTATION}" || "${GATEWAY_API_IMPLEMENTATION}" == "istio" ]]; then
+      stage_istio_gateway_api_resources
+    elif [[ "${GATEWAY_API_IMPLEMENTATION}" == "contour" ]]; then
+      stage_contour_gateway_api_resources
+    else
+      echo "Only Gateway API with either Istio or Contour is currently supported in the e2e test matrix."
+      exit 1
+    fi
   fi
 
   stage_test_resources
@@ -278,15 +291,17 @@ function install() {
     "${REPO_ROOT_DIR}/test/config/ytt/core"
   )
 
+  local ingress_impl="${GATEWAY_API_IMPLEMENTATION}"
   if is_ingress_class istio; then
     # Istio - see cluster_setup for how the files are staged
     YTT_FILES+=("${E2E_YAML_DIR}/istio/${ingress_version}/install")
   elif is_ingress_class gateway-api; then
-    # This installs an istio version that works with the v1alpha1 gateway api
+    # This installs an istio/contour version that works with the v1 gateway api
-    YTT_FILES+=("${E2E_YAML_DIR}/gateway-api/install")
+    YTT_FILES+=("${E2E_YAML_DIR}/gateway-api/install-${ingress_impl}")
     YTT_FILES+=("${REPO_ROOT_DIR}/third_party/${ingress}-latest/gateway-api.yaml")
     YTT_FILES+=("${REPO_ROOT_DIR}/third_party/${ingress}-latest/net-gateway-api.yaml")
-    YTT_FILES+=("${REPO_ROOT_DIR}/third_party/${ingress}-latest/istio-gateway.yaml")
+    YTT_FILES+=("${REPO_ROOT_DIR}/third_party/${ingress}-latest/${ingress_impl}-gateway.yaml")
+    YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/ingress/${ingress}-${ingress_impl}")
   else
     YTT_FILES+=("${REPO_ROOT_DIR}/third_party/${ingress}-latest")
   fi

vendor/knative.dev/serving/test/e2e-networking-library.sh

@@ -18,11 +18,25 @@ function is_ingress_class() {
   [[ "${INGRESS_CLASS}" == *"${1}"* ]]
 }
 
-function stage_gateway_api_resources() {
+function stage_contour_gateway_api_resources() {
-  # This installs an istio version that works with the v1alpha1 gateway api
+  # This installs a contour version that works with the v1 gateway api
-  header "Staging Gateway API Resources"
+  header "Staging Gateway API Resources - Contour"
 
-  local gateway_dir="${E2E_YAML_DIR}/gateway-api/install"
+  local gateway_dir="${E2E_YAML_DIR}/gateway-api/install-contour"
+  mkdir -p "${gateway_dir}"
+
+  echo "Downloading Contour Gateway Provisioner ${CONTOUR_VERSION}..."
+  CONTOUR_VERSION=v1.28.1
+  curl -s "https://raw.githubusercontent.com/projectcontour/contour/${CONTOUR_VERSION}/examples/render/contour-gateway-provisioner.yaml" \
+    > "${gateway_dir}/contour-gateway-provisioner.yaml"
+  echo "Download complete!"
+}
+
+function stage_istio_gateway_api_resources() {
+  # This installs an istio version that works with the v1 gateway api
+  header "Staging Gateway API Resources - Istio"
+
+  local gateway_dir="${E2E_YAML_DIR}/gateway-api/install-istio"
   mkdir -p "${gateway_dir}"
 
   # TODO: if we switch to istio 1.12 we can reuse stage_istio_head
@@ -129,8 +143,13 @@ function setup_ingress_env_vars() {
     export GATEWAY_NAMESPACE_OVERRIDE=contour-external
   fi
   if is_ingress_class gateway-api; then
-    export GATEWAY_OVERRIDE=istio-ingressgateway
+    if [[ "${GATEWAY_API_IMPLEMENTATION}" == "contour" ]]; then
-    export GATEWAY_NAMESPACE_OVERRIDE=istio-system
+      export GATEWAY_OVERRIDE=envoy-knative-gateway
+      export GATEWAY_NAMESPACE_OVERRIDE=contour-external
+    else
+      export GATEWAY_OVERRIDE=istio-ingressgateway
+      export GATEWAY_NAMESPACE_OVERRIDE=istio-system
+    fi
   fi
 }
 

vendor/knative.dev/serving/test/e2e-tests.sh

@@ -17,7 +17,7 @@
 # This script runs the end-to-end tests against Knative Serving built from source.
 # It is started by prow for each PR. For convenience, it can also be executed manually.
 
-# If you already have a Knative cluster setup and kubectl pointing
+# If you already have a Kubernetes cluster setup and kubectl pointing
 # to it, call this script with the --run-tests arguments and it will use
 # the cluster and run the tests.
 

vendor/modules.txt

@@ -963,7 +963,7 @@ k8s.io/utils/trace
 # knative.dev/client-pkg v0.0.0-20240313113642-ca457df5ea78
 ## explicit; go 1.21
 knative.dev/client-pkg/pkg/kn/plugin
-# knative.dev/eventing v0.40.1-0.20240312170432-bbb9051e9fd0
+# knative.dev/eventing v0.40.1-0.20240315095424-06043341299e
 ## explicit; go 1.21
 knative.dev/eventing/pkg/apis/config
 knative.dev/eventing/pkg/apis/duck
@@ -1063,7 +1063,7 @@ knative.dev/pkg/tracing/config
 knative.dev/pkg/tracing/propagation
 knative.dev/pkg/tracing/propagation/tracecontextb3
 knative.dev/pkg/tracker
-# knative.dev/serving v0.40.1-0.20240313161246-3504239e99cd
+# knative.dev/serving v0.40.1-0.20240315100431-d0529c2c459a
 ## explicit; go 1.21
 knative.dev/serving/pkg/apis/autoscaling
 knative.dev/serving/pkg/apis/autoscaling/v1alpha1