MEDIUM: add custom-validation-rules flag to dedicate correct custom resource for validation rules

Author: oktalz

main.go

@@ -265,6 +265,10 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
 	} else {
 		logger.Print("Ingress Management: default implementation")
 	}
+	if osArgs.CustomValidationRules.Name != "" {
+		logger.Printf("Custom validation rules provided in '%s'", osArgs.CustomValidationRules)
+	}
+
 	logger.Printf("Controller sync period: %s\n", osArgs.SyncPeriod.String())
 	hostname, err := os.Hostname()
 	logger.Error(err)

pkg/controller/monitor.go

@@ -86,6 +86,8 @@ func (c *HAProxyController) SyncData() {
 			change = c.store.EventTCPRoute(ns, job.Data.(*store.TCPRoute))
 		case k8ssync.REFERENCEGRANT:
 			change = c.store.EventReferenceGrant(ns, job.Data.(*store.ReferenceGrant))
+		case k8ssync.CUSTOM_RESOURCE:
+			change = true
 		case k8ssync.CR_TCP:
 			var data *store.TCPs
 			if job.Data != nil {

pkg/k8s/cr-validation-rules.go

@@ -48,6 +48,13 @@ func (c ValidationCR) GetInformerV3(eventChan chan k8ssync.SyncDataEvent, factor
 			return
 		}
 
+		if data.ObjectMeta.Namespace != osArgs.CustomValidationRules.Namespace {
+			return
+		}
+		if data.ObjectMeta.Name != osArgs.CustomValidationRules.Name {
+			return
+		}
+
 		validator, err := validators.Get()
 		if err != nil {
 			logger.Error("Failed to get validator: %s", err)
@@ -59,8 +66,11 @@ func (c ValidationCR) GetInformerV3(eventChan chan k8ssync.SyncDataEvent, factor
 			return
 		}
 		logger.Infof("ValidationRules %s/%s accepted and set [%s]", data.Namespace, data.Name, data.Spec.Prefix)
+		// eventChan <- k8ssync.SyncDataEvent{
+		// 	SyncType: k8ssync.SyncType(c.GetKind()), Namespace: data.Namespace, Name: data.Name, Data: data,
+		// }
 		eventChan <- k8ssync.SyncDataEvent{
-			SyncType: k8ssync.SyncType(c.GetKind()), Namespace: data.Namespace, Name: data.Name, Data: data,
+			SyncType: k8ssync.CUSTOM_RESOURCE, Namespace: data.Namespace, Name: data.Name, Data: data,
 		}
 	}
 

pkg/k8s/crs-monitor.go

@@ -112,6 +112,7 @@ func (k k8s) RunCRSCreationMonitoring(eventChan chan k8ssync.SyncDataEvent, stop
 						}
 						logger.Info("Custom resource definition created, adding CR watcher for " + crsV1[groupKind.Kind].GetKind())
 					case "ingress.v3.haproxy.org":
+						ok := true
 						switch groupKind.Kind {
 						case "Backend":
 							crsV3[groupKind.Kind] = NewBackendCRV3()
@@ -122,9 +123,15 @@ func (k k8s) RunCRSCreationMonitoring(eventChan chan k8ssync.SyncDataEvent, stop
 						case "TCP":
 							crsV3[groupKind.Kind] = NewTCPCRV3()
 						case "ValidationRules":
-							crsV3[groupKind.Kind] = NewValidationCRV3()
+							if osArgs.CustomValidationRules.Name != "" {
+								crsV3[groupKind.Kind] = NewValidationCRV3()
+							} else {
+								ok = false
+							}
+						}
+						if ok {
+							logger.Info("Custom resource definition created, adding CR watcher for " + crsV3[groupKind.Kind].GetKind())
 						}
-						logger.Info("Custom resource definition created, adding CR watcher for " + crsV3[groupKind.Kind].GetKind())
 					}
 
 					k.runCRInformers(eventChan, stop, namespace, informersSyncedEvent, crsV1, crsV3, osArgs)

pkg/k8s/main.go

@@ -160,7 +160,9 @@ func New(osArgs utils.OSArgs, whitelist map[string]struct{}, publishSvc *utils.N
 	k.registerCoreCRV3(NewDefaultsCRV3())
 	k.registerCoreCRV3(NewBackendCRV3())
 	k.registerCoreCRV3(NewTCPCRV3())
-	k.registerCoreCRV3(NewValidationCRV3())
+	if osArgs.CustomValidationRules.Name != "" {
+		k.registerCoreCRV3(NewValidationCRV3())
+	}
 	return k
 }
 

pkg/k8s/sync/sync.go

@@ -52,4 +52,5 @@ const (
 	GATEWAY         SyncType = "GATEWAY"
 	TCPROUTE        SyncType = "TCPROUTE"
 	REFERENCEGRANT  SyncType = "REFERENCEGRANT"
+	CUSTOM_RESOURCE SyncType = "CUSTOM_RESOURCE"
 )

pkg/utils/flags.go

@@ -124,4 +124,5 @@ type OSArgs struct {
 	CRDOutputFile                     string         `long:"output-file" description:"The file path of the converted (to the most recent version) CRD manifest"`
 	DisableIngressStatusUpdate        bool           `long:"disable-ingress-status-update" description:"If true, disables updating the status field of Ingress resources"`
 	EnableCustomAnnotationsOnIngress  bool           `long:"enable-custom-annotations-on-ingress" description:"allow custom user annotations on ingress"`
+	CustomValidationRules             NamespaceValue `long:"custom-validation-rules" description:"custom validation rules object" default:""`
 }