Skip to content

Commit

Permalink
feat: update Kubernetes to v1.29.0
Browse files Browse the repository at this point in the history
See https://github.com/kubernetes/kubernetes/releases/v1.29.0

Signed-off-by: Andrey Smirnov <[email protected]>
(cherry picked from commit 9a185a3)
  • Loading branch information
smira committed Dec 14, 2023
1 parent 61e6df1 commit 333c462
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)
MODULE_SIG_VERIFY_DEFAULT_TARGET := module-sig-verify-$(OPERATING_SYSTEM)
INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
# renovate: datasource=github-releases depName=kubernetes/kubernetes
KUBECTL_VERSION ?= v1.29.0-rc.2
KUBECTL_VERSION ?= v1.29.0
# renovate: datasource=github-releases depName=kastenhq/kubestr
KUBESTR_VERSION ?= v0.4.41
# renovate: datasource=github-releases depName=helm/helm
Expand Down
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ replace (

// Kubernetes dependencies sharing the same version.
require (
k8s.io/api v0.29.0-rc.1
k8s.io/apimachinery v0.29.0-rc.1
k8s.io/apiserver v0.29.0-rc.1
k8s.io/client-go v0.29.0-rc.1
k8s.io/component-base v0.29.0-rc.1
k8s.io/cri-api v0.29.0-rc.1
k8s.io/kube-scheduler v0.29.0-rc.1
k8s.io/kubectl v0.29.0-rc.1
k8s.io/kubelet v0.29.0-rc.1
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/apiserver v0.29.0
k8s.io/client-go v0.29.0
k8s.io/component-base v0.29.0
k8s.io/cri-api v0.29.0
k8s.io/kube-scheduler v0.29.0
k8s.io/kubectl v0.29.0
k8s.io/kubelet v0.29.0
)

require (
Expand Down Expand Up @@ -323,7 +323,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/cli-runtime v0.29.0-rc.1 // indirect
k8s.io/cli-runtime v0.29.0 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
Expand Down
40 changes: 20 additions & 20 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1240,32 +1240,32 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.29.0-rc.1 h1:dsv3X3/+3Fgwnaqw53Pa4sV8S9kQX7pXb+/lPXPiBFo=
k8s.io/api v0.29.0-rc.1/go.mod h1:BX6ZTejt0Sa30eXx46r9LPXKgsJWX2vlbNTu8QfOkCQ=
k8s.io/apimachinery v0.29.0-rc.1 h1:ReoN5k+8AEn2sj8//kcWsPbCH0dmY0Axy34XNJz7CsA=
k8s.io/apimachinery v0.29.0-rc.1/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
k8s.io/apiserver v0.29.0-rc.1 h1:5w+V5PxqZTCnk43Io9wiODMHCJvujPbrBNfvZxvrnbc=
k8s.io/apiserver v0.29.0-rc.1/go.mod h1:m+p0MCsTaH6s+lH6yC+zyzTFV6pKmJpfWogbj05CSI8=
k8s.io/cli-runtime v0.29.0-rc.1 h1:FDpo4x/OD0+1OmGjCZ2ZrAEvv7qRVhfy2gE4shRjISE=
k8s.io/cli-runtime v0.29.0-rc.1/go.mod h1:SnKOqYUpxCLiQS2rfLaD9fRDbqh6UMuMjdTkUYu8dck=
k8s.io/client-go v0.29.0-rc.1 h1:CsiZED5XzximZzU/vB0ph3wQ4kJWsZGaDX1V9LSbTdw=
k8s.io/client-go v0.29.0-rc.1/go.mod h1:PyVpVRI/sTHNqVnztGOu52YAPiBn6OqTjlumG5D3sZM=
k8s.io/component-base v0.29.0-rc.1 h1:YNXLyyB7x0lGqclAXmUbREnRiESVFPJrX0Nqz0+XHKw=
k8s.io/component-base v0.29.0-rc.1/go.mod h1:BxIwavzsdJarfgTSRgaQa7IbepGVNdFSiEsLGUaH4QA=
k8s.io/cri-api v0.29.0-rc.1 h1:rXWsKBa6K7yId/OvYya6RF4e9Gxf8qqPnsxl0ZKxcZE=
k8s.io/cri-api v0.29.0-rc.1/go.mod h1:Rls2JoVwfC7kW3tndm7267kriuRukQ02qfht0PCRuIc=
k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A=
k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o=
k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
k8s.io/cli-runtime v0.29.0 h1:q2kC3cex4rOBLfPOnMSzV2BIrrQlx97gxHJs21KxKS4=
k8s.io/cli-runtime v0.29.0/go.mod h1:VKudXp3X7wR45L+nER85YUzOQIru28HQpXr0mTdeCrk=
k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s=
k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M=
k8s.io/cri-api v0.29.0 h1:atenAqOltRsFqcCQlFFpDnl/R4aGfOELoNLTDJfd7t8=
k8s.io/cri-api v0.29.0/go.mod h1:Rls2JoVwfC7kW3tndm7267kriuRukQ02qfht0PCRuIc=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/kube-scheduler v0.29.0-rc.1 h1:EfV72elViZVR9QERy4BpmUMe8ZuuIFbo1KD6Dm7uuGM=
k8s.io/kube-scheduler v0.29.0-rc.1/go.mod h1:oYd81aKZtpv64py5w3Z9/xLuKMWwoPRMOUt40ZPCSvk=
k8s.io/kubectl v0.29.0-rc.1 h1:BucAqAyKpSm3IfiID3w+LWl58PsTGDtRzRK5YPOSX/A=
k8s.io/kubectl v0.29.0-rc.1/go.mod h1:zMUO3fCHNpycjcmeTtmmIr/ti26mT3/ae4JXFyBtOB4=
k8s.io/kubelet v0.29.0-rc.1 h1:rldFkIu/GeaGeXRWfCxQdup71lOTgsRUm4W/PWZb4Pc=
k8s.io/kubelet v0.29.0-rc.1/go.mod h1:bBgiInXXwlh6Ami47SmrJoUWM8FB2yw4G0Y4CC2kZWA=
k8s.io/kube-scheduler v0.29.0 h1:n4v68EvxYhy7o5Q/LFPgqBEGi7lKoiAxwQ0gQyMoj9M=
k8s.io/kube-scheduler v0.29.0/go.mod h1:mJMGpqS+aC6/Qf6SDpaqvM6/kLENHN5U7SACSdrZV7o=
k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
k8s.io/kubelet v0.29.0 h1:SX5hlznTBcGIrS1scaf8r8p6m3e475KMifwt9i12iOk=
k8s.io/kubelet v0.29.0/go.mod h1:kvKS2+Bz2tgDOG1S1q0TH2z1DasNuVF+8p6Aw7xvKkI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.69 h1:N0m3tKYbkRMmDobh/47ngz+AWeV7PcfXMDi8xu3Vrag=
Expand Down
2 changes: 1 addition & 1 deletion hack/test/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export TALOS_VERSION=v1.1
# Kubernetes

export KUBECONFIG="${TMP}/kubeconfig"
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.29.0-rc.2}
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.29.0}

