Skip to content

Commit e00aed0

Browse files
committed
feat: update Kubernetes v1.36.0-alpha.1
Not updating Go modules yet, as there's a dependency conflict via fluxcd/pkg/ssa right now due to removed autoscaling API in k8s.io/api. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent f20445a commit e00aed0

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ INTEGRATION_TEST := integration-test
103103
INTEGRATION_TEST_DEFAULT_TARGET := $(INTEGRATION_TEST)-$(OPERATING_SYSTEM)
104104
INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
105105
# renovate: datasource=github-releases depName=kubernetes/kubernetes
106-
KUBECTL_VERSION ?= v1.35.0
106+
KUBECTL_VERSION ?= v1.36.0-alpha.1
107107
# renovate: datasource=github-releases depName=kastenhq/kubestr
108108
KUBESTR_VERSION ?= v0.4.49
109109
# renovate: datasource=github-releases depName=helm/helm

hack/release.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Linux: 6.18.9
2222
containerd: 2.2.1
2323
etcd: 3.6.8
2424
CoreDNS: 1.14.1
25-
Kubernetes: 1.35.0
25+
Kubernetes: 1.36.0-alpha.1
2626
Flannel CNI plugin: v1.9.0-flannel1
2727
Flannel: 0.28.1
2828
LVM2: 2_03_38

hack/test/e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export TALOS_VERSION
3333
# Kubernetes
3434

3535
export KUBECONFIG="${TMP}/kubeconfig"
36-
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.35.0}
36+
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.36.0-alpha.1}
3737

3838
export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
3939
export TIMEOUT=1200

pkg/machinery/constants/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ const (
363363

364364
// DefaultKubernetesVersion is the default target version of the control plane.
365365
// renovate: datasource=github-releases depName=kubernetes/kubernetes
366-
DefaultKubernetesVersion = "1.35.0"
366+
DefaultKubernetesVersion = "1.36.0-alpha.1"
367367

368368
// SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernesVersion going backwards.
369369
SupportedKubernetesVersions = 6

website/content/v1.13/reference/cli.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ talosctl cluster create dev [flags]
177177
--ipxe-boot-script string iPXE boot script (URL) to use
178178
--iso-path string the ISO path to use for the initial boot
179179
--kubeprism-port int KubePrism port (set to 0 to disable) (default 7445)
180-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
180+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
181181
--memory string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
182182
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
183183
--mtu int MTU of the cluster network (default 1500)
@@ -255,7 +255,7 @@ talosctl cluster create docker [flags]
255255
-h, --help help for docker
256256
--host-ip string Host IP to forward exposed ports to (default "0.0.0.0")
257257
--image string the talos image to run (default "ghcr.io/siderolabs/talos:latest")
258-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
258+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
259259
--memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
260260
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
261261
--mount mount attach a mount to the container (docker --mount syntax)
@@ -310,7 +310,7 @@ talosctl cluster create qemu [flags]
310310
--disks disks list of disks to create in format "<driver1>:<size1>" (disks after the first one are added only to worker machines) (default virtio:10GiB,virtio:6GiB)
311311
-h, --help help for qemu
312312
--image-factory-url string image factory url (default "https://factory.talos.dev/")
313-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
313+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
314314
--memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
315315
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
316316
--omni-api-endpoint string the Omni API endpoint (must include a scheme, a hostname and a join token, e.g. 'https://siderolink.omni.example?jointoken=foobar')
@@ -391,7 +391,7 @@ talosctl cluster create dev [flags]
391391
--ipxe-boot-script string iPXE boot script (URL) to use
392392
--iso-path string the ISO path to use for the initial boot
393393
--kubeprism-port int KubePrism port (set to 0 to disable) (default 7445)
394-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
394+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
395395
--memory string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
396396
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
397397
--mtu int MTU of the cluster network (default 1500)
@@ -469,7 +469,7 @@ talosctl cluster create docker [flags]
469469
-h, --help help for docker
470470
--host-ip string Host IP to forward exposed ports to (default "0.0.0.0")
471471
--image string the talos image to run (default "ghcr.io/siderolabs/talos:latest")
472-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
472+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
473473
--memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
474474
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
475475
--mount mount attach a mount to the container (docker --mount syntax)
@@ -524,7 +524,7 @@ talosctl cluster create qemu [flags]
524524
--disks disks list of disks to create in format "<driver1>:<size1>" (disks after the first one are added only to worker machines) (default virtio:10GiB,virtio:6GiB)
525525
-h, --help help for qemu
526526
--image-factory-url string image factory url (default "https://factory.talos.dev/")
527-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
527+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
528528
--memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB)
529529
--memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB)
530530
--omni-api-endpoint string the Omni API endpoint (must include a scheme, a hostname and a join token, e.g. 'https://siderolink.omni.example?jointoken=foobar')
@@ -1761,7 +1761,7 @@ talosctl gen config <cluster name> <cluster endpoint> [flags]
17611761
-h, --help help for config
17621762
--install-disk string the disk to install to (default "/dev/sda")
17631763
--install-image string the image used to perform an installation (default "ghcr.io/siderolabs/installer:latest")
1764-
--kubernetes-version string desired kubernetes version to run (default "1.35.0")
1764+
--kubernetes-version string desired kubernetes version to run (default "1.36.0-alpha.1")
17651765
-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
17661766
-t, --output-types strings types of outputs to be generated. valid types are: ["controlplane" "worker" "talosconfig"] (default [controlplane,worker,talosconfig])
17671767
--registry-mirror strings list of registry mirrors to use in format: <registry host>=<mirror URL>
@@ -2164,7 +2164,7 @@ talosctl image cache-create [flags]
21642164
### Examples
21652165

