Merge branch 'issue1658-hostnetwork-v2'

Author: jvanz

Makefile

@@ -54,6 +54,9 @@ helm-unittest:
 test-e2e: controller-image audit-scanner-image policy-server-image
 	$(GO_BUILD_ENV) go test ./e2e/ -v
 
+.PHONY: test-all
+test-all: test helm-unittest test-e2e
+
 .PHONY: fmt-go
 fmt-go:
 	$(GO_BUILD_ENV) go fmt ./...

api/policies/v1/factories.go

@@ -486,6 +486,9 @@ type PolicyServerBuilder struct {
 	limits                 corev1.ResourceList
 	requests               corev1.ResourceList
 	sigstoreTrustConfigMap string
+	webhookPort            *int32
+	readinessProbePort     *int32
+	metricsPort            *int32
 }
 
 func NewPolicyServerFactory() *PolicyServerBuilder {
@@ -529,6 +532,21 @@ func (f *PolicyServerBuilder) WithRequests(requests corev1.ResourceList) *Policy
 	return f
 }
 
+func (f *PolicyServerBuilder) WithWebhookPort(port int32) *PolicyServerBuilder {
+	f.webhookPort = &port
+	return f
+}
+
+func (f *PolicyServerBuilder) WithReadinessProbePort(port int32) *PolicyServerBuilder {
+	f.readinessProbePort = &port
+	return f
+}
+
+func (f *PolicyServerBuilder) WithMetricsPort(port int32) *PolicyServerBuilder {
+	f.metricsPort = &port
+	return f
+}
+
 func (f *PolicyServerBuilder) Build() *PolicyServer {
 	policyServer := PolicyServer{
 		ObjectMeta: metav1.ObjectMeta{
@@ -552,6 +570,9 @@ func (f *PolicyServerBuilder) Build() *PolicyServer {
 			Limits:              f.limits,
 			Requests:            f.requests,
 			SigstoreTrustConfig: f.sigstoreTrustConfigMap,
+			WebhookPort:         f.webhookPort,
+			ReadinessProbePort:  f.readinessProbePort,
+			MetricsPort:         f.metricsPort,
 			Env: []corev1.EnvVar{
 				{
 					Name:  "KUBEWARDEN_LOG_LEVEL",

api/policies/v1/policyserver_types.go

@@ -139,6 +139,28 @@ type PolicyServerSpec struct {
 	// remain unchanged, but new pods that reference it cannot be created.
 	// +optional
 	PriorityClassName string `json:"priorityClassName,omitempty"`
+
+	// Port where the policy server listens for incoming webhook requests.
+	// When unset, defaults to 8443. This is the port the Kubernetes API server
+	// reaches when evaluating admission requests.
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	WebhookPort *int32 `json:"webhookPort,omitempty"`
+
+	// Port used by the policy server to expose the readiness probe endpoint.
+	// When unset, defaults to 8081.
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	ReadinessProbePort *int32 `json:"readinessProbePort,omitempty"`
+
+	// Port used by the policy server to expose the metrics endpoint.
+	// When unset, defaults to 8080. Only relevant when metrics are enabled.
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	MetricsPort *int32 `json:"metricsPort,omitempty"`
 }
 
 type ReconciliationTransitionReason string
@@ -211,6 +233,34 @@ func (ps *PolicyServer) AppLabel() string {
 	return "kubewarden-" + ps.NameWithPrefix()
 }
 
+// EffectiveWebhookPort returns the port the policy server listens on for
+// admission webhook requests, using the CRD field when set or the default constant.
+func (ps *PolicyServer) EffectiveWebhookPort() int32 {
+	if ps.Spec.WebhookPort != nil {
+		return *ps.Spec.WebhookPort
+	}
+	return constants.PolicyServerListenPort
+}
+
+// EffectiveReadinessProbePort returns the port used for the readiness probe,
+// using the CRD field when set or the default constant.
+func (ps *PolicyServer) EffectiveReadinessProbePort() int32 {
+	if ps.Spec.ReadinessProbePort != nil {
+		return *ps.Spec.ReadinessProbePort
+	}
+	return constants.PolicyServerReadinessProbePort
+}
+
+// EffectiveMetricsPort returns the port used to expose the metrics endpoint.
+// It returns the CRD-level override when set, otherwise it falls back to defaultPort
+// (which is typically the controller-wide default configured via environment variable).
+func (ps *PolicyServer) EffectiveMetricsPort(defaultPort int32) int32 {
+	if ps.Spec.MetricsPort != nil {
+		return *ps.Spec.MetricsPort
+	}
+	return defaultPort
+}
+
 // CommonLabels returns the common labels to be used with the resources
 // associated to a Policy Server. The labels defined follow
 // Kubernetes guidelines: https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/#labels

api/policies/v1/policyserver_webhook.go

@@ -36,7 +36,9 @@ import (
 )
 
 // SetupWebhookWithManager registers the PolicyServer webhook with the controller manager.
-func (ps *PolicyServer) SetupWebhookWithManager(mgr ctrl.Manager, deploymentsNamespace string) error {
+// defaultMetricsPort is the controller-wide default metrics port (possibly overridden via env
+// var) and is used by the validator to detect port conflicts involving the metrics port.
+func (ps *PolicyServer) SetupWebhookWithManager(mgr ctrl.Manager, deploymentsNamespace string, defaultMetricsPort int32) error {
 	logger := mgr.GetLogger().WithName("policyserver-webhook")
 
 	err := ctrl.NewWebhookManagedBy(mgr, ps).
@@ -45,6 +47,7 @@ func (ps *PolicyServer) SetupWebhookWithManager(mgr ctrl.Manager, deploymentsNam
 		}).
 		WithValidator(&policyServerValidator{
 			deploymentsNamespace: deploymentsNamespace,
+			defaultMetricsPort:   defaultMetricsPort,
 			k8sClient:            mgr.GetClient(),
 			logger:               logger,
 		}).
@@ -79,8 +82,12 @@ func (d *policyServerDefaulter) Default(_ context.Context, policyServer *PolicyS
 // polyServerCustomValidator validates PolicyServers when they are created, updated, or deleted.
 type policyServerValidator struct {
 	deploymentsNamespace string
-	k8sClient            client.Client
-	logger               logr.Logger
+	// defaultMetricsPort is the controller-wide default for the PolicyServer metrics port,
+	// which may be overridden via the KUBEWARDEN_POLICY_SERVER_SERVICES_METRICS_PORT env var.
+	// It is used when spec.metricsPort is not explicitly set on a PolicyServer.
+	defaultMetricsPort int32
+	k8sClient          client.Client
+	logger             logr.Logger
 }
 
 // ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
@@ -131,6 +138,7 @@ func (v *policyServerValidator) validate(ctx context.Context, policyServer *Poli
 	}
 
 	allErrs = append(allErrs, validateLimitsAndRequests(policyServer.Spec.Limits, policyServer.Spec.Requests)...)
+	allErrs = append(allErrs, v.validatePorts(policyServer)...)
 
 	if len(allErrs) == 0 {
 		return nil
@@ -208,3 +216,39 @@ func validateLimitsAndRequests(limits, requests corev1.ResourceList) field.Error
 
 	return allErrs
 }
+
+// validatePorts checks that the port fields in the PolicyServer spec do not
+// conflict with each other. Effective ports (field value or controller-configured default)
+// are compared so that partial overrides are also caught. The validator's defaultMetricsPort
+// is used so that the env-var-configured controller default is taken into account.
+func (v *policyServerValidator) validatePorts(policyServer *PolicyServer) field.ErrorList {
+	var allErrs field.ErrorList
+
+	webhookPort := policyServer.EffectiveWebhookPort()
+	readinessPort := policyServer.EffectiveReadinessProbePort()
+	metricsPort := policyServer.EffectiveMetricsPort(v.defaultMetricsPort)
+
+	if webhookPort == readinessPort {
+		allErrs = append(allErrs, field.Invalid(
+			field.NewPath("spec").Child("readinessProbePort"),
+			readinessPort,
+			fmt.Sprintf("readinessProbePort must differ from webhookPort (%d)", webhookPort),
+		))
+	}
+	if webhookPort == metricsPort {
+		allErrs = append(allErrs, field.Invalid(
+			field.NewPath("spec").Child("metricsPort"),
+			metricsPort,
+			fmt.Sprintf("metricsPort must differ from webhookPort (%d)", webhookPort),
+		))
+	}
+	if readinessPort == metricsPort {
+		allErrs = append(allErrs, field.Invalid(
+			field.NewPath("spec").Child("metricsPort"),
+			metricsPort,
+			fmt.Sprintf("metricsPort must differ from readinessProbePort (%d)", readinessPort),
+		))
+	}
+
+	return allErrs
+}

api/policies/v1/policyserver_webhook_test.go

@@ -279,3 +279,104 @@ func TestPolicyServerValidateSigstoreTrustConfig(t *testing.T) {
 		})
 	}
 }
+
+func TestValidatePorts(t *testing.T) {
+	tests := []struct {
+		name               string
+		webhookPort        *int32
+		readiness          *int32
+		metrics            *int32
+		defaultMetricsPort int32
+		errContains        string
+	}{
+		{
+			name:               "all defaults, no conflict",
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "",
+		},
+		{
+			name:               "webhookPort equals readinessProbePort",
+			webhookPort:        ptr.To[int32](8081),
+			readiness:          ptr.To[int32](8081),
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "readinessProbePort must differ from webhookPort",
+		},
+		{
+			name:               "webhookPort equals metricsPort",
+			webhookPort:        ptr.To[int32](8080),
+			metrics:            ptr.To[int32](8080),
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "metricsPort must differ from webhookPort",
+		},
+		{
+			name:               "readinessProbePort equals metricsPort",
+			readiness:          ptr.To[int32](9000),
+			metrics:            ptr.To[int32](9000),
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "metricsPort must differ from readinessProbePort",
+		},
+		{
+			name:               "all three ports the same",
+			webhookPort:        ptr.To[int32](9999),
+			readiness:          ptr.To[int32](9999),
+			metrics:            ptr.To[int32](9999),
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "readinessProbePort must differ from webhookPort",
+		},
+		{
+			name:               "all three ports distinct custom values",
+			webhookPort:        ptr.To[int32](9443),
+			readiness:          ptr.To[int32](9081),
+			metrics:            ptr.To[int32](9080),
+			defaultMetricsPort: constants.PolicyServerMetricsPort,
+			errContains:        "",
+		},
+		{
+			// When the controller default metrics port is overridden via env var to 9090,
+			// a PolicyServer with readinessProbePort=9090 (and no explicit metricsPort)
+			// must be rejected because the effective metrics port is 9090.
+			name:               "readinessProbePort conflicts with env-var-configured default metrics port",
+			readiness:          ptr.To[int32](9090),
+			defaultMetricsPort: 9090,
+			errContains:        "metricsPort must differ from readinessProbePort",
+		},
+		{
+			// When the controller default metrics port is overridden via env var to 9090,
+			// a PolicyServer with no explicit port overrides should be valid.
+			name:               "all defaults with non-standard env-var default metrics port, no conflict",
+			defaultMetricsPort: 9090,
+			errContains:        "",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			k8sClient := fake.NewClientBuilder().Build()
+			builder := NewPolicyServerFactory()
+			if test.webhookPort != nil {
+				builder = builder.WithWebhookPort(*test.webhookPort)
+			}
+			if test.readiness != nil {
+				builder = builder.WithReadinessProbePort(*test.readiness)
+			}
+			if test.metrics != nil {
+				builder = builder.WithMetricsPort(*test.metrics)
+			}
+			policyServer := builder.Build()
+
+			validator := policyServerValidator{
+				deploymentsNamespace: "default",
+				defaultMetricsPort:   test.defaultMetricsPort,
+				k8sClient:            k8sClient,
+				logger:               logr.Discard(),
+			}
+			err := validator.validate(t.Context(), policyServer)
+
+			if test.errContains != "" {
+				require.ErrorContains(t, err, test.errContains)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}

api/policies/v1/zz_generated.deepcopy.go

@@ -181,3 +181,20 @@ are configured.
 - {{ .Values.auditScanner.reportCRDsKind }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Compute the effective affinity for the controller deployment.
+Uses the controller-specific affinity if set, otherwise falls back to
+global.affinity for backward compatibility.
+
+NOTE: When hostNetwork is enabled, users are responsible for setting
+appropriate podAntiAffinity rules to prevent host-port conflicts between
+controller replicas on the same node.
+*/}}
+{{- define "kubewarden-controller.effectiveAffinity" -}}
+{{- if .Values.affinity -}}
+  {{- toYaml .Values.affinity -}}
+{{- else if .Values.global.affinity -}}
+  {{- toYaml .Values.global.affinity -}}
+{{- end -}}
+{{- end -}}