export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
export TIMEOUT=1200
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ const (

// DefaultKubernetesVersion is the default target version of the control plane.
// renovate: datasource=github-releases depName=kubernetes/kubernetes
DefaultKubernetesVersion = "1.29.0-rc.2"
DefaultKubernetesVersion = "1.29.0"

// SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernesVersion going backwards.
SupportedKubernetesVersions = 6
Expand Down
6 changes: 3 additions & 3 deletions website/content/v1.6/reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ talosctl cluster create [flags]
--ipv6 enable IPv6 network in the cluster (QEMU provisioner only)
--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.29.0-rc.2")
--kubernetes-version string desired kubernetes version to run (default "1.29.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)
--mtu int MTU of the cluster network (default 1500)
Expand Down Expand Up @@ -1330,7 +1330,7 @@ talosctl gen config <cluster name> <cluster endpoint> [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.29.0-rc.2")
--kubernetes-version string desired kubernetes version to run (default "1.29.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)
Expand Down Expand Up @@ -2891,7 +2891,7 @@ talosctl upgrade-k8s [flags]
--from string the Kubernetes control plane version to upgrade from
-h, --help help for upgrade-k8s
--pre-pull-images pre-pull images before upgrade (default true)
--to string the Kubernetes control plane version to upgrade to (default "1.29.0-rc.2")
--to string the Kubernetes control plane version to upgrade to (default "1.29.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)
Expand Down
30 changes: 15 additions & 15 deletions website/content/v1.6/reference/configuration/v1alpha1/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ controlPlane:
{{< /highlight >}}</details> | |
|`kubelet` |<a href="#Config.machine.kubelet">KubeletConfig</a> |Used to provide additional options to the kubelet. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
kubelet:
image: ghcr.io/siderolabs/kubelet:v1.29.0-rc.2 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/siderolabs/kubelet:v1.29.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
Expand Down Expand Up @@ -498,7 +498,7 @@ KubeletConfig represents the kubelet config values.
{{< highlight yaml >}}
machine:
kubelet:
image: ghcr.io/siderolabs/kubelet:v1.29.0-rc.2 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/siderolabs/kubelet:v1.29.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
Expand Down Expand Up @@ -551,7 +551,7 @@ machine:
| Field | Type | Description | Value(s) |
|-------|------|-------------|----------|
|`image` |string |The `image` field is an optional reference to an alternative kubelet image. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: ghcr.io/siderolabs/kubelet:v1.29.0-rc.2
image: ghcr.io/siderolabs/kubelet:v1.29.0
{{< /highlight >}}</details> | |
|`clusterDNS` |[]string |The `ClusterDNS` field is an optional reference to an alternative kubelet clusterDNS ip list. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
clusterDNS:
Expand Down Expand Up @@ -2859,7 +2859,7 @@ serviceAccount:
{{< /highlight >}}</details> | |
|`apiServer` |<a href="#Config.cluster.apiServer">APIServerConfig</a> |API server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
apiServer:
image: registry.k8s.io/kube-apiserver:v1.29.0-rc.2 # The container image used in the API server manifest.
image: registry.k8s.io/kube-apiserver:v1.29.0 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
feature-gates: ServerSideApply=true
Expand Down Expand Up @@ -2898,14 +2898,14 @@ apiServer:
{{< /highlight >}}</details> | |
|`controllerManager` |<a href="#Config.cluster.controllerManager">ControllerManagerConfig</a> |Controller manager server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
controllerManager:
image: registry.k8s.io/kube-controller-manager:v1.29.0-rc.2 # The container image used in the controller manager manifest.
image: registry.k8s.io/kube-controller-manager:v1.29.0 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
feature-gates: ServerSideApply=true
{{< /highlight >}}</details> | |
|`proxy` |<a href="#Config.cluster.proxy">ProxyConfig</a> |Kube-proxy server-specific configuration options <details><summary>Show example(s)</summary>{{< highlight yaml >}}
proxy:
image: registry.k8s.io/kube-proxy:v1.29.0-rc.2 # The container image used in the kube-proxy manifest.
image: registry.k8s.io/kube-proxy:v1.29.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:
Expand All @@ -2916,7 +2916,7 @@ proxy:
{{< /highlight >}}</details> | |
|`scheduler` |<a href="#Config.cluster.scheduler">SchedulerConfig</a> |Scheduler server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
scheduler:
image: registry.k8s.io/kube-scheduler:v1.29.0-rc.2 # The container image used in the scheduler manifest.
image: registry.k8s.io/kube-scheduler:v1.29.0 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
feature-gates: AllBeta=true
Expand Down Expand Up @@ -3160,7 +3160,7 @@ APIServerConfig represents the kube apiserver configuration options.
{{< highlight yaml >}}
cluster:
apiServer:
image: registry.k8s.io/kube-apiserver:v1.29.0-rc.2 # The container image used in the API server manifest.
image: registry.k8s.io/kube-apiserver:v1.29.0 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
feature-gates: ServerSideApply=true
Expand Down Expand Up @@ -3202,7 +3202,7 @@ cluster:
| Field | Type | Description | Value(s) |
|-------|------|-------------|----------|
|`image` |string |The container image used in the API server manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: registry.k8s.io/kube-apiserver:v1.29.0-rc.2
image: registry.k8s.io/kube-apiserver:v1.29.0
{{< /highlight >}}</details> | |
|`extraArgs` |map[string]string |Extra arguments to supply to the API server. | |
|`extraVolumes` |<a href="#Config.cluster.apiServer.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the API server static pod. | |
Expand Down Expand Up @@ -3341,7 +3341,7 @@ ControllerManagerConfig represents the kube controller manager configuration opt
{{< highlight yaml >}}
cluster:
controllerManager:
image: registry.k8s.io/kube-controller-manager:v1.29.0-rc.2 # The container image used in the controller manager manifest.
image: registry.k8s.io/kube-controller-manager:v1.29.0 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
feature-gates: ServerSideApply=true
Expand All @@ -3351,7 +3351,7 @@ cluster:
| Field | Type | Description | Value(s) |
|-------|------|-------------|----------|
|`image` |string |The container image used in the controller manager manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: registry.k8s.io/kube-controller-manager:v1.29.0-rc.2
image: registry.k8s.io/kube-controller-manager:v1.29.0
{{< /highlight >}}</details> | |
|`extraArgs` |map[string]string |Extra arguments to supply to the controller manager. | |
|`extraVolumes` |<a href="#Config.cluster.controllerManager.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the controller manager static pod. | |
Expand Down Expand Up @@ -3421,7 +3421,7 @@ ProxyConfig represents the kube proxy configuration options.
{{< highlight yaml >}}
cluster:
proxy:
image: registry.k8s.io/kube-proxy:v1.29.0-rc.2 # The container image used in the kube-proxy manifest.
image: registry.k8s.io/kube-proxy:v1.29.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:
Expand All @@ -3438,7 +3438,7 @@ cluster:
disabled: false
{{< /highlight >}}</details> | |
|`image` |string |The container image used in the kube-proxy manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: registry.k8s.io/kube-proxy:v1.29.0-rc.2
image: registry.k8s.io/kube-proxy:v1.29.0
{{< /highlight >}}</details> | |
|`mode` |string |<details><summary>proxy mode of kube-proxy.</summary>The default is 'iptables'.</details> | |
|`extraArgs` |map[string]string |Extra arguments to supply to kube-proxy. | |
Expand All @@ -3457,7 +3457,7 @@ SchedulerConfig represents the kube scheduler configuration options.
{{< highlight yaml >}}
cluster:
scheduler:
image: registry.k8s.io/kube-scheduler:v1.29.0-rc.2 # The container image used in the scheduler manifest.
image: registry.k8s.io/kube-scheduler:v1.29.0 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
feature-gates: AllBeta=true
Expand All @@ -3467,7 +3467,7 @@ cluster:
| Field | Type | Description | Value(s) |
|-------|------|-------------|----------|
|`image` |string |The container image used in the scheduler manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: registry.k8s.io/kube-scheduler:v1.29.0-rc.2
image: registry.k8s.io/kube-scheduler:v1.29.0
{{< /highlight >}}</details> | |
|`extraArgs` |map[string]string |Extra arguments to supply to the scheduler. | |
|`extraVolumes` |<a href="#Config.cluster.scheduler.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the scheduler static pod. | |
Expand Down

0 comments on commit 333c462

Please sign in to comment.