Skip to content

Commit 359bc8f

Browse files
authored
Fix unit tests and conversion for ipv6 (#416)
* fix unit tests after ipv6 implementation * Fixing conversion and unit tests
1 parent a8ca4bc commit 359bc8f

File tree

7 files changed

+233
-8
lines changed

7 files changed

+233
-8
lines changed

api/v1beta1/zz_generated.conversion.go

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

api/v1beta1/zz_generated.deepcopy.go

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

api/v1beta2/ocicluster_webhook.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@ func (c *OCICluster) ValidateCreate() (admission.Warnings, error) {
6666
var ipv6hextets []*string
6767
var hextatassigned bool
6868

69-
ipv6hextets = append(ipv6hextets, c.GetControlPlaneEndpointSubnet().Ipv6CidrBlockHextet, c.GetControlPlaneMachineSubnet().Ipv6CidrBlockHextet, c.GetServiceLoadBalancerSubnet().Ipv6CidrBlockHextet, c.GetNodeSubnet()[0].Ipv6CidrBlockHextet)
69+
if c.GetControlPlaneEndpointSubnet() != nil && c.GetControlPlaneMachineSubnet() != nil && c.GetServiceLoadBalancerSubnet() != nil {
70+
ipv6hextets = append(ipv6hextets,
71+
c.GetControlPlaneEndpointSubnet().Ipv6CidrBlockHextet,
72+
c.GetControlPlaneMachineSubnet().Ipv6CidrBlockHextet,
73+
c.GetServiceLoadBalancerSubnet().Ipv6CidrBlockHextet)
74+
75+
nodeSubnets := c.GetNodeSubnet()
76+
if len(nodeSubnets) > 0 {
77+
ipv6hextets = append(ipv6hextets, nodeSubnets[0].Ipv6CidrBlockHextet)
78+
}
79+
}
7080

7181
for _, hextet := range ipv6hextets {
7282
if hextet != nil {

api/v1beta2/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)