isPvEncryptionInTransitEnabled not being set properly in OCIMachine (#247)

shyamradhakrishnan · web-flow · commit dd9791da0913 · 2023-04-14T09:01:30.000+05:30
* Fix issue where pv encryption flag is reset
diff --git a/api/v1beta1/conversion.go b/api/v1beta1/conversion.go
@@ -120,3 +120,9 @@ func Convert_v1beta1_OCIMachineSpec_To_v1beta2_OCIMachineSpec(in *OCIMachineSpec
 	}
 	return nil
 }
+
+// Convert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer converts v1beta2 LoadBalancer to v1beta1 LoadBalancer
+
+func Convert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer(in *v1beta2.LoadBalancer, out *LoadBalancer, s conversion.Scope) error {
+	return autoConvert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer(in, out, s)
+}
diff --git a/api/v1beta1/ocimachine_conversion.go b/api/v1beta1/ocimachine_conversion.go
@@ -41,11 +41,9 @@ func (src *OCIMachine) ConvertTo(dstRaw conversion.Hub) error {
 // ConvertFrom converts the v1beta2 OCIMachine to a v1beta1 OCIMachine.
 func (dst *OCIMachine) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*v1beta2.OCIMachine)
-
 	if err := Convert_v1beta2_OCIMachine_To_v1beta1_OCIMachine(src, dst, nil); err != nil {
 		return err
 	}
-
 	// Preserve Hub data on down-conversion except for metadata.
 	return utilconversion.MarshalData(src, dst)
 }
