Skip to content

pkg/rhcos/ami: Start supporting RHCOS channels #409

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

Closed
wking wants to merge 1 commit into from
Closed

pkg/rhcos/ami: Start supporting RHCOS channels #409

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
4 changes: 1 addition & 3 deletions pkg/asset/manifests/machine-api-operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import (

const (
maoTargetNamespace = "openshift-cluster-api"
// DefaultChannel is the default RHCOS channel for the cluster.
DefaultChannel = "tested"
)

// machineAPIOperator generates the network-operator-*.yml files
Expand Down Expand Up @@ -118,7 +116,7 @@ func (mao *machineAPIOperator) maoConfig(dependencies map[asset.Asset]*asset.Sta
if mao.installConfig.Platform.AWS != nil {
var ami string

ami, err := rhcos.AMI(context.TODO(), DefaultChannel, mao.installConfig.Platform.AWS.Region)
ami, err := rhcos.AMI(context.TODO(), rhcos.DefaultChannel, mao.installConfig.Platform.AWS.Region)
if err != nil {
return "", fmt.Errorf("failed to lookup RHCOS AMI: %v", err)
}
Expand Down
69 changes: 38 additions & 31 deletions pkg/rhcos/ami.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,43 @@ import (

const (
// DefaultChannel is the default RHCOS channel for the cluster.
DefaultChannel = "tested"
DefaultChannel = "alpha"
)

// AMI calculates a Red Hat CoreOS AMI.
func AMI(ctx context.Context, channel, region string) (ami string, err error) {
if channel != DefaultChannel {
return "", fmt.Errorf("channel %q is not yet supported", channel)
filters := []*ec2.Filter{
{
Name: aws.String("name"),
Values: aws.StringSlice([]string{"rhcos*"}),
},
{
Name: aws.String("architecture"),
Values: aws.StringSlice([]string{"x86_64"}),
},
{
Name: aws.String("virtualization-type"),
Values: aws.StringSlice([]string{"hvm"}),
},
{
Name: aws.String("image-type"),
Values: aws.StringSlice([]string{"machine"}),
},
{
Name: aws.String("owner-id"),
Values: aws.StringSlice([]string{"531415883065"}),
},
{
Name: aws.String("state"),
Values: aws.StringSlice([]string{"available"}),
},
}

if channel != "" {
filters = append(filters, &ec2.Filter{
Name: aws.String("tag:rhcos_tag"),
Values: aws.StringSlice([]string{channel}),
})
}

ssn := session.Must(session.NewSessionWithOptions(session.Options{
Expand All @@ -29,34 +59,8 @@ func AMI(ctx context.Context, channel, region string) (ami string, err error) {
}))

svc := ec2.New(ssn)

result, err := svc.DescribeImagesWithContext(ctx, &ec2.DescribeImagesInput{
Filters: []*ec2.Filter{
{
Name: aws.String("name"),
Values: aws.StringSlice([]string{"rhcos*"}),
},
{
Name: aws.String("architecture"),
Values: aws.StringSlice([]string{"x86_64"}),
},
{
Name: aws.String("virtualization-type"),
Values: aws.StringSlice([]string{"hvm"}),
},
{
Name: aws.String("image-type"),
Values: aws.StringSlice([]string{"machine"}),
},
{
Name: aws.String("owner-id"),
Values: aws.StringSlice([]string{"531415883065"}),
},
{
Name: aws.String("state"),
Values: aws.StringSlice([]string{"available"}),
},
},
Filters: filters,
})
if err != nil {
return "", err
Expand All @@ -80,7 +84,10 @@ func AMI(ctx context.Context, channel, region string) (ami string, err error) {
}

if image == nil {
return "", fmt.Errorf("no RHCOS AMIs found in %s", region)
if channel == "" {
return "", fmt.Errorf("no RHCOS AMIs found in %s", region)
}
return "", fmt.Errorf("no %s RHCOS AMIs found in %s", channel, region)
}

return *image.ImageId, nil
Expand Down