Merge pull request #579 from Hyzhou/master

Add the pointer for optional fields.
kubernetes-sigs · Mar 17, 2021 · c7835a4 · c7835a4
2 parents e2b572b + fe4edd5
commit c7835a4
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 30 deletions.
diff --git a/apis/v1alpha1/gateway_types.go b/apis/v1alpha1/gateway_types.go
@@ -293,7 +293,7 @@ type TLSOverridePolicy struct {
 	//
 	// +optional
 	// +kubebuilder:default=Deny
-	Certificate TLSRouteOverrideType `json:"certificate,omitempty"`
+	Certificate *TLSRouteOverrideType `json:"certificate,omitempty"`
 }
 
 // GatewayTLSConfig describes a TLS configuration.
@@ -321,7 +321,7 @@ type GatewayTLSConfig struct {
 	//
 	// +optional
 	// +kubebuilder:default=Terminate
-	Mode TLSModeType `json:"mode,omitempty"`
+	Mode *TLSModeType `json:"mode,omitempty"`
 
 	// CertificateRef is the reference to Kubernetes object that contain a
 	// TLS certificate and private key. This certificate MUST be used for
@@ -353,7 +353,7 @@ type GatewayTLSConfig struct {
 	//
 	// +optional
 	// +kubebuilder:default={certificate:Deny}
-	RouteOverride TLSOverridePolicy `json:"routeOverride,omitempty"`
+	RouteOverride *TLSOverridePolicy `json:"routeOverride,omitempty"`
 
 	// Options are a list of key/value pairs to give extended options
 	// to the provider.
@@ -396,7 +396,7 @@ type RouteBindingSelector struct {
 	//
 	// +optional
 	// +kubebuilder:default={from: Same}
-	Namespaces RouteNamespaces `json:"namespaces,omitempty"`
+	Namespaces *RouteNamespaces `json:"namespaces,omitempty"`
 	// Selector specifies a set of route labels used for selecting
 	// routes to associate with the Gateway. If this Selector is defined,
 	// only routes matching the Selector are associated with the Gateway.
@@ -426,7 +426,7 @@ type RouteBindingSelector struct {
 	// +kubebuilder:default=networking.x-k8s.io
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=253
-	Group string `json:"group,omitempty"`
+	Group *string `json:"group,omitempty"`
 	// Kind is the kind of the route resource to select.
 	//
 	// Kind MUST correspond to kinds of routes that are compatible with the
@@ -467,7 +467,7 @@ type RouteNamespaces struct {
 	//
 	// +optional
 	// +kubebuilder:default=Same
-	From RouteSelectType `json:"from,omitempty"`
+	From *RouteSelectType `json:"from,omitempty"`
 
 	// Selector must be specified when From is set to "Selector". In that case,
 	// only Routes in Namespaces matching this Selector will be selected by this
@@ -476,7 +476,7 @@ type RouteNamespaces struct {
 	// Support: Core
 	//
 	// +optional
-	Selector metav1.LabelSelector `json:"selector,omitempty"`
+	Selector *metav1.LabelSelector `json:"selector,omitempty"`
 }
 
 // GatewayAddress describes an address that can be bound to a Gateway.
@@ -487,7 +487,7 @@ type GatewayAddress struct {
 	//
 	// +optional
 	// +kubebuilder:default=IPAddress
-	Type AddressType `json:"type,omitempty"`
+	Type *AddressType `json:"type,omitempty"`
 
 	// Value of the address. The validity of the values will depend
 	// on the type and support by the controller.

diff --git a/apis/v1alpha1/gatewayclass_types.go b/apis/v1alpha1/gatewayclass_types.go
@@ -105,7 +105,7 @@ type ParametersReference struct {
 	// +kubebuilder:validation:Enum=Cluster;Namespace
 	// +kubebuilder:default=Cluster
 	// +optional
-	Scope string `json:"scope,omitempty"`
+	Scope *string `json:"scope,omitempty"`
 
 	// Namespace is the namespace of the referent.
 	// This field is required when scope is set to "Namespace" and ignored when
@@ -114,7 +114,7 @@ type ParametersReference struct {
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=253
 	// +optional
-	Namespace string `json:"namespace,omitempty"`
+	Namespace *string `json:"namespace,omitempty"`
 }
 
 // GatewayClassConditionType is the type for status conditions on

diff --git a/apis/v1alpha1/httproute_types.go b/apis/v1alpha1/httproute_types.go
@@ -52,7 +52,7 @@ type HTTPRouteSpec struct {
 	//
 	// +optional
 	// +kubebuilder:default={allow: "SameNamespace"}
-	Gateways RouteGateways `json:"gateways,omitempty"`
+	Gateways *RouteGateways `json:"gateways,omitempty"`
 
 	// Hostnames defines a set of hostname that should match against
 	// the HTTP Host header to select a HTTPRoute to process the request.
@@ -276,7 +276,7 @@ type HTTPPathMatch struct {
 	//
 	// +optional
 	// +kubebuilder:default=Prefix
-	Type PathMatchType `json:"type,omitempty"`
+	Type *PathMatchType `json:"type,omitempty"`
 
 	// Value of the HTTP path to match against.
 	//
@@ -302,7 +302,7 @@ type HTTPHeaderMatch struct {
 	//
 	// +optional
 	// +kubebuilder:default=Exact
-	Type HeaderMatchType `json:"type,omitempty"`
+	Type *HeaderMatchType `json:"type,omitempty"`
 
 	// Values is a map of HTTP Headers to be matched.
 	// It MUST contain at least one entry.
@@ -631,7 +631,7 @@ type HTTPRouteForwardTo struct {
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=1000000
-	Weight int32 `json:"weight,omitempty"`
+	Weight *int32 `json:"weight,omitempty"`
 
 	// Filters defined at this-level should be executed if and only if the
 	// request is being forwarded to the backend defined here.

diff --git a/apis/v1alpha1/shared_types.go b/apis/v1alpha1/shared_types.go
@@ -63,7 +63,7 @@ type RouteGateways struct {
 	// +optional
 	// +kubebuilder:validation:Enum=All;FromList;SameNamespace
 	// +kubebuilder:default=SameNamespace
-	Allow GatewayAllowType `json:"allow,omitempty"`
+	Allow *GatewayAllowType `json:"allow,omitempty"`
 
 	// GatewayRefs must be specified when Allow is set to "FromList". In that
 	// case, only Gateways referenced in this list will be allowed to use this
@@ -163,7 +163,7 @@ type RouteForwardTo struct {
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=1000000
-	Weight int32 `json:"weight,omitempty"`
+	Weight *int32 `json:"weight,omitempty"`
 }
 
 // RouteConditionType is a type of condition for a route.

diff --git a/apis/v1alpha1/tcproute_types.go b/apis/v1alpha1/tcproute_types.go
@@ -48,7 +48,7 @@ type TCPRouteSpec struct {
 	//
 	// +optional
 	// +kubebuilder:default={allow: "SameNamespace"}
-	Gateways RouteGateways `json:"gateways,omitempty"`
+	Gateways *RouteGateways `json:"gateways,omitempty"`
 }
 
 // TCPRouteStatus defines the observed state of TCPRoute

diff --git a/apis/v1alpha1/tlsroute_types.go b/apis/v1alpha1/tlsroute_types.go
@@ -53,7 +53,7 @@ type TLSRouteSpec struct {
 	//
 	// +optional
 	// +kubebuilder:default={allow: "SameNamespace"}
-	Gateways RouteGateways `json:"gateways,omitempty"`
+	Gateways *RouteGateways `json:"gateways,omitempty"`
 }
 
 // TLSRouteStatus defines the observed state of TLSRoute

diff --git a/apis/v1alpha1/udproute_types.go b/apis/v1alpha1/udproute_types.go
@@ -48,7 +48,7 @@ type UDPRouteSpec struct {
 	//
 	// +optional
 	// +kubebuilder:default={allow: "SameNamespace"}
-	Gateways RouteGateways `json:"gateways,omitempty"`
+	Gateways *RouteGateways `json:"gateways,omitempty"`
 }
 
 // UDPRouteStatus defines the observed state of UDPRoute.