Skip to content

Conversation

@ytsssun
Copy link
Contributor

@ytsssun ytsssun commented Dec 15, 2025

Issue number:

Related to: bottlerocket-os/bottlerocket#4725

Description of changes:

Initial set of changes for kubernetes 1.35 support:

  • Add a kubernetes-1.35 pkg with the EKS-D k8s-1.35 beta source (v1.35.0-beta.0)
  • Add a ecr-credential-provider-1.35 pkg with the 1.35.0 source

Key changes:

  • Remove --pod-infra-container-image kubelet flag (removed upstream in 1.35)

Testing done:

  • Core-kit builds with the new packages
  • Instance using the 1.35-beta.0 kubelet boots
    kubelet version is reported correctly
     bash-5.1# kubelet --version
     Kubernetes v1.35.0-beta.0-eks-7980c10
    
    Node joined cluster
    k get nodes
    NAME                                            STATUS   ROLES    AGE     VERSION
    ip-192-168-2-215.us-west-2.compute.internal     Ready    <none>   2m3s    v1.35.0-beta.0-eks-7980c10
    
  • RPM info to verify rpmvercmp
rpm -qpi build/rpms/kubernetes-1.35/bottlerocket-kubelet-1.35-1.35.0-0.beta0.1767128447.473aa566.br1.x86_64.rpm 
Name        : bottlerocket-kubelet-1.35
Version     : 1.35.0
Release     : 0.beta0.1767128447.473aa566.br1
Architecture: x86_64
Install Date: (not installed)
Group       : Unspecified
Size        : 1579759
License     : Apache-2.0 AND BSD-3-Clause
Signature   : (none)
Source RPM  : bottlerocket-kubernetes-1.35.0-0.beta0.1767128447.473aa566.br1.src.rpm
Build Date  : Tue 30 Dec 2025 09:07:20 PM UTC
Build Host  : localhost
URL         : https://github.com/kubernetes/kubernetes
Summary     : Container cluster node agent
Description :
Container cluster node agent.

rpm -qpi build/rpms/ecr-credential-provider-1.35/bottlerocket-ecr-credential-provider-1.35-1.35.0-1.1767144308.398157c0.br1.x86_64.rpm 
Name        : bottlerocket-ecr-credential-provider-1.35
Version     : 1.35.0
Release     : 1.1767144308.398157c0.br1
Architecture: x86_64
Install Date: (not installed)
Group       : Unspecified
Size        : 1095302
License     : Apache-2.0
Signature   : (none)
Source RPM  : bottlerocket-ecr-credential-provider-1.35-1.35.0-1.1767144308.398157c0.br1.src.rpm
Build Date  : Wed 31 Dec 2025 01:25:48 AM UTC
Build Host  : localhost
URL         : https://github.com/kubernetes/cloud-provider-aws
Summary     : Amazon ECR credential provider
Description :
Amazon ECR credential provider.

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.

@ytsssun ytsssun force-pushed the k8s-1.35/core-kit branch 3 times, most recently from ddd6009 to 2327d00 Compare December 16, 2025 02:30
@ytsssun ytsssun force-pushed the k8s-1.35/core-kit branch 6 times, most recently from 56dd7f7 to d1119e0 Compare December 29, 2025 22:31
@ytsssun ytsssun requested a review from koooosh December 29, 2025 23:00
@ytsssun ytsssun marked this pull request as ready for review December 29, 2025 23:00
Copy link
Contributor

@koooosh koooosh left a comment

Choose a reason for hiding this comment

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

We should fix the Release field for ECR cred provider, but the rest are just nits

Add ecr-credential-provider for Kubernetes 1.35.
Uses cloud-provider-aws v1.35.0 source.

Signed-off-by: Yutong Sun <yutongsu@amazon.com>
@ytsssun ytsssun requested a review from koooosh December 31, 2025 01:28
@ytsssun
Copy link
Contributor Author

ytsssun commented Dec 31, 2025

Force push to address comments from @koooosh

Signed-off-by: Yutong Sun <yutongsu@amazon.com>
Copy link
Contributor

@koooosh koooosh left a comment

Choose a reason for hiding this comment

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

The rpm info for ecr-credential-provider-1.35 needs to be updated in the description since we updated some of the fields, but overall LGTM.

@ytsssun ytsssun merged commit 2cc465e into bottlerocket-os:develop Dec 31, 2025
3 of 4 checks passed
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.

3 participants