Merge pull request #1814 from shaneutt/shaneutt/release-v0.6.2

Release v0.6.2

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Table of Contents
 
+- [v0.6.2](#v062)
 - [v0.6.1](#v061)
 - [v0.6.0](#v060)
 - [v0.6.0-rc2](#v060-rc2)
@@ -22,6 +23,55 @@
 - [v0.1.0-rc2](#v010-rc2)
 - [v0.1.0-rc1](#v010-rc1)
 
+# v0.6.2
+
+This is a patch release that predominantly includes updated conformance tests
+for implementations to implement.
+
+For all major changes since the `v0.5.x` release series, please see the
+[v0.6.0](/#v060) release notes.
+
+## Maintenance
+
+- As per [changes in upstream to container image registries] we replaced all
+  usage of the k8s.gcr.io registry with registry.k8s.io.
+  (#1736, @shaneutt)
+
+[changes in upstream to container image registries]:https://github.com/kubernetes/k8s.io/issues/4738
+
+## Bug Fixes
+
+- Fix invalid HTTP redirect/rewrite examples.
+  (#1787, @Xunzhuo)
+
+## Conformance Test Updates
+
+- The `HTTPRouteInvalidCrossNamespaceParentRef` conformance test now checks for
+  the `NotAllowedByListeners` reason on the `HTTPRoute`'s `Accepted: false`
+  condition to better indicate why the route was note accepted.
+  (#1714, @skriss)
+- A conformance test was added for `HTTPRoute` to cover the behavior of a
+  non-matching `SectionName` similar to what was already present for
+  `ListenerPort`.
+  (#1719, @zaunist)
+- Fixed an issue where tests may fail erroneously on the removal of resources
+  that are already removed.
+  (#1745, @mlavacca)
+- Logging in conformance utilities related to resource's `ObservedGeneration`
+  has been improved to emit the `ObservedGenerations that are found for the
+  purpose of making it easier to debug test failures and be more verbose about
+  the objects in question.
+  (#1761, @briantkennedy)
+  (#1763, @briantkennedy)
+- Patch instead of update in some places in conformance tests to reduce noise
+  in logs.
+  (#1760, @michaelbeaumont)
+- Added `AttachedRoutes` testing to conformance tests.
+  (#1624, @ChaningHwang)
+- The conformance tests always check that the HTTPRoute ResolvedRefs condition
+  is enforced, even when the status is true.
+  (#1668, @mlavacca)
+
 # v0.6.1
 
 This is a patch release that predominantly includes updated conformance tests

config/webhook/admission_webhook.yaml

@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
         - name: webhook
-          image: gcr.io/k8s-staging-gateway-api/admission-server:v0.6.1
+          image: gcr.io/k8s-staging-gateway-api/admission-server:v0.6.2
           imagePullPolicy: Always
           args:
             - -logtostderr

config/webhook/certificate_config.yaml

@@ -88,7 +88,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1
+          image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1
           imagePullPolicy: IfNotPresent
           args:
             - create
@@ -122,7 +122,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1
+          image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1
           imagePullPolicy: IfNotPresent
           args:
             - patch

conformance/tests/gateway-invalid-route-kind.go

@@ -46,6 +46,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
 					Status: metav1.ConditionFalse,
 					Reason: string(v1beta1.ListenerReasonInvalidRouteKinds),
 				}},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
@@ -64,6 +65,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
 					Status: metav1.ConditionFalse,
 					Reason: string(v1beta1.ListenerReasonInvalidRouteKinds),
 				}},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)

conformance/tests/gateway-invalid-tls-certificateref.go

@@ -47,6 +47,7 @@ var GatewayInvalidTLSConfiguration = suite.ConformanceTest{
 				Status: metav1.ConditionFalse,
 				Reason: string(v1beta1.ListenerReasonInvalidCertificateRef),
 			}},
+			AttachedRoutes: 0,
 		}}
 
 		testCases := []struct {

conformance/tests/gateway-observed-generation-bump.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"sigs.k8s.io/gateway-api/apis/v1beta1"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
@@ -69,8 +70,8 @@ var GatewayObservedGenerationBump = suite.ConformanceTest{
 				},
 			})
 
-			err = s.Client.Update(ctx, mutate)
-			require.NoErrorf(t, err, "error updating the Gateway: %v", err)
+			err = s.Client.Patch(ctx, mutate, client.MergeFrom(original))
+			require.NoErrorf(t, err, "error patching the Gateway: %v", err)
 
 			// Ensure the generation and observedGeneration sync up
 			kubernetes.NamespacesMustBeAccepted(t, s.Client, s.TimeoutConfig, namespaces)

conformance/tests/gateway-secret-invalid-reference-grant.go

@@ -51,6 +51,7 @@ var GatewaySecretInvalidReferenceGrant = suite.ConformanceTest{
 					Status: metav1.ConditionFalse,
 					Reason: string(v1beta1.ListenerReasonRefNotPermitted),
 				}},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)

conformance/tests/gateway-secret-missing-reference-grant.go

@@ -51,6 +51,7 @@ var GatewaySecretMissingReferenceGrant = suite.ConformanceTest{
 					Status: metav1.ConditionFalse,
 					Reason: string(v1beta1.ListenerReasonRefNotPermitted),
 				}},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)

conformance/tests/gateway-secret-reference-grant-all-in-namespace.go

@@ -53,6 +53,7 @@ var GatewaySecretReferenceGrantAllInNamespace = suite.ConformanceTest{
 						Reason: string(v1beta1.ListenerConditionProgrammed),
 					},
 				},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)

conformance/tests/gateway-secret-reference-grant-specific.go

@@ -53,6 +53,7 @@ var GatewaySecretReferenceGrantSpecific = suite.ConformanceTest{
 						Reason: string(v1beta1.ListenerReasonProgrammed),
 					},
 				},
+				AttachedRoutes: 0,
 			}}
 
 			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)

conformance/tests/gateway-with-attached-routes.go

@@ -0,0 +1,77 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tests
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+
+	"sigs.k8s.io/gateway-api/apis/v1beta1"
+	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
+	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+)
+
+func init() {
+	ConformanceTests = append(ConformanceTests, GatewayWithAttachedRoutes)
+}
+
+var GatewayWithAttachedRoutes = suite.ConformanceTest{
+	ShortName:   "GatewayWithAttachedRoutes",
+	Description: "A Gateway in the gateway-conformance-infra namespace should be attached to routes.",
+	Manifests:   []string{"tests/gateway-with-attached-routes.yaml"},
+	Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
+		t.Run("Gateway listener should have one valid http routes attached", func(t *testing.T) {
+			gwNN := types.NamespacedName{Name: "gateway-with-one-attached-route", Namespace: "gateway-conformance-infra"}
+			listeners := []v1beta1.ListenerStatus{{
+				Name: v1beta1.SectionName("http"),
+				SupportedKinds: []v1beta1.RouteGroupKind{{
+					Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+					Kind:  v1beta1.Kind("HTTPRoute"),
+				}},
+				Conditions: []metav1.Condition{{
+					Type:   string(v1beta1.ListenerConditionAccepted),
+					Status: metav1.ConditionTrue,
+					Reason: "", //any reason
+				}},
+				AttachedRoutes: 1,
+			}}
+
+			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
+		})
+
+		t.Run("Gateway listener should have two valid http routes attached", func(t *testing.T) {
+			gwNN := types.NamespacedName{Name: "gateway-with-two-attached-routes", Namespace: "gateway-conformance-infra"}
+			listeners := []v1beta1.ListenerStatus{{
+				Name: v1beta1.SectionName("http"),
+				SupportedKinds: []v1beta1.RouteGroupKind{{
+					Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+					Kind:  v1beta1.Kind("HTTPRoute"),
+				}},
+				Conditions: []metav1.Condition{{
+					Type:   string(v1beta1.ListenerConditionAccepted),
+					Status: metav1.ConditionTrue,
+					Reason: "", //any reason
+				}},
+				AttachedRoutes: 2,
+			}}
+
+			kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
+		})
+	},
+}