[kubernetes] Update tenant Kubernetes to v1.32 #871

kvaps · 2025-04-24T08:37:50Z

This PR also updates ubuntu-container-disk image to latest 24.04 LTS (Noble Numbat)

Signed-off-by: Andrei Kvapil kvapss@gmail.com

Summary by CodeRabbit

Chores
- Updated Kubernetes version references from v1.30.1 to v1.32 in build and deployment configurations.
- Changed the base image for Ubuntu container disk to Ubuntu 24.04.
- Made the Kubernetes version configurable during build processes.
- Updated the kubectl container image in pre-delete jobs to use the latest tag.

coderabbitai · 2025-04-24T08:37:57Z

Walkthrough

This change updates the Kubernetes version references across the build and deployment files in the Kubernetes app package. The Makefile now uses a KUBERNETES_VERSION variable set to v1.32, replacing the previous UBUNTU_CONTAINER_DISK_TAG. The Dockerfile for the Ubuntu container disk image is updated to use Ubuntu 24.04 as the base and parameterizes the Kubernetes version via a build argument. Template files are updated to reference the new Kubernetes version, and the Helm release deletion job now uses the updated kubectl image tag v1.32.

Changes

File(s)	Change Summary
packages/apps/kubernetes/Makefile	Renamed `UBUNTU_CONTAINER_DISK_TAG` to `KUBERNETES_VERSION` set to `v1.32`; updated Docker build args and image tags.
packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile	Changed base image to Ubuntu 24.04; added `KUBERNETES_VERSION` build argument; updated Kubernetes repo setup to use version arg.
packages/apps/kubernetes/templates/cluster.yaml	Updated MachineDeployment infrastructureRef version from `v1.30.1` to `v1.32.3`.
packages/apps/kubernetes/templates/helmreleases/delete.yaml	Updated `kubectl` container image tag from `v1.30.1` to `v1.32` in pre-delete Helm hook job.

Suggested labels

ok-to-test, backport

Suggested reviewers

lllamnyp
klinch0

Poem

A hop, a skip, a version bump,
Kubernetes leaps—no time to slump!
Ubuntu’s fresher, clusters gleam,
With YAMLs tuned and Docker’s theme.
The rabbit cheers, “Release is nigh!
New tags and builds—oh my, oh my!” 🐇✨

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6b98487 and 3ed0cde.

📒 Files selected for processing (4)

packages/apps/kubernetes/Makefile (2 hunks)
packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile (3 hunks)
packages/apps/kubernetes/templates/cluster.yaml (1 hunks)
packages/apps/kubernetes/templates/helmreleases/delete.yaml (1 hunks)

🚧 Files skipped from review as they are similar to previous changes (4)

packages/apps/kubernetes/templates/cluster.yaml
packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile
packages/apps/kubernetes/templates/helmreleases/delete.yaml
packages/apps/kubernetes/Makefile

⏰ Context from checks skipped due to timeout of 90000ms (1)

GitHub Check: Build and Test

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 1

🔭 Outside diff range comments (1)

packages/apps/kubernetes/Makefile (1)
24-25: ⚠️ Potential issue

Fix outdated variable reference in echo command
The echo still uses $(UBUNTU_CONTAINER_DISK_TAG), which no longer exists. Update it to use $(KUBERNETES_VERSION) instead.

Apply this diff:
-	echo "$(REGISTRY)/ubuntu-container-disk:$(call settag,$(UBUNTU_CONTAINER_DISK_TAG))@$$(yq e '."containerimage.digest"' images/ubuntu-container-disk.json -o json -r)" \
+	echo "$(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION))@$$(yq e '."containerimage.digest"' images/ubuntu-container-disk.json -o json -r)" \
 	> images/ubuntu-container-disk.tag

🧹 Nitpick comments (3)

packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile (2)
18-19: Introduce KUBERNETES_VERSION build argument
Parameterizing the Kubernetes version is a solid improvement. Consider providing a default value (e.g., ARG KUBERNETES_VERSION=v1.32) and updating documentation or comments to reflect this new build-time parameter.

