operator: fix bugs on reading configuration from config-map

daemon/daemon_main.go

@@ -160,11 +160,7 @@ func init() {
 		return
 	}
 
-	if viper.GetBool("version") {
-		fmt.Printf("Cilium %s\n", version.Version)
-		os.Exit(0)
-	}
-	cobra.OnInitialize(option.InitConfig("ciliumd"))
+	cobra.OnInitialize(option.InitConfig("Cilium", "ciliumd"))
 
 	// Reset the help function to also exit, as we block elsewhere in interrupts
 	// and would not exit when called with -h.

operator/flags.go

@@ -19,16 +19,16 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cilium/cilium/pkg/defaults"
+	"github.com/cilium/cilium/pkg/option"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/klog"
-
-	"github.com/cilium/cilium/pkg/defaults"
-	"github.com/cilium/cilium/pkg/option"
 )
 
 func init() {
-	cobra.OnInitialize(initConfig)
+	cobra.OnInitialize(option.InitConfig("Cilium-Operator", "cilium-operator"))
 
 	flags := rootCmd.Flags()
 

operator/main.go

@@ -102,15 +102,6 @@ func main() {
 	}
 }
 
-// initConfig reads in config file and ENV variables if set.
-func initConfig() {
-	if viper.GetBool("version") {
-		fmt.Printf("Cilium-Operator %s\n", version.Version)
-		os.Exit(0)
-	}
-	cobra.OnInitialize(option.InitConfig("cilium-operator"))
-}
-
 func kvstoreEnabled() bool {
 	if option.Config.KVStore == "" {
 		return false

pkg/option/config.go

@@ -37,6 +37,7 @@ import (
 	"github.com/cilium/cilium/pkg/logging"
 	"github.com/cilium/cilium/pkg/logging/logfields"
 	"github.com/cilium/cilium/pkg/metrics"
+	"github.com/cilium/cilium/pkg/version"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
@@ -2268,7 +2269,9 @@ func (c *DaemonConfig) populateNodePortRange() error {
 			return errors.New("NodePort range min port must be smaller than max port")
 		}
 	case 0:
-		log.Warning("NodePort range was set but is empty.")
+		if viper.IsSet(NodePortRange) {
+			log.Warning("NodePort range was set but is empty.")
+		}
 	default:
 		return fmt.Errorf("Unable to parse min/max port value for NodePort range: %s", NodePortRange)
 	}
@@ -2305,11 +2308,13 @@ func (c *DaemonConfig) populateHostServicesProtos() error {
 func sanitizeIntParam(paramName string, paramDefault int) int {
 	intParam := viper.GetInt(paramName)
 	if intParam <= 0 {
-		log.WithFields(
-			logrus.Fields{
-				"parameter":    paramName,
-				"defaultValue": paramDefault,
-			}).Warning("user-provided parameter had value <= 0 , which is invalid ; setting to default")
+		if !viper.IsSet(paramName) {
+			log.WithFields(
+				logrus.Fields{
+					"parameter":    paramName,
+					"defaultValue": paramDefault,
+				}).Warning("user-provided parameter had value <= 0 , which is invalid ; setting to default")
+		}
 		return paramDefault
 	}
 	return intParam
@@ -2340,8 +2345,13 @@ func getHostDevice() string {
 }
 
 // InitConfig reads in config file and ENV variables if set.
-func InitConfig(configName string) func() {
+func InitConfig(programName, configName string) func() {
 	return func() {
+		if viper.GetBool("version") {
+			fmt.Printf("%s %s\n", programName, version.Version)
+			os.Exit(0)
+		}
+
 		if viper.GetString(CMDRef) != "" {
 			return
 		}

test/helpers/kubectl.go

@@ -1493,6 +1493,43 @@ func (kub *Kubectl) GetPublicIface() (string, error) {
 	return kub.getIfaceByIPAddr(K8s1, ipAddr)
 }
 
+func (kub *Kubectl) DeleteCiliumOperator() error {
+	// Do not assert on success in AfterEach intentionally to avoid
+	// incomplete teardown.
+
+	_ = kub.DeleteResource("deployment", fmt.Sprintf("-n %s cilium-operator", GetCiliumNamespace(GetCurrentIntegration())))
+	return kub.waitToDeleteCiliumOperator()
+}
+
+func (kub *Kubectl) waitToDeleteCiliumOperator() error {
+	var (
+		pods []string
+		err  error
+	)
+
+	ctx, cancel := context.WithTimeout(context.Background(), HelperTimeout)
+	defer cancel()
+
+	status := 1
+	for status > 0 {
+
+		select {
+		case <-ctx.Done():
+			return fmt.Errorf("timed out waiting to delete Cilium Operator: pods still remaining: %s", pods)
+		default:
+		}
+
+		pods, err = kub.GetPodNamesContext(ctx, GetCiliumNamespace(GetCurrentIntegration()), "io.cilium/app=cilium")
+		status = len(pods)
+		kub.Logger().Infof("Cilium Operator pods terminating '%d' err='%v' pods='%v'", status, err, pods)
+		if status == 0 {
+			return nil
+		}
+		time.Sleep(1 * time.Second)
+	}
+	return nil
+}
+
 func (kub *Kubectl) DeleteCiliumDS() error {
 	// Do not assert on success in AfterEach intentionally to avoid
 	// incomplete teardown.
@@ -1557,6 +1594,13 @@ func (kub *Kubectl) CiliumInstall(filename string, options map[string]string) er
 		return err
 	}
 
+	// Remove cilium operator to ensure that new instances of cilium-operator are started
+	// for the newly generated ConfigMap. Otherwise, the CM changes will stay
+	// inactive until each cilium-operator has been restarted.
+	if err := kub.DeleteCiliumOperator(); err != nil {
+		return err
+	}
+
 	res := kub.Apply(ApplyOptions{FilePath: filename, Force: true, Namespace: GetCiliumNamespace(GetCurrentIntegration())})
 	if !res.WasSuccessful() {
 		return res.GetErr("Unable to apply YAML")
@@ -2757,7 +2801,7 @@ func (kub *Kubectl) ciliumHealthPreFlightCheck() error {
 		if len(ciliumPods) != len(nodeCount) {
 			return fmt.Errorf(
 				"cilium-agent '%s': Only %d/%d nodes appeared in cilium-health status. nodes = '%+v'",
-				pod, len(nodeCount), len(ciliumPods), nodeCount)
+				pod, len(ciliumPods), len(nodeCount), nodeCount)
 		}
 
 		healthStatus, err := status.Filter(statusFilter)