21662166
```
2167-
talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.35.0 --image-cache-path=/tmp/talos-image-cache
2167+
talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.36.0-alpha.1 --image-cache-path=/tmp/talos-image-cache
21682168
21692169
Alternatively, stdin can be piped to the command:
21702170
talosctl images default | talosctl images cache-create --image-cache-path=/tmp/talos-image-cache --images=-
@@ -2254,7 +2254,7 @@ talosctl image k8s-bundle [flags]
22542254
--etcd-version semver ETCD semantic version (default v3.6.8)
22552255
--flannel-version semver Flannel CNI semantic version (default v0.28.1)
22562256
-h, --help help for k8s-bundle
2257-
--k8s-version semver Kubernetes semantic version (default v1.35.0)
2257+
--k8s-version semver Kubernetes semantic version (default v1.36.0-alpha.1)
22582258
--kube-network-policies-version semver kube-network-policies semantic version (default v0.9.2)
22592259
```
22602260

@@ -3383,7 +3383,7 @@ talosctl upgrade-k8s [flags]
33833383
--scheduler-image string kube-scheduler image to use (default "registry.k8s.io/kube-scheduler")
33843384
--siderov1-keys-dir string The path to the SideroV1 auth PGP keys directory. Defaults to 'SIDEROV1_KEYS_DIR' env variable if set, otherwise '$HOME/.talos/keys'. Only valid for Contexts that use SideroV1 auth.
33853385
--talosconfig string The path to the Talos configuration file. Defaults to 'TALOSCONFIG' env variable if set, otherwise '$HOME/.talos/config' and '/var/run/secrets/talos.dev/config' in order.
3386-
--to string the Kubernetes control plane version to upgrade to (default "1.35.0")
3386+
--to string the Kubernetes control plane version to upgrade to (default "1.36.0-alpha.1")
33873387
--upgrade-kubelet upgrade kubelet service (default true)
33883388
--with-docs patch all machine configs adding the documentation for each field (default true)
33893389
--with-examples patch all machine configs with the commented examples (default true)

