Skip to content

Commit c76772a

Browse files
dranicuvladcristi
dranicu
and
vladcristi
authored
Ipv6 implementation (#410)
* Implement ipv6 feature --------- Co-authored-by: vladcristi <[email protected]>
1 parent 1da2921 commit c76772a

26 files changed

+711
-39
lines changed

‎.gitignore

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,8 @@ _artifacts/
3434
config/default/manager_image_patch.yaml-e
3535
config/default/manager_pull_policy.yaml-e
3636
test/e2e/config/e2e_conf-envsubst.yaml
37-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-antrea.yaml
38-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-ccm-testing.yaml
39-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-kcp-remediation.yaml
40-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-md-remediation.yaml
41-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-node-drain.yaml
42-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-oracle-linux.yaml
43-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template.yaml
44-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-bare-metal.yaml
45-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-custom-networking-seclist.yaml
46-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-custom-networking-nsg.yaml
47-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-multiple-node-nsg.yaml
48-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-local-vcn-peering.yaml
49-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-cluster-class.yaml
50-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-remote-vcn-peering.yaml
51-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-externally-managed-vcn.yaml
52-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-alternative-region.yaml
53-
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-machine-pool.yaml
37+
test/e2e/data/infrastructure-oci/v1beta*/cluster-template*.yaml
38+
5439

5540
# tilt
5641
tilt-settings.json

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ generate-e2e-templates: $(KUSTOMIZE)
295295
$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-windows-calico --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-windows-calico.yaml
296296
$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-virtual --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-virtual.yaml
297297
$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-self-managed-nodes --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-self-managed-nodes.yaml
298+
$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-machine-with-ipv6 --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-machine-with-ipv6.yaml
299+
$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-with-paravirt-bv --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-with-paravirt-bv.yaml
298300

299301
.PHONY: test-e2e-run
300302
test-e2e-run: generate-e2e-templates $(GINKGO) $(ENVSUBST) ## Run e2e tests

‎api/v1beta1/types.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ type NetworkDetails struct {
3737
// SubnetId defines the ID of the subnet to use. This parameter takes priority over SubnetName.
3838
SubnetId *string `json:"subnetId,omitempty"`
3939

40+
// IPv6 defines if the instance should have an IPv6
41+
AssignIpv6Ip bool `json:"assignIpv6Ip,omitempty"`
42+
4043
// AssignPublicIp defines whether the instance should have a public IP address
4144
AssignPublicIp bool `json:"assignPublicIp,omitempty"`
4245

@@ -866,6 +869,13 @@ type Subnet struct {
866869
// within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
867870
// +optional
868871
DnsLabel *string `json:"dnsLabel,omitempty"`
872+
873+
// Use this to enable IPv6 hextet for this subnet. The VCN must be enabled for IPv6.
874+
// You can't change this subnet characteristic later. All subnets are /64 in size. The subnet
875+
// portion of the IPv6 address is the fourth hextet from the left (1111 in the following example).
876+
// Example: `2001:0db8:0123:1111::/64`
877+
// +optional
878+
Ipv6CidrBlockHextet *string `json:"ipv6CidrBlockHextet,omitempty"`
869879
}
870880

871881
// NSG defines configuration for a Network Security Group.
@@ -942,6 +952,14 @@ type VCN struct {
942952
// within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
943953
// +optional
944954
DnsLabel *string `json:"dnsLabel,omitempty"`
955+
956+
// Configuration to allow OCI to assign IPv6 Prefix. When true will use a /56 IPv6 global unicast address (GUA) prefix allocated by Oracle
957+
// +optional
958+
IsOracleGuaAllocationEnabled *bool `json:"isOracleGuaAllocationEnabled,omitempty"`
959+
960+
// Configuration to enable IPv6.
961+
// +optional
962+
IsIpv6Enabled *bool `json:"isIpv6Enabled,omitempty"`
945963
}
946964

947965
// LoadBalancer Configuration
@@ -1097,7 +1115,7 @@ type RemotePeeringConnection struct {
10971115
type VolumeType string
10981116

10991117
const (
1100-
IscsiType VolumeType = "iscsi"
1118+
IscsiType VolumeType = "iscsi"
11011119
ParavirtualizedType VolumeType = "paravirtualized"
11021120
)
11031121

@@ -1115,7 +1133,7 @@ type LaunchVolumeAttachment struct {
11151133
Type VolumeType `json:"volumeType,omitempty"`
11161134

11171135
// The details of iscsi volume attachment.
1118-
IscsiAttachment LaunchIscsiVolumeAttachment `json:"launchIscsiVolumeAttachment,omitempty"`
1136+
IscsiAttachment LaunchIscsiVolumeAttachment `json:"launchIscsiVolumeAttachment,omitempty"`
11191137
ParavirtualizedAttachment LaunchParavirtualizedVolumeAttachment `json:"launchParavirtualizedVolumeAttachment,omitempty"`
11201138
}
11211139

@@ -1177,7 +1195,7 @@ type LaunchParavirtualizedVolumeAttachment struct {
11771195

11781196
// LaunchCreateVolumeFromAttributes The details of the volume to create for CreateVolume operation.
11791197
LaunchCreateVolumeFromAttributes LaunchCreateVolumeFromAttributes `json:"launchCreateVolumeFromAttributes,omitempty"`
1180-
1198+
11811199
// Refer the top-level definition of isPvEncryptionInTransitEnabled.
11821200
// The default value is False.
11831201
IsPvEncryptionInTransitEnabled *bool `json:"isPvEncryptionInTransitEnabled,omitempty"`

‎api/v1beta2/ocicluster_webhook.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,26 @@ func (c *OCICluster) ValidateCreate() (admission.Warnings, error) {
6363
clusterlogger.Info("validate update cluster", "name", c.Name)
6464

6565
var allErrs field.ErrorList
66+
var ipv6hextets []*string
67+
var hextatassigned bool
68+
69+
ipv6hextets = append(ipv6hextets, c.GetControlPlaneEndpointSubnet().Ipv6CidrBlockHextet, c.GetControlPlaneMachineSubnet().Ipv6CidrBlockHextet, c.GetServiceLoadBalancerSubnet().Ipv6CidrBlockHextet, c.GetNodeSubnet()[0].Ipv6CidrBlockHextet)
70+
71+
for _, hextet := range ipv6hextets {
72+
if hextet != nil {
73+
hextatassigned = true
74+
break
75+
}
76+
}
77+
78+
if hextatassigned {
79+
if c.Spec.NetworkSpec.Vcn.IsIpv6Enabled == nil {
80+
allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "NetworkSpec.Vcn.IsIpv6Enabled"), c.Spec.NetworkSpec.Vcn.IsIpv6Enabled, "field needs to be true and not nil"))
81+
}
82+
if c.Spec.NetworkSpec.Vcn.IsIpv6Enabled == common.Bool(false) {
83+
allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "NetworkSpec.Vcn.IsIpv6Enabled"), c.Spec.NetworkSpec.Vcn.IsIpv6Enabled, "field needs to be true"))
84+
}
85+
}
6686

