Fix conformance test

sjberman · sjberman · commit 451f88483441 · 2025-04-21T12:12:33.000-06:00
diff --git a/apis/v1alpha2/nginxproxy_types.go b/apis/v1alpha2/nginxproxy_types.go
@@ -550,7 +550,7 @@ const (
 
 // ExternalTrafficPolicy describes how nodes distribute service traffic they
 // receive on one of the Service's "externally-facing" addresses (NodePorts, ExternalIPs,
-// and LoadBalancer IPs.
+// and LoadBalancer IPs. Ignored for ClusterIP services.
 // +kubebuilder:validation:Enum=Cluster;Local
 type ExternalTrafficPolicy corev1.ServiceExternalTrafficPolicy
 
diff --git a/internal/mode/static/provisioner/objects.go b/internal/mode/static/provisioner/objects.go
@@ -423,9 +423,12 @@ func buildNginxService(
 		serviceType = corev1.ServiceType(*serviceCfg.ServiceType)
 	}
 
-	servicePolicy := defaultServicePolicy
-	if serviceCfg.ExternalTrafficPolicy != nil {
-		servicePolicy = corev1.ServiceExternalTrafficPolicy(*serviceCfg.ExternalTrafficPolicy)
+	var servicePolicy corev1.ServiceExternalTrafficPolicyType
+	if serviceType != corev1.ServiceTypeClusterIP {
+		servicePolicy = defaultServicePolicy
+		if serviceCfg.ExternalTrafficPolicy != nil {
+			servicePolicy = corev1.ServiceExternalTrafficPolicy(*serviceCfg.ExternalTrafficPolicy)
+		}
 	}
 
 	servicePorts := make([]corev1.ServicePort, 0, len(ports))
diff --git a/tests/conformance/conformance-rbac.yaml b/tests/conformance/conformance-rbac.yaml
@@ -16,6 +16,7 @@ rules:
   - pods
   - secrets
   - services
+  - serviceaccounts
   verbs:
   - create
   - delete

Original file line number	Diff line number	Diff line change
`@@ -423,9 +423,12 @@ func buildNginxService(`
`423`	`423`	`serviceType = corev1.ServiceType(*serviceCfg.ServiceType)`
`424`	`424`	`}`
`425`	`425`
`426`		`- servicePolicy := defaultServicePolicy`
`427`		`- if serviceCfg.ExternalTrafficPolicy != nil {`
`428`		`- servicePolicy = corev1.ServiceExternalTrafficPolicy(*serviceCfg.ExternalTrafficPolicy)`
	`426`	`+ var servicePolicy corev1.ServiceExternalTrafficPolicyType`
	`427`	`+ if serviceType != corev1.ServiceTypeClusterIP {`
	`428`	`+ servicePolicy = defaultServicePolicy`
	`429`	`+ if serviceCfg.ExternalTrafficPolicy != nil {`
	`430`	`+ servicePolicy = corev1.ServiceExternalTrafficPolicy(*serviceCfg.ExternalTrafficPolicy)`
	`431`	`+ }`
`429`	`432`	`}`
`430`	`433`
`431`	`434`	`servicePorts := make([]corev1.ServicePort, 0, len(ports))`