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

Improve the Kubernetes 1.30 support #3234

Merged
merged 8 commits into from
Jun 18, 2024
Merged

Improve the Kubernetes 1.30 support #3234

merged 8 commits into from
Jun 18, 2024

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Jun 18, 2024

What this PR does / why we need it:

This PR introduces several improvements and bug fixes to our Kubernetes 1.30 support:

  • Set cri-tools version for Kubernetes 1.30 on Flatcar
  • Drop --certificate-renew=true and --yes flags from kubeadm upgrade apply command as it's not possible to combine the --config flag with other flags as of kubeadm 1.30
    • Dropping the --certificate-renew=true flag is a no-op change because the flag is true by default
    • Dropping the --yes flag means that we run kubeadm in the interactive mode and that kubeadm will ask user to type yes to confirm upgrading the cluster. As KubeOne doesn't support interactive inputs, we mitigate this by piping yes to the kubeadm upgrade apply command
  • Fix Rocky Linux tests failing by using t3.nano instead of t3a.nano for the bastion instance
    • It appears that the latest Rocky Linux AMI doesn't work on t3a.nano any longer, the instance is stuck in initializing and it's not possible to SSH to it

Additionally, this PR does some bookkeeping work:

  • Add an entry for setting cri-tools version for a new Kubernetes version on Flatcar
  • Update the Update images template with the latest changes

Which issue(s) this PR fixes:
xref #3205 #3206

What type of PR is this?

/kind bug
/kind cleanup

Does this PR introduce a user-facing change? Then add your Release Note here:

KubeOne now runs `kubeadm upgrade apply` without `--certificate-renewal=true` and `--yes` flags. This change should not have any effect to the upgrade process, but if you discover any issue, please create a new issue in the KubeOne repository

Documentation:

NONE

/assign @kron4eg @xrstf

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 18, 2024
@kron4eg
Copy link
Member

kron4eg commented Jun 18, 2024

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 18, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c8118959d913500ee56a4cf348d5054474e4651b

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2024
Copy link
Member

@SimonTheLeg SimonTheLeg left a comment

Choose a reason for hiding this comment

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

small question from my side

.github/ISSUE_TEMPLATE/update-images.md Show resolved Hide resolved
@xmudrii
Copy link
Member Author

xmudrii commented Jun 18, 2024

/cherrypick release/v1.8

@kubermatic-bot
Copy link
Contributor

@xmudrii: once the present PR merges, I will cherry-pick it on top of release/v1.8 in a new PR and assign it to you.

In response to this:

/cherrypick release/v1.8

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.

@xmudrii
Copy link
Member Author

xmudrii commented Jun 18, 2024

/retest

1 similar comment
@xmudrii
Copy link
Member Author

xmudrii commented Jun 18, 2024

/retest

@kubermatic-bot kubermatic-bot merged commit 5b613f2 into main Jun 18, 2024
13 of 14 checks passed
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.9 milestone Jun 18, 2024
@kubermatic-bot kubermatic-bot deleted the 1.30-cleanup branch June 18, 2024 14:05
@kubermatic-bot
Copy link
Contributor

@xmudrii: #3234 failed to apply on top of branch "release/v1.8":

Applying: Update update-images issue template
Applying: Use registry.k8s.io for GCP CCM images
Using index info to reconstruct a base tree...
M	pkg/templates/images/images.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/templates/images/images.go
CONFLICT (content): Merge conflict in pkg/templates/images/images.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Use registry.k8s.io for GCP CCM images
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v1.8

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.

@xmudrii
Copy link
Member Author

xmudrii commented Jun 18, 2024

/cherrypick release/v1.8

@kubermatic-bot
Copy link
Contributor

@xmudrii: new pull request created: #3242

In response to this:

/cherrypick release/v1.8

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.

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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants