From 401b62adedcc3e9d110782d58091038b60f28ebf Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 10 Apr 2025 17:44:33 +0400 Subject: [PATCH] feat: update Kubernetes to v1.33.0-rc.0 Go modules haven't been tagged, see https://github.com/kubernetes/kubernetes/issues/131244. Signed-off-by: Andrey Smirnov --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 +-- hack/release.toml | 2 +- hack/test/e2e.sh | 2 +- pkg/machinery/constants/constants.go | 2 +- website/content/v1.10/reference/cli.md | 8 ++--- .../configuration/v1alpha1/config.md | 30 +++++++++---------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index dd3be7aef..a8fc7d41f 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ INTEGRATION_TEST := integration-test INTEGRATION_TEST_DEFAULT_TARGET := $(INTEGRATION_TEST)-$(OPERATING_SYSTEM) INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM) # renovate: datasource=github-releases depName=kubernetes/kubernetes -KUBECTL_VERSION ?= v1.33.0-beta.0 +KUBECTL_VERSION ?= v1.33.0-rc.0 # renovate: datasource=github-releases depName=kastenhq/kubestr KUBESTR_VERSION ?= v0.4.48 # renovate: datasource=github-releases depName=helm/helm diff --git a/go.mod b/go.mod index f0c06a1f5..cc9d9e8e6 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,7 @@ require ( github.com/siderolabs/go-debug v0.5.0 github.com/siderolabs/go-kmsg v0.1.4 github.com/siderolabs/go-kubeconfig v0.1.1 - github.com/siderolabs/go-kubernetes v0.2.20 + github.com/siderolabs/go-kubernetes v0.2.21 github.com/siderolabs/go-loadbalancer v0.4.0 github.com/siderolabs/go-pcidb v0.3.0 github.com/siderolabs/go-pointer v1.0.1 diff --git a/go.sum b/go.sum index 365a3285b..7f61cfc66 100644 --- a/go.sum +++ b/go.sum @@ -647,8 +647,8 @@ github.com/siderolabs/go-kmsg v0.1.4 h1:RLAa90O9bWuhA3pXPAYAdrI+kzcqTshZASRA5yso github.com/siderolabs/go-kmsg v0.1.4/go.mod h1:BLkt2N2DHT0wsFMz32lMw6vNEZL90c8ZnBjpIUoBb/M= github.com/siderolabs/go-kubeconfig v0.1.1 h1:tZlgpelj/OqrcHVUwISPN0NRgObcflpH9WtE41mtQZ0= github.com/siderolabs/go-kubeconfig v0.1.1/go.mod h1:QaGp4i9L95oDbcU7jDn30aw4gnREkb3O5otgxw8imOk= -github.com/siderolabs/go-kubernetes v0.2.20 h1:L00ci5un0QN1hjn37a5o+usXrw/Hem7AzEoQgIADeJQ= -github.com/siderolabs/go-kubernetes v0.2.20/go.mod h1:3qZzReVZV7e+r0DZC2cE6bBQse+CoC7SGL+EavA52G8= +github.com/siderolabs/go-kubernetes v0.2.21 h1:+gHiyTyVz5oZy6cIVtqKbIWtAH/ejnQ7Yg9hZLG32WI= +github.com/siderolabs/go-kubernetes v0.2.21/go.mod h1:3qZzReVZV7e+r0DZC2cE6bBQse+CoC7SGL+EavA52G8= github.com/siderolabs/go-loadbalancer v0.4.0 h1:nqZC4x1yZAFAtkb7eu5T1IoPaMDKu5jgQQGkk6rZa9s= github.com/siderolabs/go-loadbalancer v0.4.0/go.mod h1:tRVouZ9i2R/TRbNUF9MqyBlV2wsjX0cxkYTjPXcI9P0= github.com/siderolabs/go-pcidb v0.3.0 h1:jR4w1YLNY8Cv1o5jnoQ2Q+pbxcosO2FVFrAAp1RURnw= diff --git a/hack/release.toml b/hack/release.toml index f9245df76..c61b3380d 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -24,7 +24,7 @@ preface = """ * containerd: 2.0.4 * etcd: 3.5.20 * Flannel: 0.26.6 -* Kubernetes: 1.33.0-beta.0 +* Kubernetes: 1.33.0-rc.0 Talos is built with Go 1.24.2. """ diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index f057aee24..cfbb7ef0a 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -33,7 +33,7 @@ export TALOS_VERSION # Kubernetes export KUBECONFIG="${TMP}/kubeconfig" -export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.33.0-beta.0} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.33.0-rc.0} export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}" export TIMEOUT=1200 diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index d7ddc0800..094f0217f 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -389,7 +389,7 @@ const ( // DefaultKubernetesVersion is the default target version of the control plane. // renovate: datasource=github-releases depName=kubernetes/kubernetes - DefaultKubernetesVersion = "1.33.0-beta.0" + DefaultKubernetesVersion = "1.33.0-rc.0" // SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernesVersion going backwards. SupportedKubernetesVersions = 6 diff --git a/website/content/v1.10/reference/cli.md b/website/content/v1.10/reference/cli.md index c094db1bf..a7c7c36df 100644 --- a/website/content/v1.10/reference/cli.md +++ b/website/content/v1.10/reference/cli.md @@ -185,7 +185,7 @@ talosctl cluster create [flags] --ipxe-boot-script string iPXE boot script (URL) to use --iso-path string the ISO path to use for the initial boot (VM only) --kubeprism-port int KubePrism port (set to 0 to disable) (default 7445) - --kubernetes-version string desired kubernetes version to run (default "1.33.0-beta.0") + --kubernetes-version string desired kubernetes version to run (default "1.33.0-rc.0") --memory int the limit on memory usage in MB (each control plane/VM) (default 2048) --memory-workers int the limit on memory usage in MB (each worker/VM) (default 2048) --mount mount attach a mount to the container (Docker only) @@ -1362,7 +1362,7 @@ talosctl gen config [flags] -h, --help help for config --install-disk string the disk to install to (default "/dev/sda") --install-image string the image used to perform an installation (default "ghcr.io/siderolabs/installer:latest") - --kubernetes-version string desired kubernetes version to run (default "1.33.0-beta.0") + --kubernetes-version string desired kubernetes version to run (default "1.33.0-rc.0") -o, --output string destination to output generated files. when multiple output types are specified, it must be a directory. for a single output type, it must either be a file path, or "-" for stdout -t, --output-types strings types of outputs to be generated. valid types are: ["controlplane" "worker" "talosconfig"] (default [controlplane,worker,talosconfig]) -p, --persist the desired persist value for configs (default true) @@ -1795,7 +1795,7 @@ talosctl image cache-create [flags] ### Examples ``` -talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.33.0-beta.0 --image-cache-path=/tmp/talos-image-cache +talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.33.0-rc.0 --image-cache-path=/tmp/talos-image-cache Alternatively, stdin can be piped to the command: talosctl images default | talosctl images cache-create --image-cache-path=/tmp/talos-image-cache --images=- @@ -3027,7 +3027,7 @@ talosctl upgrade-k8s [flags] --pre-pull-images pre-pull images before upgrade (default true) --proxy-image string kube-proxy image to use (default "registry.k8s.io/kube-proxy") --scheduler-image string kube-scheduler image to use (default "registry.k8s.io/kube-scheduler") - --to string the Kubernetes control plane version to upgrade to (default "1.33.0-beta.0") + --to string the Kubernetes control plane version to upgrade to (default "1.33.0-rc.0") --upgrade-kubelet upgrade kubelet service (default true) --with-docs patch all machine configs adding the documentation for each field (default true) --with-examples patch all machine configs with the commented examples (default true) diff --git a/website/content/v1.10/reference/configuration/v1alpha1/config.md b/website/content/v1.10/reference/configuration/v1alpha1/config.md index f92981789..29996612a 100644 --- a/website/content/v1.10/reference/configuration/v1alpha1/config.md +++ b/website/content/v1.10/reference/configuration/v1alpha1/config.md @@ -86,7 +86,7 @@ controlPlane: {{< /highlight >}} | | |`kubelet` |KubeletConfig |Used to provide additional options to the kubelet.
Show example(s){{< highlight yaml >}} kubelet: - image: ghcr.io/siderolabs/kubelet:v1.33.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.33.0-rc.0 # The `image` field is an optional reference to an alternative kubelet image. # The `extraArgs` field is used to provide additional flags to the kubelet. extraArgs: feature-gates: ServerSideApply=true @@ -511,7 +511,7 @@ KubeletConfig represents the kubelet config values. {{< highlight yaml >}} machine: kubelet: - image: ghcr.io/siderolabs/kubelet:v1.33.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.33.0-rc.0 # The `image` field is an optional reference to an alternative kubelet image. # The `extraArgs` field is used to provide additional flags to the kubelet. extraArgs: feature-gates: ServerSideApply=true @@ -564,7 +564,7 @@ machine: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The `image` field is an optional reference to an alternative kubelet image.
Show example(s){{< highlight yaml >}} -image: ghcr.io/siderolabs/kubelet:v1.33.0-beta.0 +image: ghcr.io/siderolabs/kubelet:v1.33.0-rc.0 {{< /highlight >}}
| | |`clusterDNS` |[]string |The `ClusterDNS` field is an optional reference to an alternative kubelet clusterDNS ip list.
Show example(s){{< highlight yaml >}} clusterDNS: @@ -2959,7 +2959,7 @@ serviceAccount: {{< /highlight >}}
| | |`apiServer` |APIServerConfig |API server specific configuration options.
Show example(s){{< highlight yaml >}} apiServer: - image: registry.k8s.io/kube-apiserver:v1.33.0-beta.0 # The container image used in the API server manifest. + image: registry.k8s.io/kube-apiserver:v1.33.0-rc.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -3024,14 +3024,14 @@ apiServer: {{< /highlight >}}
| | |`controllerManager` |ControllerManagerConfig |Controller manager server specific configuration options.
Show example(s){{< highlight yaml >}} controllerManager: - image: registry.k8s.io/kube-controller-manager:v1.33.0-beta.0 # The container image used in the controller manager manifest. + image: registry.k8s.io/kube-controller-manager:v1.33.0-rc.0 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true {{< /highlight >}}
| | |`proxy` |ProxyConfig |Kube-proxy server-specific configuration options
Show example(s){{< highlight yaml >}} proxy: - image: registry.k8s.io/kube-proxy:v1.33.0-beta.0 # The container image used in the kube-proxy manifest. + image: registry.k8s.io/kube-proxy:v1.33.0-rc.0 # The container image used in the kube-proxy manifest. mode: ipvs # proxy mode of kube-proxy. # Extra arguments to supply to kube-proxy. extraArgs: @@ -3042,7 +3042,7 @@ proxy: {{< /highlight >}}
| | |`scheduler` |SchedulerConfig |Scheduler server specific configuration options.
Show example(s){{< highlight yaml >}} scheduler: - image: registry.k8s.io/kube-scheduler:v1.33.0-beta.0 # The container image used in the scheduler manifest. + image: registry.k8s.io/kube-scheduler:v1.33.0-rc.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -3286,7 +3286,7 @@ APIServerConfig represents the kube apiserver configuration options. {{< highlight yaml >}} cluster: apiServer: - image: registry.k8s.io/kube-apiserver:v1.33.0-beta.0 # The container image used in the API server manifest. + image: registry.k8s.io/kube-apiserver:v1.33.0-rc.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -3354,7 +3354,7 @@ cluster: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the API server manifest.
Show example(s){{< highlight yaml >}} -image: registry.k8s.io/kube-apiserver:v1.33.0-beta.0 +image: registry.k8s.io/kube-apiserver:v1.33.0-rc.0 {{< /highlight >}}
| | |`extraArgs` |map[string]string |Extra arguments to supply to the API server. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the API server static pod. | | @@ -3566,7 +3566,7 @@ ControllerManagerConfig represents the kube controller manager configuration opt {{< highlight yaml >}} cluster: controllerManager: - image: registry.k8s.io/kube-controller-manager:v1.33.0-beta.0 # The container image used in the controller manager manifest. + image: registry.k8s.io/kube-controller-manager:v1.33.0-rc.0 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -3576,7 +3576,7 @@ cluster: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the controller manager manifest.
Show example(s){{< highlight yaml >}} -image: registry.k8s.io/kube-controller-manager:v1.33.0-beta.0 +image: registry.k8s.io/kube-controller-manager:v1.33.0-rc.0 {{< /highlight >}}
| | |`extraArgs` |map[string]string |Extra arguments to supply to the controller manager. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the controller manager static pod. | | @@ -3646,7 +3646,7 @@ ProxyConfig represents the kube proxy configuration options. {{< highlight yaml >}} cluster: proxy: - image: registry.k8s.io/kube-proxy:v1.33.0-beta.0 # The container image used in the kube-proxy manifest. + image: registry.k8s.io/kube-proxy:v1.33.0-rc.0 # The container image used in the kube-proxy manifest. mode: ipvs # proxy mode of kube-proxy. # Extra arguments to supply to kube-proxy. extraArgs: @@ -3663,7 +3663,7 @@ cluster: disabled: false {{< /highlight >}}
| | |`image` |string |The container image used in the kube-proxy manifest.
Show example(s){{< highlight yaml >}} -image: registry.k8s.io/kube-proxy:v1.33.0-beta.0 +image: registry.k8s.io/kube-proxy:v1.33.0-rc.0 {{< /highlight >}}
| | |`mode` |string |
proxy mode of kube-proxy.The default is 'iptables'.
| | |`extraArgs` |map[string]string |Extra arguments to supply to kube-proxy. | | @@ -3682,7 +3682,7 @@ SchedulerConfig represents the kube scheduler configuration options. {{< highlight yaml >}} cluster: scheduler: - image: registry.k8s.io/kube-scheduler:v1.33.0-beta.0 # The container image used in the scheduler manifest. + image: registry.k8s.io/kube-scheduler:v1.33.0-rc.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -3692,7 +3692,7 @@ cluster: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the scheduler manifest.
Show example(s){{< highlight yaml >}} -image: registry.k8s.io/kube-scheduler:v1.33.0-beta.0 +image: registry.k8s.io/kube-scheduler:v1.33.0-rc.0 {{< /highlight >}}
| | |`extraArgs` |map[string]string |Extra arguments to supply to the scheduler. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the scheduler static pod. | |