Skip to content

Commit

Permalink
Merge pull request kubernetes#104028 from nilo19/automated-cherry-pic…
Browse files Browse the repository at this point in the history
…k-of-#103794-upstream-release-1.21

Automated cherry pick of kubernetes#103794: feat: Provide IPv6 support for internal load balancer
  • Loading branch information
k8s-ci-robot authored Aug 6, 2021
2 parents b1d13c9 + 4f462a0 commit 5d0a74b
Showing 1 changed file with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1258,13 +1258,6 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
// construct FrontendIPConfigurationPropertiesFormat
var fipConfigurationProperties *network.FrontendIPConfigurationPropertiesFormat
if isInternal {
// azure does not support ILB for IPv6 yet.
// TODO: remove this check when ILB supports IPv6 *and* the SDK
// have been rev'ed to 2019* version
if utilnet.IsIPv6String(service.Spec.ClusterIP) {
return nil, fmt.Errorf("ensure(%s): lb(%s) - internal load balancers does not support IPv6", serviceName, lbName)
}

subnetName := subnet(service)
if subnetName == nil {
subnetName = &az.SubnetName
Expand All @@ -1282,6 +1275,10 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
Subnet: &subnet,
}

if utilnet.IsIPv6String(service.Spec.ClusterIP) {
configProperties.PrivateIPAddressVersion = network.IPv6
}

loadBalancerIP := service.Spec.LoadBalancerIP
if loadBalancerIP != "" {
configProperties.PrivateIPAllocationMethod = network.Static
Expand Down

0 comments on commit 5d0a74b

Please sign in to comment.