MINOR: add experimental flag

Author: ivanmatmati

main.go

@@ -197,6 +197,11 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
 			fmt.Printf("Ingress class: %s\n", osArgs.IngressClass)
 			fmt.Printf("Empty Ingress class: %t\n", osArgs.EmptyIngressClass)
 		}
+		if osArgs.Experimental.UseIngressMerge {
+			fmt.Println("Ingress Management: merge implementation")
+		} else {
+			fmt.Println("Ingress Management: default implementation")
+		}
 		return true
 	}
 
@@ -253,8 +258,12 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
 	}
 	logger.Debugf("Kubernetes Informers resync period: %s", osArgs.CacheResyncPeriod.String())
 	logger.Printf("Controller initial sync period: %s", osArgs.InitialSyncPeriod.String())
+	if osArgs.Experimental.UseIngressMerge {
+		logger.Print("Ingress Management: merge implementation")
+	} else {
+		logger.Print("Ingress Management: default implementation")
+	}
 	logger.Printf("Controller sync period: %s\n", osArgs.SyncPeriod.String())
-
 	hostname, err := os.Hostname()
 	logger.Error(err)
 	logger.Printf("Running on %s", hostname)

pkg/controller/builder.go

@@ -183,7 +183,7 @@ func (builder *Builder) Build() *HAProxyController {
 	if podIP == "" {
 		podIP = "127.0.0.1"
 	}
-	return &HAProxyController{
+	haproxyController := &HAProxyController{
 		osArgs:                   builder.osArgs,
 		haproxy:                  haproxy,
 		podNamespace:             os.Getenv("POD_NAMESPACE"),
@@ -199,6 +199,11 @@ func (builder *Builder) Build() *HAProxyController {
 		PodIP:                    podIP,
 		Hostname:                 hostname,
 	}
+	haproxyController.processIngress = haproxyController.processIngressesDefaultImplementation
+	if builder.osArgs.Experimental.UseIngressMerge {
+		haproxyController.processIngress = haproxyController.processIngressesWithMerge
+	}
+	return haproxyController
 }
 
 func addControllerMetricData(builder *Builder, chShutdown chan struct{}) {

pkg/controller/controller.go

@@ -62,6 +62,7 @@ type HAProxyController struct {
 	osArgs                   utils.OSArgs
 	auxCfgModTime            int64
 	ready                    bool
+	processIngress           func()
 }
 
 // Wrapping a Native-Client transaction and commit it.
@@ -152,7 +153,7 @@ func (c *HAProxyController) updateHAProxy() {
 		logger.Error(err)
 	}
 
-	c.processIngressesWithMerge()
+	c.processIngress()
 
 	updated := deep.Equal(route.CurentCustomRoutes, route.CustomRoutes, deep.FLAG_IGNORE_SLICE_ORDER)
 	if len(updated) != 0 {
@@ -423,3 +424,18 @@ func (c *HAProxyController) processIngressesWithMerge() {
 		}
 	}
 }
+
+func (c *HAProxyController) processIngressesDefaultImplementation() {
+	for _, namespace := range c.store.Namespaces {
+		c.store.SecretsProcessed = map[string]struct{}{}
+		for _, ingResource := range namespace.Ingresses {
+			if !namespace.Relevant && !ingResource.Faked {
+				// As we watch only for white-listed namespaces, we should not worry about iterating over
+				// many ingresses in irrelevant namespaces.
+				// There should only be fake ingresses in irrelevant namespaces so loop should be whithin small amount of ingresses (Prometheus)
+				continue
+			}
+			c.manageIngress(ingResource)
+		}
+	}
+}

pkg/utils/flags-experimental.go

@@ -0,0 +1,54 @@
+// Copyright 2019 HAProxy Technologies LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package utils
+
+import (
+	"strings"
+)
+
+type Experimental struct {
+	UseIngressMerge bool
+}
+
+const (
+	flagSeparator = ","
+	// Experimental flags
+	flagUseIngressMerge = "use-ingress-merge"
+)
+
+// UnmarshalFlag Unmarshal flag
+func (e *Experimental) UnmarshalFlag(value string) error {
+	var errors Errors
+	flags := strings.Split(value, flagSeparator)
+
+	// Then parse
+	for _, flag := range flags {
+		if flag == flagUseIngressMerge {
+			e.UseIngressMerge = true
+			continue
+		}
+	}
+
+	return errors.Result()
+}
+
+// MarshalFlag Marshals flag
+func (e Experimental) MarshalFlag() (string, error) {
+	flags := []string{}
+	if e.UseIngressMerge {
+		flags = append(flags, flagUseIngressMerge)
+	}
+	return strings.Join(flags, flagSeparator), nil
+}

pkg/utils/flags.go

@@ -117,6 +117,7 @@ type OSArgs struct {
 	DisableIPV6                       bool           `long:"disable-ipv6" description:"toggle to disable the IPv6 protocol from all frontends"`
 	UseWithPebble                     bool           `long:"with-pebble" description:"use pebble to start/stop/reload HAProxy"`
 	JobCheckCRD                       bool           `long:"job-check-crd" description:"does not execute IC, but adds/updates CRDs"`
+	Experimental                      Experimental   `long:"experimental" description:"comma separated list of experimental features to activate"`
 	DisableQuic                       bool           `long:"disable-quic" description:"disable quic protocol in http frontend bindings"`
 	DisableDelayedWritingOnlyIfReload bool           `long:"disable-writing-only-if-reload" description:"disable the delayed writing of files to disk only in case of haproxy reload (=write files to disk even if no reload)"`
 	CRDInputFile                      string         `long:"input-file" description:"The file path of a CRD manifest to convert"`