Bump to release branch for upcoming fixes

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
projectcontour · May 22, 2023 · 9636a53 · 9636a53
1 parent aaab30a
commit 9636a53
Show file tree

Hide file tree

Showing 7 changed files with 323 additions and 282 deletions.
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
@@ -76,6 +76,8 @@ jobs:
           ./hack/actions/install-kubernetes-toolchain.sh $GITHUB_WORKSPACE/bin
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
       - name: generate
+        env:
+          GATEWAY_API_VERSION: "release-0.7"
         run: |
           make generate lint-yamllint lint-flags
           ./hack/actions/check-uncommitted-codegen.sh
@@ -360,6 +362,7 @@ jobs:
       - name: Gateway API conformance tests
         env:
           LOAD_PREBUILT_IMAGE: "true"
+          GATEWAY_API_VERSION: "release-0.7"
         run: |
           export CONTOUR_E2E_IMAGE="ghcr.io/projectcontour/contour:$(ls ./image/contour-*.tar | sed -E 's/.*contour-(.*).tar/\1/')"
           make gateway-conformance

diff --git a/examples/gateway/00-crds.yaml b/examples/gateway/00-crds.yaml
diff --git a/examples/gateway/01-admission_webhook.yaml b/examples/gateway/01-admission_webhook.yaml
@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
       - name: webhook
-        image: registry.k8s.io/gateway-api/admission-server:v0.7.0-rc2
+        image: registry.k8s.io/gateway-api/admission-server:v0.7.0
         imagePullPolicy: Always
         args:
         - -logtostderr

diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml
diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml
diff --git a/go.mod b/go.mod
@@ -44,7 +44,7 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.14.6
 	sigs.k8s.io/controller-tools v0.11.4
-	sigs.k8s.io/gateway-api v0.7.0-rc2
+	sigs.k8s.io/gateway-api v0.7.1-0.20230522211432-dfe12a7d62ab
 	sigs.k8s.io/kustomize/kyaml v0.14.2
 )
 

diff --git a/go.sum b/go.sum
@@ -841,8 +841,10 @@ sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92
 sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
 sigs.k8s.io/controller-tools v0.11.4 h1:jqXJ/Xb6yBgbgcBbw1YoC3rC+Bt1XZWiLjj0ZHv/GrU=
 sigs.k8s.io/controller-tools v0.11.4/go.mod h1:qcfX7jfcfYD/b7lAhvqAyTbt/px4GpvN88WKLFFv7p8=
-sigs.k8s.io/gateway-api v0.7.0-rc2 h1:LuxgWmjyRItkFB2/RAMRCzQW1Sfz7JPuiaRt1buUeOA=
-sigs.k8s.io/gateway-api v0.7.0-rc2/go.mod h1:Xv0+ZMxX0lu1nSSDIIPEfbVztgNZ+3cfiYrJsa2Ooso=
+sigs.k8s.io/gateway-api v0.7.1-0.20230522124231-6696019d06ec h1:0RdP056AL32ahyfBxyrP24wTG8D0+R58rdClKRHrGSc=
+sigs.k8s.io/gateway-api v0.7.1-0.20230522124231-6696019d06ec/go.mod h1:Xv0+ZMxX0lu1nSSDIIPEfbVztgNZ+3cfiYrJsa2Ooso=
+sigs.k8s.io/gateway-api v0.7.1-0.20230522211432-dfe12a7d62ab h1:8A5AncKzRdMgmZWHF7kxEDQeq60Yr3ZK5rh87y5AHBE=
+sigs.k8s.io/gateway-api v0.7.1-0.20230522211432-dfe12a7d62ab/go.mod h1:Xv0+ZMxX0lu1nSSDIIPEfbVztgNZ+3cfiYrJsa2Ooso=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kustomize/kyaml v0.14.2 h1:9WSwztbzwGszG1bZTziQUmVMrJccnyrLb5ZMKpJGvXw=