Merge branch 'main' into fix-6752

Author: zirain

api/v1alpha1/envoyproxy_helpers.go

@@ -19,7 +19,7 @@ import (
 // DefaultEnvoyProxyProvider returns a new EnvoyProxyProvider with default settings.
 func DefaultEnvoyProxyProvider() *EnvoyProxyProvider {
 	return &EnvoyProxyProvider{
-		Type: ProviderTypeKubernetes,
+		Type: EnvoyProxyProviderTypeKubernetes,
 	}
 }
 
@@ -42,6 +42,7 @@ func DefaultEnvoyProxyKubeProvider() *EnvoyProxyKubernetesProvider {
 	}
 }
 
+// DefaultEnvoyProxyHpaMetrics returns a default HPA metrics spec for EnvoyProxy.
 func DefaultEnvoyProxyHpaMetrics() []autoscalingv2.MetricSpec {
 	return []autoscalingv2.MetricSpec{
 		{
@@ -74,11 +75,21 @@ func (e *EnvoyProxy) NeedToSwitchPorts() bool {
 	return !*e.Spec.Provider.Kubernetes.UseListenerPortAsContainerPort
 }
 
+// GetEnvoyProxyHostProvider returns the EnvoyProxyHostProvider of EnvoyProxyProvider or
+// a nil EnvoyProxyHostProvider if unspecified. If EnvoyProxyProvider is not of
+// type "Host", a nil EnvoyProxyHostProvider is returned.
+func (r *EnvoyProxyProvider) GetEnvoyProxyHostProvider() *EnvoyProxyHostProvider {
+	if r.Type != EnvoyProxyProviderTypeHost {
+		return nil
+	}
+	return r.Host
+}
+
 // GetEnvoyProxyKubeProvider returns the EnvoyProxyKubernetesProvider of EnvoyProxyProvider or
 // a default EnvoyProxyKubernetesProvider if unspecified. If EnvoyProxyProvider is not of
 // type "Kubernetes", a nil EnvoyProxyKubernetesProvider is returned.
 func (r *EnvoyProxyProvider) GetEnvoyProxyKubeProvider() *EnvoyProxyKubernetesProvider {
-	if r.Type != ProviderTypeKubernetes {
+	if r.Type != EnvoyProxyProviderTypeKubernetes {
 		return nil
 	}
 
@@ -117,6 +128,15 @@ func (r *EnvoyProxyProvider) GetEnvoyProxyKubeProvider() *EnvoyProxyKubernetesPr
 	return r.Kubernetes
 }
 
+// GetEnvoyVersion returns the version of Envoy to use.
+// This method gracefully handles nil pointers.
+func (e *EnvoyProxyHostProvider) GetEnvoyVersion() string {
+	if e == nil || e.EnvoyVersion == nil {
+		return ""
+	}
+	return *e.EnvoyVersion
+}
+
 // DefaultEnvoyProxyLoggingLevel returns envoy proxy  v1alpha1.LogComponentGatewayDefault log level.
 // If unspecified, defaults to "warn". When specified, all other logging components are ignored.
 func (logging *ProxyLogging) DefaultEnvoyProxyLoggingLevel() LogLevel {

api/v1alpha1/envoyproxy_types.go

@@ -329,22 +329,42 @@ type ProxyTelemetry struct {
 	Metrics *ProxyMetrics `json:"metrics,omitempty"`
 }
 
+// EnvoyProxyProviderType defines the types of providers supported by Envoy Proxy.
+//
+// +kubebuilder:validation:Enum=Kubernetes;Host
+type EnvoyProxyProviderType string
+
+const (
+	// EnvoyProxyProviderTypeKubernetes defines the "Kubernetes" provider.
+	EnvoyProxyProviderTypeKubernetes EnvoyProxyProviderType = "Kubernetes"
+
+	// EnvoyProxyProviderTypeHost defines the "Host" provider.
+	EnvoyProxyProviderTypeHost EnvoyProxyProviderType = "Host"
+)
+
 // EnvoyProxyProvider defines the desired state of a resource provider.
 // +union
 type EnvoyProxyProvider struct {
 	// Type is the type of resource provider to use. A resource provider provides
 	// infrastructure resources for running the data plane, e.g. Envoy proxy, and
-	// optional auxiliary control planes. Supported types are "Kubernetes".
+	// optional auxiliary control planes. Supported types are "Kubernetes"and "Host".
 	//
 	// +unionDiscriminator
-	Type ProviderType `json:"type"`
+	Type EnvoyProxyProviderType `json:"type"`
 	// Kubernetes defines the desired state of the Kubernetes resource provider.
 	// Kubernetes provides infrastructure resources for running the data plane,
 	// e.g. Envoy proxy. If unspecified and type is "Kubernetes", default settings
 	// for managed Kubernetes resources are applied.
 	//
 	// +optional
 	Kubernetes *EnvoyProxyKubernetesProvider `json:"kubernetes,omitempty"`
+	// Host provides runtime deployment of the data plane as a child process on the
+	// host environment.
+	// If unspecified and type is "Host", default settings for the custom provider
+	// are applied.
+	//
+	// +optional
+	Host *EnvoyProxyHostProvider `json:"host,omitempty"`
 }
 
 // ShutdownConfig defines configuration for graceful envoy shutdown process.
@@ -407,6 +427,15 @@ type EnvoyProxyKubernetesProvider struct {
 	EnvoyServiceAccount *KubernetesServiceAccountSpec `json:"envoyServiceAccount,omitempty"`
 }
 
+// EnvoyProxyHostProvider defines configuration for the "Host" resource provider.
+type EnvoyProxyHostProvider struct {
+	// EnvoyVersion is the version of Envoy to use. If unspecified, the version
+	// against which Envoy Gateway is built will be used.
+	//
+	// +optional
+	EnvoyVersion *string `json:"envoyVersion,omitempty"`
+}
+
 type KubernetesServiceAccountSpec struct {
 	// Name of the Service Account.
 	// When unset, this defaults to an autogenerated name.

api/v1alpha1/validation/envoygateway_validate.go

@@ -129,7 +129,7 @@ func validateEnvoyGatewayCustomInfrastructureProvider(infra *egv1a1.EnvoyGateway
 			return fmt.Errorf("field 'host' should be specified when infrastructure type is 'Host'")
 		}
 	default:
-		return fmt.Errorf("unsupported infrastructure provdier: %s", infra.Type)
+		return fmt.Errorf("unsupported infrastructure provider: %s", infra.Type)
 	}
 	return nil
 }

api/v1alpha1/validation/envoyproxy_validate.go

@@ -67,25 +67,31 @@ func validateEnvoyProxySpec(spec *egv1a1.EnvoyProxySpec) error {
 func validateProvider(spec *egv1a1.EnvoyProxySpec) []error {
 	var errs []error
 	if spec != nil && spec.Provider != nil {
-		if spec.Provider.Type != egv1a1.ProviderTypeKubernetes {
+		switch spec.Provider.Type {
+		case egv1a1.EnvoyProxyProviderTypeKubernetes:
+			validateDeploymentErrs := validateDeployment(spec)
+			if len(validateDeploymentErrs) != 0 {
+				errs = append(errs, validateDeploymentErrs...)
+			}
+			validateHpaErrors := validateHpa(spec)
+			if len(validateHpaErrors) != 0 {
+				errs = append(errs, validateHpaErrors...)
+			}
+			validatePdbErrors := validatePdb(spec)
+			if len(validatePdbErrors) != 0 {
+				errs = append(errs, validatePdbErrors...)
+			}
+			validateServiceErrs := validateService(spec)
+			if len(validateServiceErrs) != 0 {
+				errs = append(errs, validateServiceErrs...)
+			}
+		case egv1a1.EnvoyProxyProviderTypeHost:
+			if spec.Provider.Host == nil {
+				errs = append(errs, fmt.Errorf("field 'host' should be specified when provider type is 'Host'"))
+			}
+		default:
 			errs = append(errs, fmt.Errorf("unsupported provider type %v", spec.Provider.Type))
 		}
-		validateDeploymentErrs := validateDeployment(spec)
-		if len(validateDeploymentErrs) != 0 {
-			errs = append(errs, validateDeploymentErrs...)
-		}
-		validateHpaErrors := validateHpa(spec)
-		if len(validateHpaErrors) != 0 {
-			errs = append(errs, validateHpaErrors...)
-		}
-		validatePdbErrors := validatePdb(spec)
-		if len(validatePdbErrors) != 0 {
-			errs = append(errs, validatePdbErrors...)
-		}
-		validateServiceErrs := validateService(spec)
-		if len(validateServiceErrs) != 0 {
-			errs = append(errs, validateServiceErrs...)
-		}
 	}
 	return errs
 }