Merge pull request #625 from adrianchiris/remove-bool-ptr

Remove bool ptr
k8snetworkplumbingwg · Feb 12, 2024 · 1163ef9 · 1163ef9
2 parents 08a79f7 + 9d4492e
commit 1163ef9
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 36 deletions.
diff --git a/api/v1/sriovoperatorconfig_types.go b/api/v1/sriovoperatorconfig_types.go
@@ -44,9 +44,9 @@ type SriovOperatorConfigSpec struct {
 	// NodeSelector selects the nodes to be configured
 	ConfigDaemonNodeSelector map[string]string `json:"configDaemonNodeSelector,omitempty"`
 	// Flag to control whether the network resource injector webhook shall be deployed
-	EnableInjector *bool `json:"enableInjector,omitempty"`
+	EnableInjector bool `json:"enableInjector,omitempty"`
 	// Flag to control whether the operator admission controller webhook shall be deployed
-	EnableOperatorWebhook *bool `json:"enableOperatorWebhook,omitempty"`
+	EnableOperatorWebhook bool `json:"enableOperatorWebhook,omitempty"`
 	// Flag to control the log verbose level of the operator. Set to '0' to show only the basic logs. And set to '2' to show all the available logs.
 	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=2

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go
@@ -89,8 +89,8 @@ func (r *SriovOperatorConfigReconciler) Reconcile(ctx context.Context, req ctrl.
 			defaultConfig.SetNamespace(vars.Namespace)
 			defaultConfig.SetName(consts.DefaultConfigName)
 			defaultConfig.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
-				EnableInjector:           func() *bool { b := vars.EnableAdmissionController; return &b }(),
-				EnableOperatorWebhook:    func() *bool { b := vars.EnableAdmissionController; return &b }(),
+				EnableInjector:           vars.EnableAdmissionController,
+				EnableOperatorWebhook:    vars.EnableAdmissionController,
 				ConfigDaemonNodeSelector: map[string]string{},
 				LogLevel:                 2,
 				DisableDrain:             singleNode,
@@ -266,7 +266,7 @@ func (r *SriovOperatorConfigReconciler) syncWebhookObjs(ctx context.Context, dc
 		}
 
 		// Delete injector webhook
-		if !*dc.Spec.EnableInjector && path == consts.InjectorWebHookPath {
+		if !dc.Spec.EnableInjector && path == consts.InjectorWebHookPath {
 			for _, obj := range objs {
 				err = r.deleteWebhookObject(ctx, obj)
 				if err != nil {
@@ -279,7 +279,7 @@ func (r *SriovOperatorConfigReconciler) syncWebhookObjs(ctx context.Context, dc
 			continue
 		}
 		// Delete operator webhook
-		if !*dc.Spec.EnableOperatorWebhook && path == consts.OperatorWebHookPath {
+		if !dc.Spec.EnableOperatorWebhook && path == consts.OperatorWebHookPath {
 			for _, obj := range objs {
 				err = r.deleteWebhookObject(ctx, obj)
 				if err != nil {

diff --git a/controllers/sriovoperatorconfig_controller_test.go b/controllers/sriovoperatorconfig_controller_test.go
@@ -30,8 +30,8 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 		config.SetNamespace(testNamespace)
 		config.SetName(constants.DefaultConfigName)
 		config.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
-			EnableInjector:           func() *bool { b := true; return &b }(),
-			EnableOperatorWebhook:    func() *bool { b := true; return &b }(),
+			EnableInjector:           true,
+			EnableOperatorWebhook:    true,
 			ConfigDaemonNodeSelector: map[string]string{},
 			LogLevel:                 2,
 		}
@@ -100,8 +100,8 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 			err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
 			Expect(err).NotTo(HaveOccurred())
 			config.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
-				EnableInjector:        func() *bool { b := true; return &b }(),
-				EnableOperatorWebhook: func() *bool { b := true; return &b }(),
+				EnableInjector:        true,
+				EnableOperatorWebhook: true,
 				// ConfigDaemonNodeSelector: map[string]string{},
 				LogLevel: 2,
 			}
@@ -137,7 +137,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 			err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
 			Expect(err).NotTo(HaveOccurred())
 
-			*config.Spec.EnableInjector = false
+			config.Spec.EnableInjector = false
 			err = k8sClient.Update(ctx, config)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -153,7 +153,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 			err = util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
 			Expect(err).NotTo(HaveOccurred())
 
-			*config.Spec.EnableInjector = true
+			config.Spec.EnableInjector = true
 			err = k8sClient.Update(ctx, config)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -173,7 +173,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 			err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
 			Expect(err).NotTo(HaveOccurred())
 
-			*config.Spec.EnableOperatorWebhook = false
+			config.Spec.EnableOperatorWebhook = false
 			err = k8sClient.Update(ctx, config)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -193,7 +193,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 			err = util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
 			Expect(err).NotTo(HaveOccurred())
 
-			*config.Spec.EnableOperatorWebhook = true
+			config.Spec.EnableOperatorWebhook = true
 			err = k8sClient.Update(ctx, config)
 			Expect(err).NotTo(HaveOccurred())
 

diff --git a/main.go b/main.go
@@ -271,8 +271,8 @@ func createDefaultOperatorConfig(c client.Client) error {
 	enableAdmissionController := os.Getenv("ADMISSION_CONTROLLERS_ENABLED") == "true"
 	config := &sriovnetworkv1.SriovOperatorConfig{
 		Spec: sriovnetworkv1.SriovOperatorConfigSpec{
-			EnableInjector:           func() *bool { b := enableAdmissionController; return &b }(),
-			EnableOperatorWebhook:    func() *bool { b := enableAdmissionController; return &b }(),
+			EnableInjector:           enableAdmissionController,
+			EnableOperatorWebhook:    enableAdmissionController,
 			ConfigDaemonNodeSelector: map[string]string{},
 			LogLevel:                 2,
 			DisableDrain:             singleNode,

diff --git a/pkg/webhook/validate_test.go b/pkg/webhook/validate_test.go
@@ -141,8 +141,8 @@ func newDefaultOperatorConfig() *SriovOperatorConfig {
 		Spec: SriovOperatorConfigSpec{
 			ConfigDaemonNodeSelector: map[string]string{},
 			DisableDrain:             true,
-			EnableInjector:           func() *bool { b := true; return &b }(),
-			EnableOperatorWebhook:    func() *bool { b := true; return &b }(),
+			EnableInjector:           true,
+			EnableOperatorWebhook:    true,
 			LogLevel:                 2,
 		},
 	}

diff --git a/test/conformance/tests/test_sriov_operator.go b/test/conformance/tests/test_sriov_operator.go
@@ -2560,18 +2560,18 @@ func setSriovOperatorSpecFlag(flagName string, flagValue bool) {
 	}, &cfg)
 
 	Expect(err).ToNot(HaveOccurred())
-	if flagName == operatorNetworkInjectorFlag && *cfg.Spec.EnableInjector != flagValue {
-		cfg.Spec.EnableInjector = &flagValue
+	if flagName == operatorNetworkInjectorFlag && cfg.Spec.EnableInjector != flagValue {
+		cfg.Spec.EnableInjector = flagValue
 		err = clients.Update(context.TODO(), &cfg)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(*cfg.Spec.EnableInjector).To(Equal(flagValue))
+		Expect(cfg.Spec.EnableInjector).To(Equal(flagValue))
 	}
 
-	if flagName == operatorWebhookFlag && *cfg.Spec.EnableOperatorWebhook != flagValue {
-		cfg.Spec.EnableOperatorWebhook = &flagValue
+	if flagName == operatorWebhookFlag && cfg.Spec.EnableOperatorWebhook != flagValue {
+		cfg.Spec.EnableOperatorWebhook = flagValue
 		clients.Update(context.TODO(), &cfg)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(*cfg.Spec.EnableOperatorWebhook).To(Equal(flagValue))
+		Expect(cfg.Spec.EnableOperatorWebhook).To(Equal(flagValue))
 	}
 
 	if flagValue {

diff --git a/test/validation/tests/test_validation.go b/test/validation/tests/test_validation.go
@@ -87,7 +87,7 @@ var _ = Describe("validation", func() {
 			err := clients.Client.Get(context.TODO(), goclient.ObjectKey{Name: "default", Namespace: operatorNamespace}, operatorConfig)
 			Expect(err).ToNot(HaveOccurred())
 
-			if *operatorConfig.Spec.EnableInjector {
+			if operatorConfig.Spec.EnableInjector {
 				daemonset, err := clients.DaemonSets(operatorNamespace).Get(context.Background(), "network-resources-injector", metav1.GetOptions{})
 				Expect(err).ToNot(HaveOccurred())
 				Expect(daemonset.Status.DesiredNumberScheduled).To(Equal(daemonset.Status.NumberReady))
@@ -103,7 +103,7 @@ var _ = Describe("validation", func() {
 			err := clients.Get(context.TODO(), goclient.ObjectKey{Name: "default", Namespace: operatorNamespace}, operatorConfig)
 			Expect(err).ToNot(HaveOccurred())
 
-			if *operatorConfig.Spec.EnableOperatorWebhook {
+			if operatorConfig.Spec.EnableOperatorWebhook {
 				daemonset, err := clients.DaemonSets(operatorNamespace).Get(context.Background(), "operator-webhook", metav1.GetOptions{})
 				Expect(err).ToNot(HaveOccurred())
 				Expect(daemonset.Status.DesiredNumberScheduled).To(Equal(daemonset.Status.NumberReady))