Skip to content

Commit 1163ef9

Browse files
SchSebaSchSeba
authored
Merge pull request #625 from adrianchiris/remove-bool-ptr
Remove bool ptr
2 parents 08a79f7 + 9d4492e commit 1163ef9

File tree

8 files changed

+26
-36
lines changed

8 files changed

+26
-36
lines changed

‎api/v1/sriovoperatorconfig_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ type SriovOperatorConfigSpec struct {
4444
// NodeSelector selects the nodes to be configured
4545
ConfigDaemonNodeSelector map[string]string `json:"configDaemonNodeSelector,omitempty"`
4646
// Flag to control whether the network resource injector webhook shall be deployed
47-
EnableInjector *bool `json:"enableInjector,omitempty"`
47+
EnableInjector bool `json:"enableInjector,omitempty"`
4848
// Flag to control whether the operator admission controller webhook shall be deployed
49-
EnableOperatorWebhook *bool `json:"enableOperatorWebhook,omitempty"`
49+
EnableOperatorWebhook bool `json:"enableOperatorWebhook,omitempty"`
5050
// 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.
5151
// +kubebuilder:validation:Minimum=0
5252
// +kubebuilder:validation:Maximum=2

‎api/v1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/sriovoperatorconfig_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ func (r *SriovOperatorConfigReconciler) Reconcile(ctx context.Context, req ctrl.
8989
defaultConfig.SetNamespace(vars.Namespace)
9090
defaultConfig.SetName(consts.DefaultConfigName)
9191
defaultConfig.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
92-
EnableInjector: func() *bool { b := vars.EnableAdmissionController; return &b }(),
93-
EnableOperatorWebhook: func() *bool { b := vars.EnableAdmissionController; return &b }(),
92+
EnableInjector: vars.EnableAdmissionController,
93+
EnableOperatorWebhook: vars.EnableAdmissionController,
9494
ConfigDaemonNodeSelector: map[string]string{},
9595
LogLevel: 2,
9696
DisableDrain: singleNode,
@@ -266,7 +266,7 @@ func (r *SriovOperatorConfigReconciler) syncWebhookObjs(ctx context.Context, dc
266266
}
267267

268268
// Delete injector webhook
269-
if !*dc.Spec.EnableInjector && path == consts.InjectorWebHookPath {
269+
if !dc.Spec.EnableInjector && path == consts.InjectorWebHookPath {
270270
for _, obj := range objs {
271271
err = r.deleteWebhookObject(ctx, obj)
272272
if err != nil {
@@ -279,7 +279,7 @@ func (r *SriovOperatorConfigReconciler) syncWebhookObjs(ctx context.Context, dc
279279
continue
280280
}
281281
// Delete operator webhook
282-
if !*dc.Spec.EnableOperatorWebhook && path == consts.OperatorWebHookPath {
282+
if !dc.Spec.EnableOperatorWebhook && path == consts.OperatorWebHookPath {
283283
for _, obj := range objs {
284284
err = r.deleteWebhookObject(ctx, obj)
285285
if err != nil {

‎controllers/sriovoperatorconfig_controller_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
3030
config.SetNamespace(testNamespace)
3131
config.SetName(constants.DefaultConfigName)
3232
config.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
33-
EnableInjector: func() *bool { b := true; return &b }(),
34-
EnableOperatorWebhook: func() *bool { b := true; return &b }(),
33+
EnableInjector: true,
34+
EnableOperatorWebhook: true,
3535
ConfigDaemonNodeSelector: map[string]string{},
3636
LogLevel: 2,
3737
}
@@ -100,8 +100,8 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
100100
err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
101101
Expect(err).NotTo(HaveOccurred())
102102
config.Spec = sriovnetworkv1.SriovOperatorConfigSpec{
103-
EnableInjector: func() *bool { b := true; return &b }(),
104-
EnableOperatorWebhook: func() *bool { b := true; return &b }(),
103+
EnableInjector: true,
104+
EnableOperatorWebhook: true,
105105
// ConfigDaemonNodeSelector: map[string]string{},
106106
LogLevel: 2,
107107
}
@@ -137,7 +137,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
137137
err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
138138
Expect(err).NotTo(HaveOccurred())
139139

140-
*config.Spec.EnableInjector = false
140+
config.Spec.EnableInjector = false
141141
err = k8sClient.Update(ctx, config)
142142
Expect(err).NotTo(HaveOccurred())
143143

@@ -153,7 +153,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
153153
err = util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
154154
Expect(err).NotTo(HaveOccurred())
155155

156-
*config.Spec.EnableInjector = true
156+
config.Spec.EnableInjector = true
157157
err = k8sClient.Update(ctx, config)
158158
Expect(err).NotTo(HaveOccurred())
159159

@@ -173,7 +173,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
173173
err := util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
174174
Expect(err).NotTo(HaveOccurred())
175175

176-
*config.Spec.EnableOperatorWebhook = false
176+
config.Spec.EnableOperatorWebhook = false
177177
err = k8sClient.Update(ctx, config)
178178
Expect(err).NotTo(HaveOccurred())
179179

@@ -193,7 +193,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
193193
err = util.WaitForNamespacedObject(config, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout)
194194
Expect(err).NotTo(HaveOccurred())
195195

196-
*config.Spec.EnableOperatorWebhook = true
196+
config.Spec.EnableOperatorWebhook = true
197197
err = k8sClient.Update(ctx, config)
198198
Expect(err).NotTo(HaveOccurred())
199199

‎main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ func createDefaultOperatorConfig(c client.Client) error {
271271
enableAdmissionController := os.Getenv("ADMISSION_CONTROLLERS_ENABLED") == "true"
272272
config := &sriovnetworkv1.SriovOperatorConfig{
273273
Spec: sriovnetworkv1.SriovOperatorConfigSpec{
274-
EnableInjector: func() *bool { b := enableAdmissionController; return &b }(),
275-
EnableOperatorWebhook: func() *bool { b := enableAdmissionController; return &b }(),
274+
EnableInjector: enableAdmissionController,
275+
EnableOperatorWebhook: enableAdmissionController,
276276
ConfigDaemonNodeSelector: map[string]string{},
277277
LogLevel: 2,
278278
DisableDrain: singleNode,

‎pkg/webhook/validate_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ func newDefaultOperatorConfig() *SriovOperatorConfig {
141141
Spec: SriovOperatorConfigSpec{
142142
ConfigDaemonNodeSelector: map[string]string{},
143143
DisableDrain: true,
144-
EnableInjector: func() *bool { b := true; return &b }(),
145-
EnableOperatorWebhook: func() *bool { b := true; return &b }(),
144+
EnableInjector: true,
145+
EnableOperatorWebhook: true,
146146
LogLevel: 2,
147147
},
148148
}

‎test/conformance/tests/test_sriov_operator.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,18 +2560,18 @@ func setSriovOperatorSpecFlag(flagName string, flagValue bool) {
25602560
}, &cfg)
25612561

25622562
Expect(err).ToNot(HaveOccurred())
2563-
if flagName == operatorNetworkInjectorFlag && *cfg.Spec.EnableInjector != flagValue {
2564-
cfg.Spec.EnableInjector = &flagValue
2563+
if flagName == operatorNetworkInjectorFlag && cfg.Spec.EnableInjector != flagValue {
2564+
cfg.Spec.EnableInjector = flagValue
25652565
err = clients.Update(context.TODO(), &cfg)
25662566
Expect(err).ToNot(HaveOccurred())
2567-
Expect(*cfg.Spec.EnableInjector).To(Equal(flagValue))
2567+
Expect(cfg.Spec.EnableInjector).To(Equal(flagValue))
25682568
}
25692569

2570-
if flagName == operatorWebhookFlag && *cfg.Spec.EnableOperatorWebhook != flagValue {
2571-
cfg.Spec.EnableOperatorWebhook = &flagValue
2570+
if flagName == operatorWebhookFlag && cfg.Spec.EnableOperatorWebhook != flagValue {
2571+
cfg.Spec.EnableOperatorWebhook = flagValue
25722572
clients.Update(context.TODO(), &cfg)
25732573
Expect(err).ToNot(HaveOccurred())
2574-
Expect(*cfg.Spec.EnableOperatorWebhook).To(Equal(flagValue))
2574+
Expect(cfg.Spec.EnableOperatorWebhook).To(Equal(flagValue))
25752575
}
25762576

25772577
if flagValue {

‎test/validation/tests/test_validation.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ var _ = Describe("validation", func() {
8787
err := clients.Client.Get(context.TODO(), goclient.ObjectKey{Name: "default", Namespace: operatorNamespace}, operatorConfig)
8888
Expect(err).ToNot(HaveOccurred())
8989

90-
if *operatorConfig.Spec.EnableInjector {
90+
if operatorConfig.Spec.EnableInjector {
9191
daemonset, err := clients.DaemonSets(operatorNamespace).Get(context.Background(), "network-resources-injector", metav1.GetOptions{})
9292
Expect(err).ToNot(HaveOccurred())
9393
Expect(daemonset.Status.DesiredNumberScheduled).To(Equal(daemonset.Status.NumberReady))
@@ -103,7 +103,7 @@ var _ = Describe("validation", func() {
103103
err := clients.Get(context.TODO(), goclient.ObjectKey{Name: "default", Namespace: operatorNamespace}, operatorConfig)
104104
Expect(err).ToNot(HaveOccurred())
105105

106-
if *operatorConfig.Spec.EnableOperatorWebhook {
106+
if operatorConfig.Spec.EnableOperatorWebhook {
107107
daemonset, err := clients.DaemonSets(operatorNamespace).Get(context.Background(), "operator-webhook", metav1.GetOptions{})
108108
Expect(err).ToNot(HaveOccurred())
109109
Expect(daemonset.Status.DesiredNumberScheduled).To(Equal(daemonset.Status.NumberReady))

0 commit comments

Comments
 (0)