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.

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

NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.2 (1c23009) into master #507

Merged
merged 18 commits into from Apr 15, 2024

Conversation

damdo
Copy link
Member

@damdo damdo commented Apr 13, 2024

No description provided.

…#4907)

* 🐛 fix: s3: do not ignore non-aws errors when deleting object

If any error of non awserr.Error type happens when trying to list a
bootstrap data object, it would be silently ignored.

* 🐛fix: s3: ignore "NotFound" errors

The `s3.HeadObject` API call can return "NotFound" when either the
bucket or the object does not exist (as opposed to the more descriptive
`s3.ErrCodeNoSuchKey` or `s3.ErrCodeNoSuchBucket`).

This would cause the machine controller to loop indefinitely trying to
delete an already deleted object but failing:

```
E0316 16:37:08.973942     366 awsmachine_controller.go:307] "unable to delete machine" err=<
	deleting bootstrap data object: deleting S3 object: NotFound: Not Found
		status code: 404, request id: 5Z101DW1KN380WTY, host id: tYlSi9K38lBkIsr2DNf/xFfgDuFaVfeUmpscXdljiMZC5iRxPIDuXSLwHJwdFnosYCfi7Bih25GaDpVAbSq4ZA==
 >
```

* 🌱s3: add unit test for already deleted s3 object.

---------

Co-authored-by: Rafael Fonseca <r4f4rfs@gmail.com>
…igs#4908)

* 🐛ec2: instances: fix check for public subnets

It's not enough to check MapPublicIPOnLaunch since public subnets can
have that off.

* 🐛ec2: instances: fix assigning public IP

In the scenario where the user brings their own VPC, if no subnet ID is
set in the machine spec and PublicIP is true, CAPA will choose one from
the available public subnets. However, if the subnet doesn't have
MapPublicIPOnLaunch == true, the instance will not be assigned a public
IP. As a result, the instance will have no internet access, contrary to
the user's expectation.

This change guarantees an instance will be assigned a public IP even if
the subnet doesn't do it on instance launch. Instead, we set the option
in the instance's network interface.

* 🌱ec2: instances: add unit tests for MapPublicIpOnLaunch=false

The tests check that a NetworkInterface is defined with
`AssociatePublicIpAddress` in the `RunInstances` input.

---------

Co-authored-by: Rafael Fonseca <r4f4rfs@gmail.com>
Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com>
Route tables must be deleted after fail to create, otherwise it will
generate a new route table every new reconciliator loop.

This fix ensure route table is deleted when failed to create, raising a
wanring to the recorder when failed to create, and eventually, failed to
delete.
Ingress rules from both primary and secondary load balancers must be
taken into account.
Signed-off-by: melserngawy <melserng@redhat.com>
…ot/cherry-pick-4896-to-release-2.4

[release-2.4] 🐛Retry fetching user data from secretmanager if first request fails
…ot/cherry-pick-4899-to-release-2.4

[release-2.4] 🐛 fix/network/rtb: delete rtb handling err when failed to create routes
…ot/cherry-pick-4866-to-release-2.4

[release-2.4] 🐛 fix: create ingress rules from all load balancers
…ot/cherry-pick-4873-to-release-2.4

[release-2.4] 🐛 ROSA: fix auto scale and multi zone compute nodes
… dhcpOpts

When a VPC sets a DHCPOption's domain-name with a custom DNS name, it's being ignored. Now, with this PR, ensure that during instance creation, the controller checks the DHCPOptions and sets the proper PrivateDNSName.

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
…CPBUGS-29391

[release-2.4] 🐛 fix: Fix instance PrivateDNSName when domain-name is set in dhcpOpts
@openshift-ci openshift-ci bot requested review from nrb and RadekManak April 13, 2024 13:01
@damdo
Copy link
Member Author

damdo commented Apr 13, 2024

/retest

Copy link

openshift-ci bot commented Apr 13, 2024

@damdo: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@damdo damdo changed the title Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.2 (1c23009) into master NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.2 (1c23009) into master Apr 15, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 15, 2024
@openshift-ci-robot
Copy link

@damdo: This pull request explicitly references no jira issue.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@theobarberbany
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2024
@nrb
Copy link

nrb commented Apr 15, 2024

/approve

Copy link

openshift-ci bot commented Apr 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 15, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 63025f8 into openshift:master Apr 15, 2024
9 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-aws-cluster-api-controllers-container-v4.16.0-202404151450.p0.g63025f8.assembly.stream.el9 for distgit ose-aws-cluster-api-controllers.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet