Merge pull request #215 from karelyatin/fix_gateway_default

Fix default handling for EnableChassisAsGateway
openstack-k8s-operators · Jan 31, 2024 · 8bdccc6 · 8bdccc6
2 parents def099a + 7488c24
commit 8bdccc6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/api/v1beta1/ovncontroller_types.go b/api/v1beta1/ovncontroller_types.go
@@ -158,7 +158,7 @@ type OVSExternalIDs struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=true
-	EnableChassisAsGateway bool `json:"enable-chassis-as-gateway"`
+	EnableChassisAsGateway *bool `json:"enable-chassis-as-gateway"`
 }
 
 // RbacConditionsSet - set the conditions for the rbac object

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/ovncontroller/configjob.go b/pkg/ovncontroller/configjob.go
@@ -61,7 +61,7 @@ func ConfigJob(
 	envVars["OvnBridge"] = env.SetValue(instance.Spec.ExternalIDS.OvnBridge)
 	envVars["OvnRemote"] = env.SetValue(internalEndpoint)
 	envVars["OvnEncapType"] = env.SetValue(instance.Spec.ExternalIDS.OvnEncapType)
-	envVars["EnableChassisAsGateway"] = env.SetValue(fmt.Sprintf("%t", instance.Spec.ExternalIDS.EnableChassisAsGateway))
+	envVars["EnableChassisAsGateway"] = env.SetValue(fmt.Sprintf("%t", *instance.Spec.ExternalIDS.EnableChassisAsGateway))
 	envVars["PhysicalNetworks"] = env.SetValue(getPhysicalNetworks(instance))
 	envVars["OvnHostName"] = EnvDownwardAPI("spec.nodeName")
 

diff --git a/tests/functional/ovncontroller_controller_test.go b/tests/functional/ovncontroller_controller_test.go
@@ -865,6 +865,7 @@ var _ = Describe("OVNController controller", func() {
 
 		It("applies meaningful defaults", func() {
 			ovnController := GetOVNController(ovnControllerName)
+			Expect(*ovnController.Spec.ExternalIDS.EnableChassisAsGateway).To(Equal(true))
 			Expect(ovnController.Spec.ExternalIDS.OvnEncapType).To(Equal("geneve"))
 			Expect(ovnController.Spec.ExternalIDS.OvnBridge).To(Equal("br-int"))
 			Expect(ovnController.Spec.ExternalIDS.SystemID).To(Equal("random"))