diff --git a/api/v1beta1/ocimachine_types.go b/api/v1beta1/ocimachine_types.go
@@ -96,7 +96,6 @@ type OCIMachineSpec struct {
 	ProviderID *string `json:"providerID,omitempty"`
 
 	// Is in transit encryption of volumes required.
-	// +kubebuilder:default=true
 	// +optional
 	IsPvEncryptionInTransitEnabled bool `json:"isPvEncryptionInTransitEnabled,omitempty"`
 
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta2/ocimachine_types.go b/api/v1beta2/ocimachine_types.go
@@ -96,7 +96,6 @@ type OCIMachineSpec struct {
 	ProviderID *string `json:"providerID,omitempty"`
 
 	// Is in transit encryption of volumes required.
-	// +kubebuilder:default=true
 	// +optional
 	IsPvEncryptionInTransitEnabled bool `json:"isPvEncryptionInTransitEnabled,omitempty"`
 
diff --git a/cloud/scope/mocks/cluster_client_mock.go b/cloud/scope/mocks/cluster_client_mock.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml
@@ -115,9 +115,6 @@ spec:
                       loadBalancerId:
                         description: ID of Load Balancer.
                         type: string
-                      loadBalancerType:
-                        description: 'Type of Load Balancer: NLB (default) or LBaaS.'
-                        type: string
                       name:
                         description: LoadBalancer Name.
                         type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml
@@ -127,10 +127,6 @@ spec:
                               loadBalancerId:
                                 description: ID of Load Balancer.
                                 type: string
-                              loadBalancerType:
-                                description: 'Type of Load Balancer: NLB (default)
-                                  or LBaaS.'
-                                type: string
                               name:
                                 description: LoadBalancer Name.
                                 type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinepools.yaml
@@ -936,7 +936,6 @@ spec:
                         type: string
                     type: object
                   isPvEncryptionInTransitEnabled:
-                    default: true
                     description: Is in transit encryption of volumes required.
                     type: boolean
                   launchOptions:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachines.yaml
@@ -196,7 +196,6 @@ spec:
               ipxeScript:
                 type: string
               isPvEncryptionInTransitEnabled:
-                default: true
                 description: Is in transit encryption of volumes required.
                 type: boolean
               launchOptions:
@@ -700,8 +699,8 @@ spec:
                       description: The machine address.
                       type: string
                     type:
-                      description: Machine address type, one of Hostname, ExternalIP
-                        or InternalIP.
+                      description: Machine address type, one of Hostname, ExternalIP,
+                        InternalIP, ExternalDNS or InternalDNS.
                       type: string
                   required:
                   - address
@@ -958,7 +957,6 @@ spec:
               ipxeScript:
                 type: string
               isPvEncryptionInTransitEnabled:
-                default: true
                 description: Is in transit encryption of volumes required.
                 type: boolean
               launchOptions:
@@ -1448,8 +1446,8 @@ spec:
                       description: The machine address.
                       type: string
                     type:
-                      description: Machine address type, one of Hostname, ExternalIP
-                        or InternalIP.
+                      description: Machine address type, one of Hostname, ExternalIP,
+                        InternalIP, ExternalDNS or InternalDNS.
                       type: string
                   required:
                   - address
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinetemplates.yaml
@@ -215,7 +215,6 @@ spec:
                       ipxeScript:
                         type: string
                       isPvEncryptionInTransitEnabled:
-                        default: true
                         description: Is in transit encryption of volumes required.
                         type: boolean
                       launchOptions:
@@ -956,7 +955,6 @@ spec:
                       ipxeScript:
                         type: string
                       isPvEncryptionInTransitEnabled:
-                        default: true
                         description: Is in transit encryption of volumes required.
                         type: boolean
                       launchOptions:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml
@@ -117,9 +117,6 @@ spec:
                       loadBalancerId:
                         description: ID of Load Balancer.
                         type: string
-                      loadBalancerType:
-                        description: 'Type of Load Balancer: NLB (default) or LBaaS.'
-                        type: string
                       name:
                         description: LoadBalancer Name.
                         type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml
@@ -131,10 +131,6 @@ spec:
                               loadBalancerId:
                                 description: ID of Load Balancer.
                                 type: string
-                              loadBalancerType:
-                                description: 'Type of Load Balancer: NLB (default)
-                                  or LBaaS.'
-                                type: string
                               name:
                                 description: LoadBalancer Name.
                                 type: string
diff --git a/exp/api/v1beta2/ocimachinepool_types.go b/exp/api/v1beta2/ocimachinepool_types.go
@@ -85,7 +85,6 @@ type InstanceConfiguration struct {
 	InstanceOptions *infrastructurev1beta2.InstanceOptions `json:"instanceOptions,omitempty"`
 
 	// Is in transit encryption of volumes required.
-	// +kubebuilder:default=true
 	// +optional
 	IsPvEncryptionInTransitEnabled *bool `json:"isPvEncryptionInTransitEnabled,omitempty"`
 
diff --git a/test/e2e/data/infrastructure-oci/v1beta2/bases/cluster.yaml b/test/e2e/data/infrastructure-oci/v1beta2/bases/cluster.yaml
@@ -82,6 +82,7 @@ spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
       shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE}"
+      isPvEncryptionInTransitEnabled: true
       shapeConfig:
         ocpus: "1"
       metadata:
diff --git a/test/e2e/data/infrastructure-oci/v1beta2/bases/md.yaml b/test/e2e/data/infrastructure-oci/v1beta2/bases/md.yaml
@@ -8,6 +8,7 @@ spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
       shape: "${OCI_NODE_MACHINE_TYPE}"
+      isPvEncryptionInTransitEnabled: true
       shapeConfig:
         ocpus: "1"
       metadata:

Original file line number	Diff line number	Diff line change
`@@ -120,3 +120,9 @@ func Convert_v1beta1_OCIMachineSpec_To_v1beta2_OCIMachineSpec(in *OCIMachineSpec`
`120`	`120`	`}`
`121`	`121`	`return nil`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+// Convert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer converts v1beta2 LoadBalancer to v1beta1 LoadBalancer`
	`125`	`+`
	`126`	`+func Convert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer(in v1beta2.LoadBalancer, out LoadBalancer, s conversion.Scope) error {`
	`127`	`+ return autoConvert_v1beta2_LoadBalancer_To_v1beta1_LoadBalancer(in, out, s)`
	`128`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,9 @@ func (src *OCIMachine) ConvertTo(dstRaw conversion.Hub) error {`
`41`	`41`	`// ConvertFrom converts the v1beta2 OCIMachine to a v1beta1 OCIMachine.`
`42`	`42`	`func (dst *OCIMachine) ConvertFrom(srcRaw conversion.Hub) error {`
`43`	`43`	`src := srcRaw.(*v1beta2.OCIMachine)`
`44`		`-`
`45`	`44`	`if err := Convert_v1beta2_OCIMachine_To_v1beta1_OCIMachine(src, dst, nil); err != nil {`
`46`	`45`	`return err`
`47`	`46`	`}`
`48`		`-`
`49`	`47`	`// Preserve Hub data on down-conversion except for metadata.`
`50`	`48`	`return utilconversion.MarshalData(src, dst)`
`51`	`49`	`}`