Skip to content

no-jira: aws: set IPv6 block on AWSCluster NetworkSpec for dual-stack ipFamily #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tthvo wants to merge 1 commit into
base: main
Choose a base branch
from
+72 −7
Open

no-jira: aws: set IPv6 block on AWSCluster NetworkSpec for dual-stack ipFamily #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pkg/controllers/infracluster/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
"sigs.k8s.io/controller-runtime/pkg/client"

configv1 "github.com/openshift/api/config/v1"
mapiv1beta1 "github.com/openshift/api/machine/v1beta1"
)

Expand Down Expand Up @@ -82,7 +83,7 @@ func (r *InfraClusterController) ensureAWSCluster(ctx context.Context, log logr.
return nil, fmt.Errorf("unable to obtain MAPI ProviderSpec: %w", err)
}

awsCluster, err = r.newAWSCluster(providerSpec, apiURL, int32(port))
awsCluster, err = r.newAWSCluster(providerSpec, apiURL, int32(port), r.Infra.Status.PlatformStatus.AWS.IPFamily)
Comment thread
tthvo marked this conversation as resolved.
if err != nil {
return nil, fmt.Errorf("failed to get AWSCluster: %w", err)
}
Expand All @@ -96,7 +97,7 @@ func (r *InfraClusterController) ensureAWSCluster(ctx context.Context, log logr.
return awsCluster, nil
}

