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

[1.13.x] Cherrypicks for 1.13.4 #3042

Merged
merged 9 commits into from
Apr 20, 2023
Merged

Conversation

rpkelly
Copy link
Contributor

@rpkelly rpkelly commented Apr 20, 2023

Issue number:
N/A

Description of changes:
Cherry picks changes from:

As well as updating the version in Release.toml

Testing done:
N/A

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

etungsten and others added 8 commits April 20, 2023 17:26
This lets the 'settings.kubernetes.cloud-provider' setting control what
gets passed to '--cloud-provider' in kubelet options
…s-1.26

This separates the model for aws-k8s-1.26 so that we generate the
'hostname-override' setting and set the cloud-provider to 'external' for
aws-k8s-1.26 variants only.
Adds a new command for retrieving the instance's PrivateDnsName.

Refactors out code for setting up proxy for the AWS API clients so it
can be shared between the EKS module and EC2 module.
This adds the 'kubernetes.hostname-override' setting for kubelet's
'--hostname-override' option.
Updates runc to v1.1.6
The `fetch_hostname` method queries the `metadata/local-hostname` IMDS
target, which has the potential to return multiple space-delimited
hostnames.  This changes the method to return only the first hostname in
the list.
Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New change for the version mismatch looks good.

@rpkelly rpkelly merged commit f549851 into bottlerocket-os:1.13.x Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants