Skip to content
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

[release-4.17] OCPBUGS-42763: aws: fix NLB creation in secret regions #9071

Open
wants to merge 4 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPBUGS-42763: aws: fix NLB creation in secret regions #9071

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7528dcd
infra/aws: remove apiHost condition on Load Balancer
r4f4 Jun 19, 2024
72d0fd8
aws: refactor `CreateOrUpdateRecord` function
r4f4 Jun 19, 2024
683c958
aws: move owned tag creation to `CreateHostedZone`
r4f4 Jun 20, 2024
808319a
ic: aws: document createRecord input fields.
r4f4 Sep 30, 2024
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
Prev Previous commit
Next Next commit
aws: move owned tag creation to CreateHostedZone 
Tagging the resource as "owned" should be part of the creation.
  • Loading branch information
@r4f4
r4f4 authored and openshift-cherrypick-robot committed Oct 4, 2024
commit 683c95800331bc8208e40a7c6fea318c615a9dff
1 change: 1 addition & 0 deletions pkg/asset/installconfig/aws/route53.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ func (c *Client) CreateHostedZone(ctx context.Context, input *HostedZoneInput) (
// Tag the hosted zone
tags := mergeTags(input.UserTags, map[string]string{
"Name": fmt.Sprintf("%s-int", input.InfraID),
fmt.Sprintf("kubernetes.io/cluster/%s", input.InfraID): "owned",
})
_, err = svc.ChangeTagsForResourceWithContext(ctx, &route53.ChangeTagsForResourceInput{
ResourceType: aws.String("hostedzone"),
Expand Down
9 changes: 1 addition & 8 deletions pkg/infrastructure/aws/clusterapi/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,13 @@ func (*Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput)
if len(phzID) == 0 {
logrus.Debugln("Creating private Hosted Zone")

tags := map[string]string{
fmt.Sprintf("kubernetes.io/cluster/%s", in.InfraID): "owned",
}
for k, v := range awsCluster.Spec.AdditionalTags {
tags[k] = v
}

res, err := client.CreateHostedZone(ctx, &awsconfig.HostedZoneInput{
InfraID: in.InfraID,
VpcID: vpcID,
Region: awsCluster.Spec.Region,
Name: in.InstallConfig.Config.ClusterDomain(),
Role: in.InstallConfig.Config.AWS.HostedZoneRole,
UserTags: tags,
UserTags: awsCluster.Spec.AdditionalTags,
})
if err != nil {
return fmt.Errorf("failed to create private hosted zone: %w", err)
Expand Down