31-32: Dynamic Kubernetes APT repository setup—escape variables safely
You’re using the KUBERNETES_VERSION variable within shell commands. To prevent accidental word-splitting or globbing, quote the variable usage inside the sh invocation:
- && guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
+ && guestfish --remote sh 'curl -fsSL "https://pkgs.k8s.io/core:/stable:/'"${KUBERNETES_VERSION}"'/deb/Release.key" | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' \
Repeat for the corresponding echo 'deb ...' line to ensure the URL is constructed correctly.
packages/apps/kubernetes/templates/cluster.yaml (1)

286-286: Bump MachineDeployment version to v1.32.3—ensure alignment
The MachineDeployment version was updated to v1.32.3. Confirm that this patch version is intentional and consistent with other version references (e.g., in the Cluster resource spec.version). Consider parameterizing this value in values.yaml to avoid hardcoding in the template.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0fc3fdc and 2d07370.

📒 Files selected for processing (4)

packages/apps/kubernetes/Makefile (2 hunks)
packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile (3 hunks)
packages/apps/kubernetes/templates/cluster.yaml (1 hunks)
packages/apps/kubernetes/templates/helmreleases/delete.yaml (1 hunks)

🔇 Additional comments (3)

packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile (1)

1-1: Upgrade base image to Ubuntu 24.04—verify compatibility
Moving from Ubuntu 22.04 to 24.04 may introduce changes to package availability, default kernel versions, or filesystem tools. Ensure that all required packages (e.g., guestfish, qemu) are still supported and that any upstream repositories for Ubuntu 24.04 remain available.

packages/apps/kubernetes/Makefile (2)

1-1: Update Kubernetes version variable
The variable KUBERNETES_VERSION = v1.32 correctly captures the new minor bump. Ensure downstream targets (e.g., Helm charts, documentation) reference this updated value.

15-17: Pass new KUBERNETES_VERSION build-args and tags
The Docker build command now correctly uses --build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} and tags the image with $(KUBERNETES_VERSION). This aligns with the Dockerfile changes.

packages/apps/kubernetes/templates/helmreleases/delete.yaml

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

kvaps requested review from klinch0 and lllamnyp as code owners April 24, 2025 08:37

coderabbitai bot reviewed Apr 24, 2025

View reviewed changes

packages/apps/kubernetes/templates/helmreleases/delete.yaml Outdated Show resolved Hide resolved

kvaps force-pushed the upd-kubernetes branch 5 times, most recently from 3ebe0c4 to 0880f96 Compare April 24, 2025 09:05

klinch0 approved these changes Apr 24, 2025

View reviewed changes

lllamnyp approved these changes Apr 24, 2025

View reviewed changes

[kubernetes] Update tenant Kubernetes to v1.32

3ed0cde

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

kvaps force-pushed the upd-kubernetes branch from 0880f96 to 3ed0cde Compare April 24, 2025 11:45

kvaps enabled auto-merge April 24, 2025 12:30

kvaps merged commit 249950d into main Apr 24, 2025
6 of 7 checks passed

kvaps deleted the upd-kubernetes branch April 24, 2025 12:44

coderabbitai bot mentioned this pull request Apr 24, 2025

[kubernetes] Fix ubuntu-container-disk tag #887

Merged

This was referenced Jul 14, 2025

[kubernetes] User-selectable cluster version #1191

Merged

[kubernetes] Explicitly mention available K8s versions #1212

Merged

coderabbitai bot mentioned this pull request Oct 3, 2025

feat/impruvement-kubernetes-tests #1485

Merged

coderabbitai bot mentioned this pull request Oct 13, 2025

feat/improvement-kubernetes-tests #1508

Closed

coderabbitai bot mentioned this pull request Nov 8, 2025

[kubernetes] Make worker version configurable #1619

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[kubernetes] Update tenant Kubernetes to v1.32 #871

[kubernetes] Update tenant Kubernetes to v1.32 #871

Uh oh!

kvaps commented Apr 24, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Apr 24, 2025 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[kubernetes] Update tenant Kubernetes to v1.32 #871

[kubernetes] Update tenant Kubernetes to v1.32 #871

Uh oh!

Conversation

kvaps commented Apr 24, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Suggested labels

Suggested reviewers

Poem

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kvaps commented Apr 24, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Apr 24, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)