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

🌱 Backport main to 2.4 #4878

Merged
merged 49 commits into from
Mar 18, 2024
Merged

🌱 Backport main to 2.4 #4878

merged 49 commits into from
Mar 18, 2024

Conversation

nrb
Copy link
Contributor

@nrb nrb commented Mar 18, 2024

What type of PR is this?

/kind support

What this PR does / why we need it:

Backporting fixes from main to release-2.4.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

Release note:

NONE

guettli and others added 30 commits February 14, 2024 15:19
Co-authored-by: Andreas Sommer <[email protected]>
- add Taints field
- add TuningConfigs field
This is required for when the managment cluster has OwnerReferencesPermissionEnforcement admission controller enabled.
`us-east-1` is invalid as a Location Contraint when creating a bucket.

"Buckets in Region us-east-1 have a LocationConstraint of null."[1]

[1] https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketLocation.html#API_GetBucketLocation_ResponseSyntax
…loc-use1

🐛 fix: s3 bucket in us-east-1 should not set location constraint
Signed-off-by: Richard Case <[email protected]>
- cleanup *types.go
- report erros in conditions
…chinepool

✨ ROSA: Reconcile ROSAMachinePool fields
Bumps the dependencies group in /hack/tools with 2 updates: [github.com/mikefarah/yq/v4](https://github.com/mikefarah/yq) and [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind).


Updates `github.com/mikefarah/yq/v4` from 4.40.5 to 4.42.1
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](mikefarah/yq@v4.40.5...v4.42.1)

Updates `sigs.k8s.io/kind` from 0.21.0 to 0.22.0
- [Release notes](https://github.com/kubernetes-sigs/kind/releases)
- [Commits](kubernetes-sigs/kind@v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: github.com/mikefarah/yq/v4
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: sigs.k8s.io/kind
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
- sync replicase to CAPI MachinePool when autoscaling is enabled
- fixed ROSAMachinePool not reporting ready when autoscaling enabled
…derid-list

✨ ROSA: Reconcile ROSAMachinePool.spec.ProviderIDList
✨ ROSA: Add additionalSecurityGroups field to ROSAMachinePool
🌱 Align golangci-lint with upstream Cluster API
…ot/go_modules/hack/tools/dependencies-a89a6c7354

🌱 Bump the dependencies group in /hack/tools with 2 updates
🌱 Update awsmachinetemplate_webhook.go, fix typo
- remove cluster expirationTime
…new-fields

✨Add new fields to ROSAControlPlane - additionalTags, etcdEncryption, endpointAccess
From Ignition v3.1 there is support in the struct to setup a proxy, and
CA validation. This changeset allows AWSMachines to expose these
features when using Ignition.

Signed-off-by: Vince Prignano <[email protected]>
…ition

🌱 Add support for Ignition v3 Proxy and TLS
muraee and others added 11 commits March 12, 2024 19:50
- group rosa clusterCompute config
- make force deletion optional through annotation
- report deleting status in condition
- fixed machinepool triggering an upgrade when upgrading controlPlane
✨ Add nodeDrainGracePeriod for RosaMachinePool
- use the correct typemetav1.Duration for NodeDrainGracePeriod field
- fixed reconcileProviderIDList() listing terminated/stopped instances
…tags

✨ ROSA: Add additionalTags API field to ROSAMachinePool
…-shardid

✨ ROSA: Add ProvisionShardID API field to ROSAControlPlane
@k8s-ci-robot k8s-ci-robot added kind/support Categorizes issue or PR as a support question. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/contains-merge-commits labels Mar 18, 2024
@k8s-ci-robot
Copy link
Contributor

Adding label do-not-merge/contains-merge-commits because PR contains merge commits, which are not allowed in this repository.
Use git rebase to reapply your commits on top of the target branch. Detailed instructions for doing so can be found here.

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.

@k8s-ci-robot k8s-ci-robot requested a review from cnmcavoy March 18, 2024 14:49
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 18, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign cecilerobertmichon for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 18, 2024
@nrb nrb changed the title 🌱 🌱 Backport main to 2.4 Mar 18, 2024
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 18, 2024
@nrb
Copy link
Contributor Author

nrb commented Mar 18, 2024

/hold

This is mostly to double check the contents before I manually fast forward the release-2.4 branch. I am not intending to actually merge this PR.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 18, 2024
@nrb
Copy link
Contributor Author

nrb commented Mar 18, 2024

Will also wait to include #4877

@nrb nrb merged commit fc19825 into kubernetes-sigs:release-2.4 Mar 18, 2024
26 of 31 checks passed
@nrb nrb deleted the release-2.4 branch March 18, 2024 15:23
@nrb
Copy link
Contributor Author

nrb commented Mar 18, 2024

Manually pushed the release-2.4 branch; it didn't actually merge through this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/contains-merge-commits do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/support Categorizes issue or PR as a support question. needs-priority release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.