website/content/v1.13/reference/configuration/v1alpha1/config.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ controlPlane:
8383
{{< /highlight >}}</details> | |
8484
|`kubelet` |<a href="#Config.machine.kubelet">KubeletConfig</a> |Used to provide additional options to the kubelet. <details><summary>Show example(s)</summary>Kubelet definition example.:{{< highlight yaml >}}
8585
kubelet:
86-
image: ghcr.io/siderolabs/kubelet:v1.35.0 # The `image` field is an optional reference to an alternative kubelet image.
86+
image: ghcr.io/siderolabs/kubelet:v1.36.0-alpha.1 # The `image` field is an optional reference to an alternative kubelet image.
8787
# The `extraArgs` field is used to provide additional flags to the kubelet.
8888
extraArgs:
8989
feature-gates: ServerSideApply=true
@@ -305,7 +305,7 @@ KubeletConfig represents the kubelet config values.
305305
{{< highlight yaml >}}
306306
machine:
307307
kubelet:
308-
image: ghcr.io/siderolabs/kubelet:v1.35.0 # The `image` field is an optional reference to an alternative kubelet image.
308+
image: ghcr.io/siderolabs/kubelet:v1.36.0-alpha.1 # The `image` field is an optional reference to an alternative kubelet image.
309309
# The `extraArgs` field is used to provide additional flags to the kubelet.
310310
extraArgs:
311311
feature-gates: ServerSideApply=true
@@ -358,7 +358,7 @@ machine:
358358
| Field | Type | Description | Value(s) |
359359
|-------|------|-------------|----------|
360360
|`image` |string |The `image` field is an optional reference to an alternative kubelet image. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
361-
image: ghcr.io/siderolabs/kubelet:v1.35.0
361+
image: ghcr.io/siderolabs/kubelet:v1.36.0-alpha.1
362362
{{< /highlight >}}</details> | |
363363
|`clusterDNS` |[]string |The `ClusterDNS` field is an optional reference to an alternative kubelet clusterDNS ip list. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
364364
clusterDNS:
@@ -1032,7 +1032,7 @@ serviceAccount:
10321032
{{< /highlight >}}</details> | |
10331033
|`apiServer` |<a href="#Config.cluster.apiServer">APIServerConfig</a> |API server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
10341034
apiServer:
1035-
image: registry.k8s.io/kube-apiserver:v1.35.0 # The container image used in the API server manifest.
1035+
image: registry.k8s.io/kube-apiserver:v1.36.0-alpha.1 # The container image used in the API server manifest.
10361036
# Extra arguments to supply to the API server.
10371037
extraArgs:
10381038
feature-gates: ServerSideApply=true
@@ -1097,14 +1097,14 @@ apiServer:
10971097
{{< /highlight >}}</details> | |
10981098
|`controllerManager` |<a href="#Config.cluster.controllerManager">ControllerManagerConfig</a> |Controller manager server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
10991099
controllerManager:
1100-
image: registry.k8s.io/kube-controller-manager:v1.35.0 # The container image used in the controller manager manifest.
1100+
image: registry.k8s.io/kube-controller-manager:v1.36.0-alpha.1 # The container image used in the controller manager manifest.
11011101
# Extra arguments to supply to the controller manager.
11021102
extraArgs:
11031103
feature-gates: ServerSideApply=true
11041104
{{< /highlight >}}</details> | |
11051105
|`proxy` |<a href="#Config.cluster.proxy">ProxyConfig</a> |Kube-proxy server-specific configuration options <details><summary>Show example(s)</summary>{{< highlight yaml >}}
11061106
proxy:
1107-
image: registry.k8s.io/kube-proxy:v1.35.0 # The container image used in the kube-proxy manifest.
1107+
image: registry.k8s.io/kube-proxy:v1.36.0-alpha.1 # The container image used in the kube-proxy manifest.
11081108
mode: ipvs # proxy mode of kube-proxy.
11091109
# Extra arguments to supply to kube-proxy.
11101110
extraArgs:
@@ -1115,7 +1115,7 @@ proxy:
11151115
{{< /highlight >}}</details> | |
11161116
|`scheduler` |<a href="#Config.cluster.scheduler">SchedulerConfig</a> |Scheduler server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
11171117
scheduler:
1118-
image: registry.k8s.io/kube-scheduler:v1.35.0 # The container image used in the scheduler manifest.
1118+
image: registry.k8s.io/kube-scheduler:v1.36.0-alpha.1 # The container image used in the scheduler manifest.
11191119
# Extra arguments to supply to the scheduler.
11201120
extraArgs:
11211121
feature-gates: AllBeta=true
@@ -1360,7 +1360,7 @@ APIServerConfig represents the kube apiserver configuration options.
13601360
{{< highlight yaml >}}
13611361
cluster:
13621362
apiServer:
1363-
image: registry.k8s.io/kube-apiserver:v1.35.0 # The container image used in the API server manifest.
1363+
image: registry.k8s.io/kube-apiserver:v1.36.0-alpha.1 # The container image used in the API server manifest.
13641364
# Extra arguments to supply to the API server.
13651365
extraArgs:
13661366
feature-gates: ServerSideApply=true
@@ -1428,7 +1428,7 @@ cluster:
14281428
| Field | Type | Description | Value(s) |
14291429
|-------|------|-------------|----------|
14301430
|`image` |string |The container image used in the API server manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
1431-
image: registry.k8s.io/kube-apiserver:v1.35.0
1431+
image: registry.k8s.io/kube-apiserver:v1.36.0-alpha.1
14321432
{{< /highlight >}}</details> | |
14331433
|`extraArgs` |Args |Extra arguments to supply to the API server. | |
14341434
|`extraVolumes` |<a href="#Config.cluster.apiServer.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the API server static pod. | |
@@ -1639,7 +1639,7 @@ ControllerManagerConfig represents the kube controller manager configuration opt
16391639
{{< highlight yaml >}}
16401640
cluster:
16411641
controllerManager:
1642-
image: registry.k8s.io/kube-controller-manager:v1.35.0 # The container image used in the controller manager manifest.
1642+
image: registry.k8s.io/kube-controller-manager:v1.36.0-alpha.1 # The container image used in the controller manager manifest.
16431643
# Extra arguments to supply to the controller manager.
16441644
extraArgs:
16451645
feature-gates: ServerSideApply=true
@@ -1649,7 +1649,7 @@ cluster:
16491649
| Field | Type | Description | Value(s) |
16501650
|-------|------|-------------|----------|
16511651
|`image` |string |The container image used in the controller manager manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
1652-
image: registry.k8s.io/kube-controller-manager:v1.35.0
1652+
image: registry.k8s.io/kube-controller-manager:v1.36.0-alpha.1
16531653
{{< /highlight >}}</details> | |
16541654
|`extraArgs` |Args |Extra arguments to supply to the controller manager. | |
16551655
|`extraVolumes` |<a href="#Config.cluster.controllerManager.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the controller manager static pod. | |
@@ -1719,7 +1719,7 @@ ProxyConfig represents the kube proxy configuration options.
17191719
{{< highlight yaml >}}
17201720
cluster:
17211721
proxy:
1722-
image: registry.k8s.io/kube-proxy:v1.35.0 # The container image used in the kube-proxy manifest.
1722+
image: registry.k8s.io/kube-proxy:v1.36.0-alpha.1 # The container image used in the kube-proxy manifest.
17231723
mode: ipvs # proxy mode of kube-proxy.
17241724
# Extra arguments to supply to kube-proxy.
17251725
extraArgs:
@@ -1736,7 +1736,7 @@ cluster:
17361736
disabled: false
17371737
{{< /highlight >}}</details> | |
17381738
|`image` |string |The container image used in the kube-proxy manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
1739-
image: registry.k8s.io/kube-proxy:v1.35.0
1739+
image: registry.k8s.io/kube-proxy:v1.36.0-alpha.1
17401740
{{< /highlight >}}</details> | |
17411741
|`mode` |string |proxy mode of kube-proxy.<br>The default is 'iptables'. | |
17421742
|`extraArgs` |Args |Extra arguments to supply to kube-proxy. | |
@@ -1755,7 +1755,7 @@ SchedulerConfig represents the kube scheduler configuration options.
17551755
{{< highlight yaml >}}
17561756
cluster:
17571757
scheduler:
1758-
image: registry.k8s.io/kube-scheduler:v1.35.0 # The container image used in the scheduler manifest.
1758+
image: registry.k8s.io/kube-scheduler:v1.36.0-alpha.1 # The container image used in the scheduler manifest.
17591759
# Extra arguments to supply to the scheduler.
17601760
extraArgs:
17611761
feature-gates: AllBeta=true
@@ -1765,7 +1765,7 @@ cluster:
17651765
| Field | Type | Description | Value(s) |
17661766
|-------|------|-------------|----------|
17671767
|`image` |string |The container image used in the scheduler manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
1768-
image: registry.k8s.io/kube-scheduler:v1.35.0
1768+
image: registry.k8s.io/kube-scheduler:v1.36.0-alpha.1
17691769
{{< /highlight >}}</details> | |
17701770
|`extraArgs` |Args |Extra arguments to supply to the scheduler. | |
17711771
|`extraVolumes` |<a href="#Config.cluster.scheduler.extraVolumes.">[]VolumeMountConfig</a> |Extra volumes to mount to the scheduler static pod. | |

0 commit comments

Comments
 (0)