Merge branch 'main' into tlspolicy500

envoyproxy · Oct 19, 2024 · e5b0dcd · e5b0dcd
2 parents 9ca0ccd + 70c568b
commit e5b0dcd
Show file tree

Hide file tree

Showing 21 changed files with 237 additions and 207 deletions.
diff --git a/api/v1alpha1/basic_auth_types.go b/api/v1alpha1/basic_auth_types.go
@@ -5,7 +5,9 @@
 
 package v1alpha1
 
-import gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+import (
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
+)
 
 const BasicAuthUsersSecretKey = ".htpasswd"
 
@@ -23,5 +25,5 @@ type BasicAuth struct {
 	// for more details.
 	//
 	// Note: The secret must be in the same namespace as the SecurityPolicy.
-	Users gwapiv1b1.SecretObjectReference `json:"users"`
+	Users gwapiv1.SecretObjectReference `json:"users"`
 }
diff --git a/api/v1alpha1/oidc_types.go b/api/v1alpha1/oidc_types.go
@@ -7,7 +7,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 const OIDCClientSecretKey = "client-secret"
@@ -29,7 +29,7 @@ type OIDC struct {
 	// This is an Opaque secret. The client secret should be stored in the key
 	// "client-secret".
 	// +kubebuilder:validation:Required
-	ClientSecret gwapiv1b1.SecretObjectReference `json:"clientSecret"`
+	ClientSecret gwapiv1.SecretObjectReference `json:"clientSecret"`
 
 	// The optional cookie name overrides to be used for Bearer and IdToken cookies in the
 	// [Authentication Request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest).

diff --git a/api/v1alpha1/wasm_types.go b/api/v1alpha1/wasm_types.go
@@ -7,7 +7,7 @@ package v1alpha1
 
 import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // Wasm defines a Wasm extension.
@@ -136,7 +136,7 @@ type ImageWasmCodeSource struct {
 	// Only support Kubernetes Secret resource from the same namespace.
 	// +kubebuilder:validation:XValidation:message="only support Secret kind.",rule="self.kind == 'Secret'"
 	// +optional
-	PullSecretRef *gwapiv1b1.SecretObjectReference `json:"pullSecretRef,omitempty"`
+	PullSecretRef *gwapiv1.SecretObjectReference `json:"pullSecretRef,omitempty"`
 }
 
 // ImagePullPolicy defines the policy to use when pulling an OIC image.

diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go
@@ -344,7 +344,8 @@ func (t *Translator) processAccessLog(envoyproxy *egv1a1.EnvoyProxy, resources *
 				al := &ir.ALSAccessLog{
 					LogName: logName,
 					Destination: ir.RouteDestination{
-						Name:     fmt.Sprintf("accesslog_als_%d_%d", i, j), // TODO: rename this, so that we can share backend with tracing?
+						// TODO: rename this, so that we can share backend with tracing?
+						Name:     fmt.Sprintf("accesslog_als_%d_%d", i, j),
 						Settings: ds,
 					},
 					Traffic:    traffic,
@@ -384,7 +385,8 @@ func (t *Translator) processAccessLog(envoyproxy *egv1a1.EnvoyProxy, resources *
 					CELMatches: validExprs,
 					Resources:  sink.OpenTelemetry.Resources,
 					Destination: ir.RouteDestination{
-						Name:     fmt.Sprintf("accesslog_otel_%d_%d", i, j), // TODO: rename this, so that we can share backend with tracing?
+						// TODO: rename this, so that we can share backend with tracing?
+						Name:     fmt.Sprintf("accesslog_otel_%d_%d", i, j),
 						Settings: ds,
 					},
 					Traffic: traffic,
@@ -416,7 +418,9 @@ func (t *Translator) processAccessLog(envoyproxy *egv1a1.EnvoyProxy, resources *
 	return irAccessLog, nil
 }
 
-func (t *Translator) processTracing(gw *gwapiv1.Gateway, envoyproxy *egv1a1.EnvoyProxy, mergeGateways bool, resources *resource.Resources) (*ir.Tracing, error) {
+func (t *Translator) processTracing(gw *gwapiv1.Gateway, envoyproxy *egv1a1.EnvoyProxy,
+	mergeGateways bool, resources *resource.Resources,
+) (*ir.Tracing, error) {
 	if envoyproxy == nil ||
 		envoyproxy.Spec.Telemetry == nil ||
 		envoyproxy.Spec.Telemetry.Tracing == nil {
@@ -460,7 +464,8 @@ func (t *Translator) processTracing(gw *gwapiv1.Gateway, envoyproxy *egv1a1.Envo
 		SamplingRate: samplingRate,
 		CustomTags:   tracing.CustomTags,
 		Destination: ir.RouteDestination{
-			Name:     "tracing", // TODO: rename this, so that we can share backend with accesslog?
+			// TODO: rename this, so that we can share backend with accesslog?
+			Name:     "tracing",
 			Settings: ds,
 		},
 		Provider: tracing.Provider,
@@ -487,13 +492,15 @@ func (t *Translator) processMetrics(envoyproxy *egv1a1.EnvoyProxy, resources *re
 	}
 
 	return &ir.Metrics{
-		EnableVirtualHostStats:          envoyproxy.Spec.Telemetry.Metrics.EnableVirtualHostStats != nil && *envoyproxy.Spec.Telemetry.Metrics.EnableVirtualHostStats,
-		EnablePerEndpointStats:          envoyproxy.Spec.Telemetry.Metrics.EnablePerEndpointStats != nil && *envoyproxy.Spec.Telemetry.Metrics.EnablePerEndpointStats,
-		EnableRequestResponseSizesStats: envoyproxy.Spec.Telemetry.Metrics.EnableRequestResponseSizesStats != nil && *envoyproxy.Spec.Telemetry.Metrics.EnableRequestResponseSizesStats,
+		EnableVirtualHostStats:          ptr.Deref(envoyproxy.Spec.Telemetry.Metrics.EnableVirtualHostStats, false),
+		EnablePerEndpointStats:          ptr.Deref(envoyproxy.Spec.Telemetry.Metrics.EnablePerEndpointStats, false),
+		EnableRequestResponseSizesStats: ptr.Deref(envoyproxy.Spec.Telemetry.Metrics.EnableRequestResponseSizesStats, false),
 	}, nil
 }
 
-func (t *Translator) processBackendRefs(backendCluster egv1a1.BackendCluster, namespace string, resources *resource.Resources, envoyProxy *egv1a1.EnvoyProxy) ([]*ir.DestinationSetting, *ir.TrafficFeatures, error) {
+func (t *Translator) processBackendRefs(backendCluster egv1a1.BackendCluster, namespace string,
+	resources *resource.Resources, envoyProxy *egv1a1.EnvoyProxy,
+) ([]*ir.DestinationSetting, *ir.TrafficFeatures, error) {
 	traffic, err := translateTrafficFeatures(backendCluster.BackendSettings)
 	if err != nil {
 		return nil, nil, err

diff --git a/internal/gatewayapi/validate.go b/internal/gatewayapi/validate.go
@@ -916,7 +916,7 @@ func (t *Translator) validateHostname(hostname string) error {
 func (t *Translator) validateSecretRef(
 	allowCrossNamespace bool,
 	from crossNamespaceFrom,
-	secretObjRef gwapiv1b1.SecretObjectReference,
+	secretObjRef gwapiv1.SecretObjectReference,
 	resources *resource.Resources,
 ) (*corev1.Secret, error) {
 	if err := t.validateSecretObjectRef(allowCrossNamespace, from, secretObjRef, resources); err != nil {
@@ -940,7 +940,7 @@ func (t *Translator) validateSecretRef(
 func (t *Translator) validateConfigMapRef(
 	allowCrossNamespace bool,
 	from crossNamespaceFrom,
-	secretObjRef gwapiv1b1.SecretObjectReference,
+	secretObjRef gwapiv1.SecretObjectReference,
 	resources *resource.Resources,
 ) (*corev1.ConfigMap, error) {
 	if err := t.validateSecretObjectRef(allowCrossNamespace, from, secretObjRef, resources); err != nil {
@@ -964,7 +964,7 @@ func (t *Translator) validateConfigMapRef(
 func (t *Translator) validateSecretObjectRef(
 	allowCrossNamespace bool,
 	from crossNamespaceFrom,
-	secretRef gwapiv1b1.SecretObjectReference,
+	secretRef gwapiv1.SecretObjectReference,
 	resources *resource.Resources,
 ) error {
 	var kind string

diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go
@@ -602,7 +602,7 @@ func (r *gatewayAPIReconciler) processSecretRef(
 	ownerKind string,
 	ownerNS string,
 	ownerName string,
-	secretRef gwapiv1b1.SecretObjectReference,
+	secretRef gwapiv1.SecretObjectReference,
 ) error {
 	secret := new(corev1.Secret)
 	secretNS := gatewayapi.NamespaceDerefOr(secretRef.Namespace, ownerNS)
@@ -704,7 +704,7 @@ func (r *gatewayAPIReconciler) processConfigMapRef(
 	ownerKind string,
 	ownerNS string,
 	ownerName string,
-	configMapRef gwapiv1b1.SecretObjectReference,
+	configMapRef gwapiv1.SecretObjectReference,
 ) error {
 	configMap := new(corev1.ConfigMap)
 	configMapNS := gatewayapi.NamespaceDerefOr(configMapRef.Namespace, ownerNS)
@@ -1794,7 +1794,7 @@ func (r *gatewayAPIReconciler) processBackendTLSPolicyRefs(
 					string(caCertRef.Kind) == resource.KindSecret {
 
 					var err error
-					caRefNew := gwapiv1b1.SecretObjectReference{
+					caRefNew := gwapiv1.SecretObjectReference{
 						Group:     gatewayapi.GroupPtr(string(caCertRef.Group)),
 						Kind:      gatewayapi.KindPtr(string(caCertRef.Kind)),
 						Name:      caCertRef.Name,

diff --git a/internal/provider/kubernetes/indexers.go b/internal/provider/kubernetes/indexers.go
@@ -531,7 +531,7 @@ func secretSecurityPolicyIndexFunc(rawObj client.Object) []string {
 	securityPolicy := rawObj.(*egv1a1.SecurityPolicy)
 
 	var (
-		secretReferences []gwapiv1b1.SecretObjectReference
+		secretReferences []gwapiv1.SecretObjectReference
 		values           []string
 	)
 

diff --git a/internal/provider/kubernetes/predicates_test.go b/internal/provider/kubernetes/predicates_test.go
@@ -19,7 +19,6 @@ import (
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/envoygateway"
@@ -261,7 +260,7 @@ func TestValidateSecretForReconcile(t *testing.T) {
 								TokenEndpoint:         ptr.To("https://oauth2.googleapis.com/token"),
 							},
 							ClientID: "client-id",
-							ClientSecret: gwapiv1b1.SecretObjectReference{
+							ClientSecret: gwapiv1.SecretObjectReference{
 								Name: "secret",
 							},
 						},
@@ -290,7 +289,7 @@ func TestValidateSecretForReconcile(t *testing.T) {
 							},
 						},
 						BasicAuth: &egv1a1.BasicAuth{
-							Users: gwapiv1b1.SecretObjectReference{
+							Users: gwapiv1.SecretObjectReference{
 								Name: "secret",
 							},
 						},
@@ -336,7 +335,7 @@ func TestValidateSecretForReconcile(t *testing.T) {
 									Type: egv1a1.ImageWasmCodeSourceType,
 									Image: &egv1a1.ImageWasmCodeSource{
 										URL: "https://example.com/testwasm:v1.0.0",
-										PullSecretRef: &gwapiv1b1.SecretObjectReference{
+										PullSecretRef: &gwapiv1.SecretObjectReference{
 											Name: "secret",
 										},
 									},