6787
allErrs = append(allErrs, c.validate(nil)...)
6888

‎api/v1beta2/types.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ type NetworkDetails struct {
3838
// SubnetId defines the ID of the subnet to use. This parameter takes priority over SubnetName.
3939
SubnetId *string `json:"subnetId,omitempty"`
4040

41+
// AssignIPv6 determines whether to assign a IPv6 address to the instance.
42+
// +optional
43+
AssignIpv6Ip bool `json:"assignIpv6Ip,omitempty"`
44+
4145
// AssignPublicIp defines whether the instance should have a public IP address
4246
AssignPublicIp bool `json:"assignPublicIp,omitempty"`
4347

@@ -865,6 +869,13 @@ type Subnet struct {
865869
// within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
866870
// +optional
867871
DnsLabel *string `json:"dnsLabel,omitempty"`
872+
873+
// Use this to enable IPv6 hextet for this subnet. The VCN must be enabled for IPv6.
874+
// You can't change this subnet characteristic later. All subnets are /64 in size. The subnet
875+
// portion of the IPv6 address is the fourth hextet from the left (1111 in the following example).
876+
// Example: `2001:0db8:0123:1111::/64`
877+
// +optional
878+
Ipv6CidrBlockHextet *string `json:"ipv6CidrBlockHextet,omitempty"`
868879
}
869880

870881
// NSG defines configuration for a Network Security Group.
@@ -935,6 +946,14 @@ type VCN struct {
935946
// within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
936947
// +optional
937948
DnsLabel *string `json:"dnsLabel,omitempty"`
949+
950+
// Configuration to allow OCI to assign IPv6 Prefix. When true will use a /56 IPv6 global unicast address (GUA) prefix allocated by Oracle
951+
// +optional
952+
IsOracleGuaAllocationEnabled *bool `json:"isOracleGuaAllocationEnabled,omitempty"`
953+
954+
// Configuration to enable IPv6.
955+
// +optional
956+
IsIpv6Enabled *bool `json:"isIpv6Enabled,omitempty"`
938957
}
939958

940959
// LoadBalancerType is an enumeration of the supported load balancer types.
@@ -1167,7 +1186,7 @@ type NetworkSecurityGroup struct {
11671186
type VolumeType string
11681187

11691188
const (
1170-
IscsiType VolumeType = "iscsi"
1189+
IscsiType VolumeType = "iscsi"
11711190
ParavirtualizedType VolumeType = "paravirtualized"
11721191
)
11731192

@@ -1186,7 +1205,7 @@ type LaunchVolumeAttachment struct {
11861205
Type VolumeType `json:"volumeType,omitempty"`
11871206

11881207
// The details of iscsi volume attachment.
1189-
IscsiAttachment LaunchIscsiVolumeAttachment `json:"launchIscsiVolumeAttachment,omitempty"`
1208+
IscsiAttachment LaunchIscsiVolumeAttachment `json:"launchIscsiVolumeAttachment,omitempty"`
11901209
ParavirtualizedAttachment LaunchParavirtualizedVolumeAttachment `json:"launchParavirtualizedVolumeAttachment,omitempty"`
11911210
}
11921211

@@ -1254,7 +1273,6 @@ type LaunchParavirtualizedVolumeAttachment struct {
12541273
IsPvEncryptionInTransitEnabled *bool `json:"isPvEncryptionInTransitEnabled,omitempty"`
12551274
}
12561275

1257-
12581276
// LaunchCreateVolumeFromAttributes The details of the volume to create for CreateVolume operation.
12591277
type LaunchCreateVolumeFromAttributes struct {
12601278

‎cloud/scope/machine.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ func (m *MachineScope) GetOrCreateMachine(ctx context.Context) (*core.Instance,
248248
SourceDetails: sourceDetails,
249249
CreateVnicDetails: &core.CreateVnicDetails{
250250
SubnetId: subnetId,
251+
AssignIpv6Ip: common.Bool(m.OCIMachine.Spec.NetworkDetails.AssignIpv6Ip),
251252
AssignPublicIp: common.Bool(m.OCIMachine.Spec.NetworkDetails.AssignPublicIp),
252253
FreeformTags: tags,
253254
DefinedTags: definedTags,
@@ -1023,13 +1024,13 @@ func getIscsiVolumeAttachment(attachment infrastructurev1beta2.LaunchIscsiVolume
10231024

10241025
func getParavirtualizedVolumeAttachment(attachment infrastructurev1beta2.LaunchParavirtualizedVolumeAttachment) core.LaunchAttachVolumeDetails {
10251026
volumeDetails := core.LaunchAttachParavirtualizedVolumeDetails{
1026-
Device: attachment.Device,
1027-
DisplayName: attachment.DisplayName,
1028-
IsShareable: attachment.IsShareable,
1029-
IsReadOnly: attachment.IsReadOnly,
1030-
VolumeId: attachment.VolumeId,
1031-
IsPvEncryptionInTransitEnabled: attachment.IsPvEncryptionInTransitEnabled,
1032-
LaunchCreateVolumeDetails: getLaunchCreateVolumeDetails(attachment.LaunchCreateVolumeFromAttributes),
1027+
Device: attachment.Device,
1028+
DisplayName: attachment.DisplayName,
1029+
IsShareable: attachment.IsShareable,
1030+
IsReadOnly: attachment.IsReadOnly,
1031+
VolumeId: attachment.VolumeId,
1032+
IsPvEncryptionInTransitEnabled: attachment.IsPvEncryptionInTransitEnabled,
1033+
LaunchCreateVolumeDetails: getLaunchCreateVolumeDetails(attachment.LaunchCreateVolumeFromAttributes),
10331034
}
10341035
return volumeDetails
10351036
}

‎cloud/scope/route_table_reconciler.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,18 @@ func (s *ClusterScope) CreateRouteTable(ctx context.Context, routeTableType stri
151151
Description: common.String("traffic to/from internet"),
152152
},
153153
}
154+
resp, err := s.VCNClient.GetVcn(ctx, core.GetVcnRequest{VcnId: s.getVcnId()})
155+
if err != nil {
156+
panic(err)
157+
}
158+
if resp.Vcn.Ipv6CidrBlocks != nil {
159+
routeRules = append(routeRules, core.RouteRule{
160+
DestinationType: core.RouteRuleDestinationTypeCidrBlock,
161+
Destination: common.String("::/0"),
162+
NetworkEntityId: s.OCIClusterAccessor.GetNetworkSpec().Vcn.InternetGateway.Id,
163+
Description: common.String("ipv6 traffic to/from internet"),
164+
})
165+
}
154166
routeTableName = PublicRouteTableName
155167
}
156168
vcnId := s.getVcnId()

‎cloud/scope/subnet_reconciler.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ package scope
1818

1919
import (
2020
"context"
21+
"fmt"
22+
"net"
23+
"strings"
2124

2225
infrastructurev1beta2 "github.com/oracle/cluster-api-provider-oci/api/v1beta2"
2326
"github.com/oracle/cluster-api-provider-oci/cloud/ociutil"
@@ -101,6 +104,39 @@ func (s *ClusterScope) CreateSubnet(ctx context.Context, spec infrastructurev1be
101104
} else {
102105
routeTable = s.getRouteTableId(infrastructurev1beta2.Public)
103106
}
107+
108+
resp, err := s.VCNClient.GetVcn(ctx, core.GetVcnRequest{VcnId: s.getVcnId()})
109+
110+
var ipv6subnetCIDR_Ptr *string
111+
112+
// Constructing IPv6 Subnet CIDR
113+
if resp.Vcn.Ipv6CidrBlocks != nil {
114+
115+
// VCNs can have multiple IPv6 CIDR Blocks, and the CIDR block with IPv6 GUA Allocated by Oracle is the first (index 0) in the list
116+
vcnCIDR := resp.Vcn.Ipv6CidrBlocks[0]
117+
118+
// Split CIDR block into hextets
119+
ip, _, err := net.ParseCIDR(vcnCIDR)
120+
if err != nil {
121+
panic(err)
122+
}
123+
hextets := strings.Split(ip.String(), ":")
124+
125+
// Modify the 4th hextet (index 3) of vcn CIDR to reflect the subnet CIDR with Ipv6CidrBlockHextet value in it
126+
if len(hextets) >= 4 {
127+
originalHextet := hextets[3]
128+
if len(originalHextet) < 4 {
129+
originalHextet = fmt.Sprintf("%04s", originalHextet)
130+
}
131+
newHextet := originalHextet[:2] + *spec.Ipv6CidrBlockHextet
132+
hextets[3] = newHextet
133+
134+
// Reconstruct the IPv6 address with a /64 CIDR for the subnet
135+
ipv6subnetCIDR := strings.Join(hextets, ":") + "/64"
136+
ipv6subnetCIDR_Ptr = &ipv6subnetCIDR
137+
}
138+
}
139+
104140
createSubnetDetails := core.CreateSubnetDetails{
105141
CompartmentId: common.String(s.GetCompartmentId()),
106142
CidrBlock: common.String(spec.CIDR),
@@ -112,7 +148,9 @@ func (s *ClusterScope) CreateSubnet(ctx context.Context, spec infrastructurev1be
112148
FreeformTags: s.GetFreeFormTags(),
113149
DefinedTags: s.GetDefinedTags(),
114150
DnsLabel: spec.DnsLabel,
151+
Ipv6CidrBlock: ipv6subnetCIDR_Ptr,
115152
}
153+
116154
if spec.SecurityList != nil {
117155
createSubnetDetails.SecurityListIds = []string{*spec.SecurityList.ID}
118156
}

‎cloud/scope/vcn_reconciler.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,15 @@ func (s *ClusterScope) CreateVCN(ctx context.Context, spec infrastructurev1beta2
128128
FreeformTags: s.GetFreeFormTags(),
129129
DefinedTags: s.GetDefinedTags(),
130130
DnsLabel: spec.DnsLabel,
131+
IsIpv6Enabled: spec.IsIpv6Enabled,
131132
}
133+
134+
if spec.IsIpv6Enabled != nil {
135+
if spec.IsIpv6Enabled == common.Bool(true) {
136+
vcnDetails.IsOracleGuaAllocationEnabled = common.Bool(true)
137+
}
138+
}
139+
132140
vcnResponse, err := s.VCNClient.CreateVcn(ctx, core.CreateVcnRequest{
133141
CreateVcnDetails: vcnDetails,
134142
OpcRetryToken: ociutil.GetOPCRetryToken("%s-%s", "create-vcn", string(s.OCIClusterAccessor.GetOCIResourceIdentifier())),

‎cloud/scope/vcn_reconciler_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ func TestClusterScope_CreateVCN(t *testing.T) {
7171
spec: infrastructurev1beta2.OCIClusterSpec{
7272
NetworkSpec: infrastructurev1beta2.NetworkSpec{
7373
Vcn: infrastructurev1beta2.VCN{
74-
Name: "normal",
75-
DnsLabel: common.String("label"),
76-
CIDR: "test-cidr",
74+
Name: "normal",
75+
DnsLabel: common.String("label"),
76+
CIDR: "test-cidr",
77+
IsIpv6Enabled: common.Bool(true),
7778
},
7879
},
7980
},
@@ -85,9 +86,10 @@ func TestClusterScope_CreateVCN(t *testing.T) {
8586
spec: infrastructurev1beta2.OCIClusterSpec{
8687
NetworkSpec: infrastructurev1beta2.NetworkSpec{
8788
Vcn: infrastructurev1beta2.VCN{
88-
Name: "normal",
89-
DnsLabel: common.String("label"),
90-
CIDRS: []string{"test-cidr1", "test-cidr2"},
89+
Name: "normal",
90+
DnsLabel: common.String("label"),
91+
CIDRS: []string{"test-cidr1", "test-cidr2"},
92+
IsIpv6Enabled: common.Bool(true),
9193
},
9294
},
9395
},

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ spec:
166166
vcn:
167167
description: VCN configuration.
168168
properties:
169+
isIpv6Enabled:
170+
description: isIpv6Enabled enables the possibility to assign IPv6 to cluster nodes.
171+
type: boolean
169172
cidr:
170173
description: VCN CIDR. Deprecated, please use NetworkDetails.cidrs
171174
type: string
@@ -591,6 +594,9 @@ spec:
591594
DNS label to form a fully qualified domain name (FQDN)
592595
for each VNIC within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
593596
type: string
597+
ipv6CidrBlockHextet:
598+
description: Subnet IPv6 CIDR.
599+
type: string
594600
id:
595601
description: Subnet OCID.
596602
type: string
@@ -1382,6 +1388,9 @@ spec:
13821388
vcn:
13831389
description: VCN configuration.
13841390
properties:
1391+
isIpv6Enabled:
1392+
description: isIpv6Enabled enables the possibility to assign IPv6 to cluster nodes.
1393+
type: boolean
13851394
cidr:
13861395
description: VCN CIDR. Deprecated, please use NetworkDetails.cidrs
13871396
type: string
@@ -1866,6 +1875,9 @@ spec:
18661875
DNS label to form a fully qualified domain name (FQDN)
18671876
for each VNIC within this subnet (for example, `bminstance1.subnet123.vcn1.oraclevcn.com`).
18681877
type: string
1878+
ipv6CidrBlockHextet:
1879+
description: Subnet IPv6 CIDR.
1880+
type: string
18691881
id:
18701882
description: Subnet OCID.
18711883
type: string

0 commit comments

Comments
 (0)