Merge pull request #967 from robscott/cherrypick-909-964

Cherrypick #909 and #964 into release-0.4
kubernetes-sigs · Dec 14, 2021 · dcd8db5 · dcd8db5
2 parents ff9883d + 2d00e06
commit dcd8db5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/apis/v1alpha2/gatewayclass_types.go b/apis/v1alpha2/gatewayclass_types.go
@@ -26,7 +26,7 @@ import (
 // +kubebuilder:resource:categories=gateway-api,scope=Cluster,shortName=gc
 // +kubebuilder:subresource:status
 // +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="Controller",type=string,JSONPath=`.spec.controller`
+// +kubebuilder:printcolumn:name="Controller",type=string,JSONPath=`.spec.controllerName`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:printcolumn:name="Description",type=string,JSONPath=`.spec.description`,priority=1
 

diff --git a/apis/v1alpha2/referencepolicy_types.go b/apis/v1alpha2/referencepolicy_types.go
@@ -104,7 +104,7 @@ type ReferencePolicyFrom struct {
 	// Namespace is the namespace of the referent.
 	//
 	// Support: Core
-	Namespace Namespace `json:"namespace,omitempty"`
+	Namespace Namespace `json:"namespace"`
 }
 
 // ReferencePolicyTo describes what Kinds are allowed as targets of the

diff --git a/config/crd/v1alpha2/gateway.networking.k8s.io_gatewayclasses.yaml b/config/crd/v1alpha2/gateway.networking.k8s.io_gatewayclasses.yaml
diff --git a/config/crd/v1alpha2/gateway.networking.k8s.io_referencepolicies.yaml b/config/crd/v1alpha2/gateway.networking.k8s.io_referencepolicies.yaml
diff --git a/hack/invalid-examples/v1alpha2/referencepolicy/missing-ns.yaml b/hack/invalid-examples/v1alpha2/referencepolicy/missing-ns.yaml
@@ -0,0 +1,11 @@
+apiVersion: gateway.networking.k8s.io/v1alpha2
+kind: ReferencePolicy
+metadata:
+  name: missing-ns
+spec:
+  to:
+  - group: ""
+    kind: "Service"
+  from:
+  - group: "gateway.networking.k8s.io"
+    kind: "HTTPRoute"