func (r *InfraClusterController) newAWSCluster(providerSpec *mapiv1beta1.AWSMachineProviderConfig, apiURL *url.URL, port int32) (*awsv1.AWSCluster, error) {
func (r *InfraClusterController) newAWSCluster(providerSpec *mapiv1beta1.AWSMachineProviderConfig, apiURL *url.URL, port int32, ipFamily configv1.IPFamilyType) (*awsv1.AWSCluster, error) {
controlPlaneLoadBalancer, secondaryControlPlaneLoadBalancer, err := extractLoadBalancerConfigFromMAPIAWSProviderSpec(providerSpec)
if err != nil {
return nil, fmt.Errorf("failed to extract control plane load balancer configuration: %w", err)
Expand Down Expand Up @@ -132,6 +133,13 @@ func (r *InfraClusterController) newAWSCluster(providerSpec *mapiv1beta1.AWSMach
},
}

// CAPA requires the VPC IPv6 block to be set to assign primary IPv6 addresses to instances.
// This is only applicable to IPv6 primary, but we set it for both dual-stack families
// to indicate that the VPC has IPv6 addressing enabled.
Comment thread
tthvo marked this conversation as resolved.
if ipFamily == configv1.DualStackIPv4Primary || ipFamily == configv1.DualStackIPv6Primary {
target.Spec.NetworkSpec.VPC.IPv6 = &awsv1.IPv6{}
}

return target, nil
}

Expand Down
67 changes: 62 additions & 5 deletions pkg/controllers/infracluster/infracluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ var _ = Describe("InfraCluster", func() {
bareInfraCluster *awsv1.AWSCluster
capiNamespace *corev1.Namespace
mapiNamespace *corev1.Namespace
ocpInfraAWS *configv1.Infrastructure
)

ocpInfraClusterName := "test-infra-cluster-name"
ocpInfraAWS := configv1resourcebuilder.Infrastructure().AsAWS(ocpInfraClusterName, awsTestRegion).Build()

infraClusterWithExternallyManagedByAnnotation := &awsv1.AWSCluster{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -88,6 +88,8 @@ var _ = Describe("InfraCluster", func() {
}

BeforeEach(func() {
ocpInfraAWS = configv1resourcebuilder.Infrastructure().AsAWS(ocpInfraClusterName, awsTestRegion).Build()

// Create ClusterOperator.
Expect(cl.Create(ctx, configv1resourcebuilder.ClusterOperator().WithName(controllers.ClusterOperatorName).Build())).To(Succeed())

Expand All @@ -110,8 +112,9 @@ var _ = Describe("InfraCluster", func() {
infraClusterWithExternallyManagedByAnnotation.Namespace = capiNamespace.Name
infraClusterWithExternallyManagedByAnnotationWithValue.Namespace = capiNamespace.Name
infraClusterWithoutExternallyManagedByAnnotation.Namespace = capiNamespace.Name
})

// Setup and Start Manager.
JustBeforeEach(func() {
mgrCtx, mgrCancel = context.WithCancel(context.Background())
mgrDone = make(chan struct{})
startManager(mgrCtx, mgrDone, ocpInfraAWS, capiNamespace.Name, mapiNamespace.Name)
Expand Down Expand Up @@ -160,17 +163,21 @@ var _ = Describe("InfraCluster", func() {
})

Context("When there are Control Plane Machines but no ControlPlaneMachineSet", func() {
var machine1, machine2, machine3 *mapiv1beta1.Machine

youngLoadBalancers := []mapiv1beta1.LoadBalancerReference{{Name: "young-int", Type: mapiv1beta1.NetworkLoadBalancerType}}
oldLoadBalancers := []mapiv1beta1.LoadBalancerReference{{Name: "old-int", Type: mapiv1beta1.NetworkLoadBalancerType}}

BeforeEach(func() {
machine1 := mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-1").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(oldLoadBalancers)).Build()
machine2 := mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-2").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(youngLoadBalancers)).Build()
machine3 := mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-3").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(oldLoadBalancers)).Build()
machine1 = mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-1").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(oldLoadBalancers)).Build()
machine2 = mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-2").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(youngLoadBalancers)).Build()
machine3 = mapiv1beta1resourcebuilder.Machine().AsMaster().WithNamespace(mapiNamespace.Name).WithName("master-3").WithProviderSpecBuilder(mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(oldLoadBalancers)).Build()

Expect(cl.Create(ctx, machine1)).To(Succeed())
Expect(cl.Create(ctx, machine3)).To(Succeed())
})

JustBeforeEach(func() {
// Wait for the InfraCluster to be created.
Eventually(komega.Get(bareInfraCluster)).Should(Succeed())

Expand Down Expand Up @@ -206,6 +213,56 @@ var _ = Describe("InfraCluster", func() {
))
})
})

Context("When the infrastructure ipFamily is configured", func() {
BeforeEach(func() {
internalLB := []mapiv1beta1.LoadBalancerReference{{Name: ocpInfraClusterName + "-int", Type: mapiv1beta1.NetworkLoadBalancerType}}
machineTemplateBuilder := mapiv1resourcebuilder.OpenShiftMachineV1Beta1Template().WithProviderSpecBuilder(
mapiv1beta1resourcebuilder.AWSProviderSpec().WithLoadBalancers(internalLB),
)
cpms := mapiv1resourcebuilder.ControlPlaneMachineSet().WithNamespace(mapiNamespace.Name).WithName("cluster").WithMachineTemplateBuilder(machineTemplateBuilder).Build()
Expect(cl.Create(ctx, cpms)).To(Succeed())
})

Context("When ipFamily is DualStackIPv4Primary", func() {
BeforeEach(func() {
ocpInfraAWS.Status.PlatformStatus.AWS.IPFamily = configv1.DualStackIPv4Primary
})

It("should create an AWSCluster with IPv6 enabled in NetworkSpec", func() {
Eventually(komega.Object(bareInfraCluster)).Should(SatisfyAll(
HaveField("Status.Ready", BeTrue()),
HaveField("Spec.NetworkSpec.VPC.IPv6", Not(BeNil())),
))
})
})

Context("When ipFamily is DualStackIPv6Primary", func() {
BeforeEach(func() {
ocpInfraAWS.Status.PlatformStatus.AWS.IPFamily = configv1.DualStackIPv6Primary
})

It("should create an AWSCluster with IPv6 enabled in NetworkSpec", func() {
Eventually(komega.Object(bareInfraCluster)).Should(SatisfyAll(
HaveField("Status.Ready", BeTrue()),
HaveField("Spec.NetworkSpec.VPC.IPv6", Not(BeNil())),
))
})
})

Context("When ipFamily is IPv4", func() {
BeforeEach(func() {
ocpInfraAWS.Status.PlatformStatus.AWS.IPFamily = configv1.IPv4
})

It("should create an AWSCluster without IPv6 in NetworkSpec", func() {
Eventually(komega.Object(bareInfraCluster)).Should(SatisfyAll(
HaveField("Status.Ready", BeTrue()),
HaveField("Spec.NetworkSpec.VPC.IPv6", BeNil()),
))
})
})
})
})

Context("When there is an InfraCluster with no externally ManagedBy Annotation", func() {
Expand Down