Skip to content

Commit 849193f

Browse files
jwmay2012jwmay2012
committed
Add support for Instance Alias IP Ranges
1 parent 5f2aa05 commit 849193f

File tree

5 files changed

+110
-0
lines changed

5 files changed

+110
-0
lines changed

‎api/v1beta1/gcpmachine_types.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,22 @@ const (
236236
ProvisioningModelSpot ProvisioningModel = "Spot"
237237
)
238238

239+
// AliasIPRange is an alias IP range attached to an instance's network interface.
240+
type AliasIPRange struct {
241+
// IPCidrRange is the IP alias ranges to allocate for this interface. This IP
242+
// CIDR range must belong to the specified subnetwork and cannot contain IP
243+
// addresses reserved by system or used by other network interfaces. This range
244+
// may be a single IP address (such as 10.2.3.4), a netmask (such as /24) or a
245+
// CIDR-formatted string (such as 10.1.2.0/24).
246+
// +kubebuilder:validation:Pattern=`^((([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([0-9]|[12][0-9]|3[0-2])|(([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(/([0-9]|[12][0-9]|3[0-2])))$`
247+
// +required
248+
IPCidrRange string `json:"ipCidrRange"`
249+
// SubnetworkRangeName is the name of a subnetwork secondary IP range from which
250+
// to allocate an IP alias range. If not specified, the primary range of the
251+
// subnetwork is used.
252+
SubnetworkRangeName string `json:"subnetworkRangeName,omitempty"`
253+
}
254+
239255
// GCPMachineSpec defines the desired state of GCPMachine.
240256
type GCPMachineSpec struct {
241257
// InstanceType is the type of instance to create. Example: n1.standard-2
@@ -246,6 +262,10 @@ type GCPMachineSpec struct {
246262
// +optional
247263
Subnet *string `json:"subnet,omitempty"`
248264

265+
// AliasIPRanges let you assign ranges of internal IP addresses as aliases to a VM's network interfaces.
266+
// +optional
267+
AliasIPRanges []AliasIPRange `json:"aliasIPRanges,omitempty"`
268+
249269
// ProviderID is the unique identifier as specified by the cloud provider.
250270
// +optional
251271
ProviderID *string `json:"providerID,omitempty"`

‎api/v1beta1/zz_generated.deepcopy.go‎

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

‎cloud/scope/machine.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,27 @@ func (m *MachineScope) InstanceNetworkInterfaceSpec() *compute.NetworkInterface
345345
networkInterface.Subnetwork = path.Join("projects", m.ClusterGetter.NetworkProject(), "regions", m.ClusterGetter.Region(), "subnetworks", *m.GCPMachine.Spec.Subnet)
346346
}
347347

348+
networkInterface.AliasIpRanges = m.InstanceNetworkInterfaceAliasIPRangesSpec()
349+
348350
return networkInterface
349351
}
350352

353+
// InstanceNetworkInterfaceAliasIPRangesSpec returns a slice of Alias IP Range specs.
354+
func (m *MachineScope) InstanceNetworkInterfaceAliasIPRangesSpec() []*compute.AliasIpRange {
355+
if len(m.GCPMachine.Spec.AliasIPRanges) == 0 {
356+
return nil
357+
}
358+
aliasIPRanges := make([]*compute.AliasIpRange, 0, len(m.GCPMachine.Spec.AliasIPRanges))
359+
for _, alias := range m.GCPMachine.Spec.AliasIPRanges {
360+
aliasIPRange := &compute.AliasIpRange{
361+
IpCidrRange: alias.IPCidrRange,
362+
SubnetworkRangeName: alias.SubnetworkRangeName,
363+
}
364+
aliasIPRanges = append(aliasIPRanges, aliasIPRange)
365+
}
366+
return aliasIPRanges
367+
}
368+
351369
// InstanceServiceAccountsSpec returns service-account spec.
352370
func (m *MachineScope) InstanceServiceAccountsSpec() *compute.ServiceAccount {
353371
serviceAccount := &compute.ServiceAccount{

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,32 @@ spec:
191191
items:
192192
type: string
193193
type: array
194+
aliasIPRanges:
195+
description: AliasIPRanges let you assign ranges of internal IP addresses
196+
as aliases to a VM's network interfaces.
197+
items:
198+
description: AliasIPRange is an alias IP range attached to an instance's
199+
network interface.
200+
properties:
201+
ipCidrRange:
202+
description: |-
203+
IPCidrRange is the IP alias ranges to allocate for this interface. This IP
204+
CIDR range must belong to the specified subnetwork and cannot contain IP
205+
addresses reserved by system or used by other network interfaces. This range
206+
may be a single IP address (such as 10.2.3.4), a netmask (such as /24) or a
207+
CIDR-formatted string (such as 10.1.2.0/24).
208+
pattern: ^((([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([0-9]|[12][0-9]|3[0-2])|(([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(/([0-9]|[12][0-9]|3[0-2])))$
209+
type: string
210+
subnetworkRangeName:
211+
description: |-
212+
SubnetworkRangeName is the name of a subnetwork secondary IP range from which
213+
to allocate an IP alias range. If not specified, the primary range of the
214+
subnetwork is used.
215+
type: string
216+
required:
217+
- ipCidrRange
218+
type: object
219+
type: array
194220
confidentialCompute:
195221
description: |-
196222
ConfidentialCompute Defines whether the instance should have confidential compute enabled or not, and the confidential computing technology of choice.

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,32 @@ spec:
206206
items:
207207
type: string
208208
type: array
209+
aliasIPRanges:
210+
description: AliasIPRanges let you assign ranges of internal
211+
IP addresses as aliases to a VM's network interfaces.
212+
items:
213+
description: AliasIPRange is an alias IP range attached
214+
to an instance's network interface.
215+
properties:
216+
ipCidrRange:
217+
description: |-
218+
IPCidrRange is the IP alias ranges to allocate for this interface. This IP
219+
CIDR range must belong to the specified subnetwork and cannot contain IP
220+
addresses reserved by system or used by other network interfaces. This range
221+
may be a single IP address (such as 10.2.3.4), a netmask (such as /24) or a
222+
CIDR-formatted string (such as 10.1.2.0/24).
223+
pattern: ^((([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([0-9]|[12][0-9]|3[0-2])|(([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])|(/([0-9]|[12][0-9]|3[0-2])))$
224+
type: string
225+
subnetworkRangeName:
226+
description: |-
227+
SubnetworkRangeName is the name of a subnetwork secondary IP range from which
228+
to allocate an IP alias range. If not specified, the primary range of the
229+
subnetwork is used.
230+
type: string
231+
required:
232+
- ipCidrRange
233+
type: object
234+
type: array
209235
confidentialCompute:
210236
description: |-
211237
ConfidentialCompute Defines whether the instance should have confidential compute enabled or not, and the confidential computing technology of choice.

0 commit comments

Comments
 (0)