Skip to content

Commit 8769290

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#8193 from r4f4/capi-aws-reuse-pool
no-jira: capi/aws: reuse GenerateMachines for bootstrap
2 parents 7f52edf + 8a80457 commit 8769290

File tree

2 files changed

+67
-106
lines changed

2 files changed

+67
-106
lines changed

‎pkg/asset/machines/aws/awsmachines.go‎

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,59 @@ import (
1212
capi "sigs.k8s.io/cluster-api/api/v1beta1"
1313

1414
"github.com/openshift/installer/pkg/asset"
15+
"github.com/openshift/installer/pkg/asset/manifests/capiutils"
1516
"github.com/openshift/installer/pkg/types"
1617
"github.com/openshift/installer/pkg/types/aws"
1718
)
1819

20+
// MachineInput defines the inputs needed to generate a machine asset.
21+
type MachineInput struct {
22+
Role string
23+
Pool *types.MachinePool
24+
Subnets map[string]string
25+
Tags capa.Tags
26+
PublicIP bool
27+
}
28+
1929
// GenerateMachines returns manifests and runtime objects to provision the control plane (including bootstrap, if applicable) nodes using CAPI.
20-
func GenerateMachines(clusterID string, region string, subnets map[string]string, pool *types.MachinePool, role string, userTags map[string]string) ([]*asset.RuntimeFile, error) {
21-
if poolPlatform := pool.Platform.Name(); poolPlatform != aws.Name {
30+
func GenerateMachines(clusterID string, in *MachineInput) ([]*asset.RuntimeFile, error) {
31+
if poolPlatform := in.Pool.Platform.Name(); poolPlatform != aws.Name {
2232
return nil, fmt.Errorf("non-AWS machine-pool: %q", poolPlatform)
2333
}
24-
mpool := pool.Platform.AWS
34+
mpool := in.Pool.Platform.AWS
2535

2636
total := int64(1)
27-
if pool.Replicas != nil {
28-
total = *pool.Replicas
29-
}
30-
31-
tags, err := CapaTagsFromUserTags(clusterID, userTags)
32-
if err != nil {
33-
return nil, fmt.Errorf("failed to create machineapi.TagSpecifications from UserTags: %w", err)
37+
if in.Pool.Replicas != nil {
38+
total = *in.Pool.Replicas
3439
}
3540

3641
var result []*asset.RuntimeFile
3742

3843
for idx := int64(0); idx < total; idx++ {
39-
zone := mpool.Zones[int(idx)%len(mpool.Zones)]
40-
subnetID, ok := subnets[zone]
41-
if len(subnets) > 0 && !ok {
42-
return nil, fmt.Errorf("no subnet for zone %s", zone)
43-
}
44-
subnet := &capa.AWSResourceReference{}
45-
if subnetID == "" {
46-
subnet.Filters = []capa.Filter{
47-
{
48-
Name: "tag:Name",
49-
Values: []string{fmt.Sprintf("%s-subnet-private-%s", clusterID, zone)},
50-
},
44+
var subnet *capa.AWSResourceReference
45+
// By not setting subnets for the machine, we let CAPA choose one for us
46+
if len(in.Subnets) > 0 {
47+
zone := mpool.Zones[int(idx)%len(mpool.Zones)]
48+
subnetID, ok := in.Subnets[zone]
49+
if len(in.Subnets) > 0 && !ok {
50+
return nil, fmt.Errorf("no subnet for zone %s", zone)
51+
}
52+
subnet = &capa.AWSResourceReference{}
53+
if subnetID == "" {
54+
subnet.Filters = []capa.Filter{
55+
{
56+
Name: "tag:Name",
57+
Values: []string{fmt.Sprintf("%s-subnet-private-%s", clusterID, zone)},
58+
},
59+
}
60+
} else {
61+
subnet.ID = ptr.To(subnetID)
5162
}
52-
} else {
53-
subnet.ID = ptr.To(subnetID)
5463
}
5564

5665
awsMachine := &capa.AWSMachine{
5766
ObjectMeta: metav1.ObjectMeta{
58-
Name: fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
67+
Name: fmt.Sprintf("%s-%s-%d", clusterID, in.Pool.Name, idx),
5968
Labels: map[string]string{
6069
"cluster.x-k8s.io/control-plane": "",
6170
},
@@ -68,7 +77,7 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
6877
SSHKeyName: ptr.To(""),
6978
IAMInstanceProfile: fmt.Sprintf("%s-master-profile", clusterID),
7079
Subnet: subnet,
71-
AdditionalTags: tags,
80+
AdditionalTags: in.Tags,
7281
RootVolume: &capa.Volume{
7382
Size: int64(mpool.EC2RootVolume.Size),
7483
Type: capa.VolumeType(mpool.EC2RootVolume.Type),
@@ -80,6 +89,11 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
8089
}
8190
awsMachine.SetGroupVersionKind(capa.GroupVersion.WithKind("AWSMachine"))
8291

92+
if in.Role == "bootstrap" {
93+
awsMachine.Name = capiutils.GenerateBoostrapMachineName(clusterID)
94+
awsMachine.Labels["install.openshift.io/bootstrap"] = ""
95+
}
96+
8397
// Handle additional security groups.
8498
for _, sg := range mpool.AdditionalSecurityGroupIDs {
8599
awsMachine.Spec.AdditionalSecurityGroups = append(
@@ -103,7 +117,7 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
103117
Spec: capi.MachineSpec{
104118
ClusterName: clusterID,
105119
Bootstrap: capi.Bootstrap{
106-
DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, role)),
120+
DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, in.Role)),
107121
},
108122
InfrastructureRef: v1.ObjectReference{
109123
APIVersion: capa.GroupVersion.String(),

‎pkg/asset/machines/clusterapi.go‎

Lines changed: 26 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ import (
88

99
"github.com/pkg/errors"
1010
"github.com/sirupsen/logrus"
11-
v1 "k8s.io/api/core/v1"
12-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1311
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1412
"k8s.io/utils/ptr"
15-
capa "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
16-
capi "sigs.k8s.io/cluster-api/api/v1beta1"
1713
"sigs.k8s.io/controller-runtime/pkg/client"
1814
"sigs.k8s.io/yaml"
1915

@@ -31,6 +27,7 @@ import (
3127
"github.com/openshift/installer/pkg/asset/rhcos"
3228
"github.com/openshift/installer/pkg/clusterapi"
3329
rhcosutils "github.com/openshift/installer/pkg/rhcos"
30+
"github.com/openshift/installer/pkg/types"
3431
awstypes "github.com/openshift/installer/pkg/types/aws"
3532
awsdefaults "github.com/openshift/installer/pkg/types/aws/defaults"
3633
azuretypes "github.com/openshift/installer/pkg/types/azure"
@@ -145,89 +142,39 @@ func (c *ClusterAPI) Generate(dependencies asset.Parents) error {
145142
}
146143
}
147144

145+
tags, err := aws.CapaTagsFromUserTags(clusterID.InfraID, installConfig.Config.Platform.AWS.UserTags)
146+
if err != nil {
147+
return fmt.Errorf("failed to create CAPA tags from UserTags: %w", err)
148+
}
149+
148150
pool.Platform.AWS = &mpool
149-
awsMachines, err := aws.GenerateMachines(
150-
clusterID.InfraID,
151-
installConfig.Config.Platform.AWS.Region,
152-
subnets,
153-
&pool,
154-
"master",
155-
installConfig.Config.Platform.AWS.UserTags,
156-
)
151+
awsMachines, err := aws.GenerateMachines(clusterID.InfraID, &aws.MachineInput{
152+
Role: "master",
153+
Pool: &pool,
154+
Subnets: subnets,
155+
Tags: tags,
156+
PublicIP: false,
157+
})
157158
if err != nil {
158159
return errors.Wrap(err, "failed to create master machine objects")
159160
}
160161
c.FileList = append(c.FileList, awsMachines...)
161162

162-
// TODO(vincepri): The following code is almost duplicated from aws.AWSMachines.
163-
// Refactor and generalize around a bootstrap pool, with a single machine and
164-
// a custom openshift label to determine the bootstrap machine role, so we can
165-
// delete the machine when the stage is complete.
166-
bootstrapAWSMachine := &capa.AWSMachine{
167-
ObjectMeta: metav1.ObjectMeta{
168-
Name: capiutils.GenerateBoostrapMachineName(clusterID.InfraID),
169-
Labels: map[string]string{
170-
"cluster.x-k8s.io/control-plane": "",
171-
"install.openshift.io/bootstrap": "",
172-
},
173-
},
174-
Spec: capa.AWSMachineSpec{
175-
Ignition: &capa.Ignition{Version: "3.2"},
176-
UncompressedUserData: ptr.To(true),
177-
InstanceType: mpool.InstanceType,
178-
AMI: capa.AMIReference{ID: ptr.To(mpool.AMIID)},
179-
SSHKeyName: ptr.To(""),
180-
IAMInstanceProfile: fmt.Sprintf("%s-master-profile", clusterID.InfraID),
181-
PublicIP: ptr.To(true),
182-
RootVolume: &capa.Volume{
183-
Size: int64(mpool.EC2RootVolume.Size),
184-
Type: capa.VolumeType(mpool.EC2RootVolume.Type),
185-
IOPS: int64(mpool.EC2RootVolume.IOPS),
186-
Encrypted: ptr.To(true),
187-
EncryptionKey: mpool.KMSKeyARN,
188-
},
189-
},
190-
}
191-
bootstrapAWSMachine.SetGroupVersionKind(capa.GroupVersion.WithKind("AWSMachine"))
192-
193-
// Handle additional security groups.
194-
for _, sg := range mpool.AdditionalSecurityGroupIDs {
195-
bootstrapAWSMachine.Spec.AdditionalSecurityGroups = append(
196-
bootstrapAWSMachine.Spec.AdditionalSecurityGroups,
197-
capa.AWSResourceReference{ID: ptr.To(sg)},
198-
)
199-
}
200-
201-
c.FileList = append(c.FileList, &asset.RuntimeFile{
202-
File: asset.File{Filename: fmt.Sprintf("10_inframachine_%s.yaml", bootstrapAWSMachine.Name)},
203-
Object: bootstrapAWSMachine,
163+
pool := *ic.ControlPlane
164+
pool.Name = "bootstrap"
165+
pool.Replicas = ptr.To[int64](1)
166+
pool.Platform.AWS = &mpool
167+
bootstrapAWSMachine, err := aws.GenerateMachines(clusterID.InfraID, &aws.MachineInput{
168+
Role: "bootstrap",
169+
Subnets: nil, // let CAPA pick one
170+
Pool: &pool,
171+
Tags: tags,
172+
PublicIP: installConfig.Config.Publish == types.ExternalPublishingStrategy,
204173
})
205-
206-
bootstrapMachine := &capi.Machine{
207-
ObjectMeta: metav1.ObjectMeta{
208-
Name: bootstrapAWSMachine.Name,
209-
Labels: map[string]string{
210-
"cluster.x-k8s.io/control-plane": "",
211-
},
212-
},
213-
Spec: capi.MachineSpec{
214-
ClusterName: clusterID.InfraID,
215-
Bootstrap: capi.Bootstrap{
216-
DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID.InfraID, "bootstrap")),
217-
},
218-
InfrastructureRef: v1.ObjectReference{
219-
APIVersion: capa.GroupVersion.String(),
220-
Kind: "AWSMachine",
221-
Name: bootstrapAWSMachine.Name,
222-
},
223-
},
174+
if err != nil {
175+
return fmt.Errorf("failed to create bootstrap machine object: %w", err)
224176
}
225-
bootstrapMachine.SetGroupVersionKind(capi.GroupVersion.WithKind("Machine"))
226-
227-
c.FileList = append(c.FileList, &asset.RuntimeFile{
228-
File: asset.File{Filename: fmt.Sprintf("10_machine_%s.yaml", bootstrapMachine.Name)},
229-
Object: bootstrapMachine,
230-
})
177+
c.FileList = append(c.FileList, bootstrapAWSMachine...)
231178
case azuretypes.Name:
232179
mpool := defaultAzureMachinePoolPlatform()
233180
mpool.InstanceType = azuredefaults.ControlPlaneInstanceType(

0 commit comments

Comments
 (0)