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.

Sign up for GitHub

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

Bump kubernetes to 1.32.1 #5436

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Bump kubernetes to 1.32.1 #5436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eeaf07
Temporarily lock register-gen to 0.31.5
juanluisvaladas Jan 20, 2025
e2d47e9
Bump kubernetes to 1.32.1
juanluisvaladas Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
inputs:
version:
description: 'Version tag (e.g."v1.31.5+k0s.0")'
description: 'Version tag (e.g."v1.32.1+k0s.0")'
required: true

env:
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,14 @@ $(controller_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt ha
touch -- '$@'

# Run register-gen for each API group version.
# Usually register-gen should should be:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please check this. I think this is a reasonably good option given the current circumstances.

Copy link
Member

Choose a reason for hiding this comment

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

Urgh, so this is what we get for not evaluating the upstream alpha and beta releases. Pretty sure we could've avoided this to land in the final Kubernetes release. WDYT concerning kubernetes/kubernetes#129290 (comment)? Should we maybe set those GODEBUG flags, as well?

Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should have this as a separate commit, just for reference, and to maybe revert it whenever the issue is fixed upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved it to a separate commit. I'd like the actual version bump commit to pass the tests so I moved this commit before the bump.

# k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%)
# However, due to https://github.com/kubernetes/kubernetes/issues/129290 in 1.32.1 we
# need to hardcode it to 0.31.5 instead of the appropriate 0.32.1.
register_gen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/zz_generated.register.go)
codegen_targets += $(register_gen_targets)
$(register_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt embedded-bins/Makefile.variables
CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%) \
CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/register-gen@v0.31.5 \
--go-header-file=hack/tools/boilerplate.go.txt \
--output-file='_$(notdir $@).tmp' \
'github.com/k0sproject/k0s/$(dir $@)' || { \
Expand Down
6 changes: 3 additions & 3 deletions cncf/GTR.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,17 +329,17 @@ k0s project follows closely the upstream Kubernetes release cycle. The only diff
The k0s version string consists of the Kubernetes version and the k0s version. For example:

```text
v1.31.5+k0s.0
v1.32.1+k0s.0
```

The Kubernetes version (1.31.5) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.
The Kubernetes version (1.32.1) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.

## Installation

Here’s an example of how to set a single node cluster:

```console
# export K0S_VERSION=v1.31.2+k0s.0
# export K0S_VERSION=v1.32.1+k0s.0
# curl -sSfL https://github.com/k0sproject/k0s/releases/download/$K0S_VERSION/k0s-$K0S_VERSION-amd64 -o k0s
# chmod u+x k0s
# ./k0s install controller --single && ./k0s start
Expand Down
2 changes: 1 addition & 1 deletion cncf/security-self-assessment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This document serves as the k0s project [CNCF security self-assessment](https://
| Software | https://github.com/k0sproject/k0s |
| Security Provider | No |
| Languages | Golang |
| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.31.5%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.31.5%2Bk0s.0/spdx.json) |
| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.32.1%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.32.1%2Bk0s.0/spdx.json) |

## Security links

Expand Down
2 changes: 1 addition & 1 deletion embedded-bins/Makefile.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
#containerd_build_go_ldflags =
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"

kubernetes_version = 1.31.5
kubernetes_version = 1.32.1
helm_version = 3.11.1
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
Expand Down
144 changes: 71 additions & 73 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.10.0
github.com/urfave/cli v1.22.16
github.com/vishvananda/netlink v1.3.0
github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be
github.com/vmware-tanzu/sonobuoy v0.57.2
github.com/zcalusic/sysinfo v1.1.3
go.etcd.io/etcd/api/v3 v3.5.17
Expand All @@ -63,31 +63,32 @@ require (

// Kubernetes
require (
k8s.io/api v0.31.5
k8s.io/apiextensions-apiserver v0.31.5
k8s.io/apimachinery v0.31.5
k8s.io/cli-runtime v0.31.5
k8s.io/client-go v0.31.5
k8s.io/cloud-provider v0.31.5
k8s.io/cluster-bootstrap v0.31.5
k8s.io/component-base v0.31.5
k8s.io/component-helpers v0.31.5
k8s.io/cri-api v0.31.5
k8s.io/kube-aggregator v0.31.5
k8s.io/kubectl v0.31.5
k8s.io/kubelet v0.31.5
k8s.io/kubernetes v1.31.5
k8s.io/mount-utils v0.31.5
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
k8s.io/api v0.32.1
k8s.io/apiextensions-apiserver v0.32.1
k8s.io/apimachinery v0.32.1
k8s.io/cli-runtime v0.32.1
k8s.io/client-go v0.32.1
k8s.io/cloud-provider v0.32.1
k8s.io/cluster-bootstrap v0.32.1
k8s.io/component-base v0.32.1
k8s.io/component-helpers v0.32.1
k8s.io/cri-api v0.32.1
k8s.io/kube-aggregator v0.32.1
k8s.io/kubectl v0.32.1
k8s.io/kubelet v0.32.1
k8s.io/kubernetes v1.32.1
k8s.io/mount-utils v0.32.1
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
sigs.k8s.io/controller-runtime v0.19.4
sigs.k8s.io/yaml v1.4.0
)

require (
cel.dev/expr v0.18.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
Expand Down Expand Up @@ -121,7 +122,6 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/daviddengcn/go-colortext v1.0.0 // indirect
github.com/docker/cli v25.0.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
Expand All @@ -133,7 +133,7 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand All @@ -153,8 +153,8 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.20.1 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.22.0 // indirect
github.com/google/certificate-transparency-go v1.1.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand All @@ -163,7 +163,7 @@ require (
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -174,7 +174,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/intel/goresctrl v0.3.0 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
github.com/jonboulle/clockwork v0.3.0 // indirect
github.com/jonboulle/clockwork v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
Expand All @@ -195,8 +195,8 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/signal v0.7.0 // indirect
github.com/moby/sys/symlink v0.2.0 // indirect
Expand All @@ -209,8 +209,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.2.3 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/opencontainers/selinux v1.11.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -226,15 +225,15 @@ require (
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
Expand All @@ -254,13 +253,12 @@ require (
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/time v0.7.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
Expand All @@ -271,52 +269,52 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.31.5 // indirect
k8s.io/controller-manager v0.31.5 // indirect
k8s.io/apiserver v0.32.1 // indirect
k8s.io/controller-manager v0.32.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kms v0.31.5 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/metrics v0.31.5 // indirect
k8s.io/kms v0.32.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/metrics v0.32.1 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kustomize/v5 v5.4.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/kustomize/api v0.18.0 // indirect
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
)

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.31.5/go.mod#L227-L258
k8s.io/api => k8s.io/api v0.31.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.5
k8s.io/apimachinery => k8s.io/apimachinery v0.31.5
k8s.io/apiserver => k8s.io/apiserver v0.31.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.5
k8s.io/client-go => k8s.io/client-go v0.31.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.5
k8s.io/code-generator => k8s.io/code-generator v0.31.5
k8s.io/component-base => k8s.io/component-base v0.31.5
k8s.io/component-helpers => k8s.io/component-helpers v0.31.5
k8s.io/controller-manager => k8s.io/controller-manager v0.31.5
k8s.io/cri-api => k8s.io/cri-api v0.31.5
k8s.io/cri-client => k8s.io/cri-client v0.31.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.5
k8s.io/endpointslice => k8s.io/endpointslice v0.31.5
k8s.io/kms => k8s.io/kms v0.31.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.5
k8s.io/kubectl => k8s.io/kubectl v0.31.5
k8s.io/kubelet => k8s.io/kubelet v0.31.5
k8s.io/metrics => k8s.io/metrics v0.31.5
k8s.io/mount-utils => k8s.io/mount-utils v0.31.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.5
k8s.io/sample-controller => k8s.io/sample-controller v0.31.5
// https://github.com/kubernetes/kubernetes/blob/v1.32.1/go.mod#L225-L257
k8s.io/api => k8s.io/api v0.32.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
k8s.io/apiserver => k8s.io/apiserver v0.32.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1
k8s.io/client-go => k8s.io/client-go v0.32.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1
k8s.io/code-generator => k8s.io/code-generator v0.32.1
k8s.io/component-base => k8s.io/component-base v0.32.1
k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
k8s.io/controller-manager => k8s.io/controller-manager v0.32.1
k8s.io/cri-api => k8s.io/cri-api v0.32.1
k8s.io/cri-client => k8s.io/cri-client v0.32.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1
k8s.io/endpointslice => k8s.io/endpointslice v0.32.1
k8s.io/kms => k8s.io/kms v0.32.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1
k8s.io/kubectl => k8s.io/kubectl v0.32.1
k8s.io/kubelet => k8s.io/kubelet v0.32.1
k8s.io/metrics => k8s.io/metrics v0.32.1
k8s.io/mount-utils => k8s.io/mount-utils v0.32.1
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.1
k8s.io/sample-controller => k8s.io/sample-controller v0.32.1
)
Loading
Loading