Update to 0.7.0

Author: Kate Osborn

README.md

@@ -43,7 +43,7 @@ The following table lists the software versions NGINX Kubernetes Gateway support
 
 | NGINX Kubernetes Gateway | Gateway API | Kubernetes | NGINX OSS |
 |-|-|-|-|
-| Edge | 0.6.2 | 1.21+ | 1.21.x *|
+| Edge | 0.7.0 | 1.21+ | 1.21.x *|
 | 0.3.0 | 0.6.2 | 1.21+ | 1.21.x *|
 | 0.2.0 | 0.5.1 | 1.21+ | 1.21.x *|
 | 0.1.0 | 0.5.0 | 1.19+ | 1.21.3 |

cmd/gateway/setup.go

@@ -17,7 +17,7 @@ import (
 const (
 	errTmpl = "failed validation - flag: '--%s' reason: '%s'\n"
 	// nolint:lll
-	// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.6.2/apis/v1beta1/shared_types.go#L495
+	// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.7.0/apis/v1beta1/shared_types.go#L495
 	controllerNameRegex = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$` //nolint:lll
 )
 

internal/nginx/config/servers.go

@@ -277,7 +277,7 @@ func createHTTPMatch(match v1beta1.HTTPRouteMatch, redirectPath string) httpMatc
 // The name and values are delimited by "=". A name and value can always be recovered using strings.SplitN(arg,"=", 2).
 // Query Parameters are case-sensitive so case is preserved.
 func createQueryParamKeyValString(p v1beta1.HTTPQueryParamMatch) string {
-	return p.Name + "=" + p.Value
+	return string(p.Name) + "=" + p.Value
 }
 
 // The name and values are delimited by ":". A name and value can always be recovered using strings.Split(arg, ":").

internal/state/change_processor.go

@@ -146,10 +146,10 @@ func NewChangeProcessorImpl(cfg ChangeProcessorConfig) *ChangeProcessorImpl {
 
 			var err error
 			switch o := obj.(type) {
-			// We don't validate GatewayClass, because as of 0.6.2, the webhook doesn't validate it (it only
+			// We don't validate GatewayClass, because as of 0.7.0, the webhook doesn't validate it (it only
 			// validates an update that requires the previous version of the resource,
 			// which NKG cannot reliably provide - for example, after NKG restarts).
-			// https://github.com/kubernetes-sigs/gateway-api/blob/v0.6.2/apis/v1beta1/validation/gatewayclass.go#L28
+			// https://github.com/kubernetes-sigs/gateway-api/blob/v0.7.0/apis/v1beta1/validation/gatewayclass.go#L28
 			case *v1beta1.Gateway:
 				err = gwapivalidation.ValidateGateway(o).ToAggregate()
 			case *v1beta1.HTTPRoute:

internal/state/conditions/conditions.go

@@ -220,16 +220,6 @@ func NewListenerConflictedHostname(msg string) []Condition {
 	}
 }
 
-// NewListenerUnsupportedAddress returns a Condition that indicates that the address of a Listener is unsupported.
-func NewListenerUnsupportedAddress(msg string) Condition {
-	return Condition{
-		Type:    string(v1beta1.ListenerConditionAccepted),
-		Status:  metav1.ConditionFalse,
-		Reason:  string(v1beta1.ListenerReasonUnsupportedAddress),
-		Message: msg,
-	}
-}
-
 // NewListenerUnsupportedProtocol returns a Condition that indicates that the protocol of a Listener is unsupported.
 func NewListenerUnsupportedProtocol(msg string) Condition {
 	return Condition{

internal/state/graph/gateway_listener.go

@@ -197,7 +197,7 @@ func createAddressesValidator(gw *v1beta1.Gateway) listenerValidator {
 		if len(gw.Spec.Addresses) > 0 {
 			path := field.NewPath("spec", "addresses")
 			valErr := field.Forbidden(path, "addresses are not supported")
-			return []conditions.Condition{conditions.NewListenerUnsupportedAddress(valErr.Error())}
+			return []conditions.Condition{conditions.NewListenerUnsupportedValue(valErr.Error())}
 		}
 		return nil
 	}

internal/state/graph/gateway_test.go

@@ -353,7 +353,9 @@ func TestBuildGateway(t *testing.T) {
 						Source: listener805,
 						Valid:  false,
 						Conditions: []conditions.Condition{
-							conditions.NewListenerPortUnavailable(`port: Unsupported value: 81: supported values: "80"`),
+							conditions.NewListenerPortUnavailable(
+								`port: Unsupported value: 81: supported values: "80"`,
+							),
 						},
 					},
 				},
@@ -370,7 +372,9 @@ func TestBuildGateway(t *testing.T) {
 						Source: listener4436,
 						Valid:  false,
 						Conditions: []conditions.Condition{
-							conditions.NewListenerPortUnavailable(`port: Unsupported value: 444: supported values: "443"`),
+							conditions.NewListenerPortUnavailable(
+								`port: Unsupported value: 444: supported values: "443"`,
+							),
 						},
 					},
 				},
@@ -515,7 +519,7 @@ func TestBuildGateway(t *testing.T) {
 						Source: listener801,
 						Valid:  false,
 						Conditions: []conditions.Condition{
-							conditions.NewListenerUnsupportedAddress(
+							conditions.NewListenerUnsupportedValue(
 								"spec.addresses: Forbidden: addresses are not supported",
 							),
 						},
@@ -525,7 +529,7 @@ func TestBuildGateway(t *testing.T) {
 						Valid:      false,
 						SecretPath: "",
 						Conditions: []conditions.Condition{
-							conditions.NewListenerUnsupportedAddress(
+							conditions.NewListenerUnsupportedValue(
 								"spec.addresses: Forbidden: addresses are not supported",
 							),
 						},

internal/state/graph/httproute.go

@@ -439,7 +439,7 @@ func validateQueryParamMatch(
 		allErrs = append(allErrs, valErr)
 	}
 
-	if err := validator.ValidateQueryParamNameInMatch(q.Name); err != nil {
+	if err := validator.ValidateQueryParamNameInMatch(string(q.Name)); err != nil {
 		valErr := field.Invalid(queryParamPath.Child("name"), q.Name, err.Error())
 		allErrs = append(allErrs, valErr)
 	}