add validation options to HA service reconciler

Author: thirdeyenick

cmd/k8s-operator/operator.go

@@ -434,16 +434,17 @@ func runReconcilers(opts reconcilerOpts) {
 		Watches(&tsapi.ProxyGroup{}, ingressProxyGroupFilter).
 		Watches(&discoveryv1.EndpointSlice{}, ingressSvcFromEpsFilter).
 		Complete(&HAServiceReconciler{
-			recorder:    eventRecorder,
-			tsClient:    opts.tsClient,
-			tsnetServer: opts.tsServer,
-			defaultTags: strings.Split(opts.proxyTags, ","),
-			Client:      mgr.GetClient(),
-			logger:      opts.log.Named("service-pg-reconciler"),
-			lc:          lc,
-			clock:       tstime.DefaultClock{},
-			operatorID:  id,
-			tsNamespace: opts.tailscaleNamespace,
+			recorder:       eventRecorder,
+			tsClient:       opts.tsClient,
+			tsnetServer:    opts.tsServer,
+			defaultTags:    strings.Split(opts.proxyTags, ","),
+			Client:         mgr.GetClient(),
+			logger:         opts.log.Named("service-pg-reconciler"),
+			lc:             lc,
+			clock:          tstime.DefaultClock{},
+			operatorID:     id,
+			tsNamespace:    opts.tailscaleNamespace,
+			validationOpts: opts.validationOpts,
 		})
 	if err != nil {
 		startlog.Fatalf("could not create service-pg-reconciler: %v", err)

cmd/k8s-operator/svc-for-pg.go

@@ -66,6 +66,8 @@ type HAServiceReconciler struct {
 	defaultTags           []string
 	operatorID            string // stableID of the operator's Tailscale device
 
+	validationOpts validationOpts
+
 	clock tstime.Clock
 
 	mu sync.Mutex // protects following
@@ -861,7 +863,7 @@ func (r *HAServiceReconciler) validateService(ctx context.Context, svc *corev1.S
 		errs = append(errs, fmt.Errorf("ProxyGroup %q is of type %q but must be of type %q",
 			pg.Name, pg.Spec.Type, tsapi.ProxyGroupTypeIngress))
 	}
-	if violations := validateService(svc); len(violations) > 0 {
+	if violations := validateService(svc, r.validationOpts); len(violations) > 0 {
 		errs = append(errs, fmt.Errorf("invalid Service: %s", strings.Join(violations, ", ")))
 	}
 	svcList := &corev1.ServiceList{}