diff --git a/Makefile b/Makefile index 699189764..99ecb0bc2 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,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.36.0-rc.1 +KUBECTL_VERSION ?= v1.36.0 # renovate: datasource=github-releases depName=kastenhq/kubestr KUBESTR_VERSION ?= v0.4.49 # renovate: datasource=github-releases depName=helm/helm diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index fc2b397c8..74f514f60 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.36.0-rc.1} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.36.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 1e7d17f9d..38588c82f 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -363,9 +363,9 @@ const ( // DefaultKubernetesVersion is the default target version of the control plane. // renovate: datasource=github-releases depName=kubernetes/kubernetes - DefaultKubernetesVersion = "1.36.0-rc.1" + DefaultKubernetesVersion = "1.36.0" - // SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernesVersion going backwards. + // SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernetesVersion going backwards. SupportedKubernetesVersions = 6 // DefaultControlPlanePort is the default port to use for the control plane. diff --git a/website/content/v1.13/reference/cli.md b/website/content/v1.13/reference/cli.md index d5fa5c47f..ce30ab374 100644 --- a/website/content/v1.13/reference/cli.md +++ b/website/content/v1.13/reference/cli.md @@ -177,7 +177,7 @@ talosctl cluster create dev [flags] --ipxe-boot-script string iPXE boot script (URL) to use --iso-path string the ISO path to use for the initial boot --kubeprism-port int KubePrism port (set to 0 to disable) (default 7445) - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --mtu int MTU of the cluster network (default 1500) @@ -255,7 +255,7 @@ talosctl cluster create docker [flags] -h, --help help for docker --host-ip string Host IP to forward exposed ports to (default "0.0.0.0") --image string the talos image to run (default "ghcr.io/siderolabs/talos:latest") - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --mount mount attach a mount to the container (docker --mount syntax) @@ -310,7 +310,7 @@ talosctl cluster create qemu [flags] --disks disks list of disks to create in format ":" (disks after the first one are added only to worker machines) (default virtio:10GiB,virtio:6GiB) -h, --help help for qemu --image-factory-url string image factory url (default "https://factory.talos.dev/") - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --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] --ipxe-boot-script string iPXE boot script (URL) to use --iso-path string the ISO path to use for the initial boot --kubeprism-port int KubePrism port (set to 0 to disable) (default 7445) - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --mtu int MTU of the cluster network (default 1500) @@ -469,7 +469,7 @@ talosctl cluster create docker [flags] -h, --help help for docker --host-ip string Host IP to forward exposed ports to (default "0.0.0.0") --image string the talos image to run (default "ghcr.io/siderolabs/talos:latest") - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --mount mount attach a mount to the container (docker --mount syntax) @@ -524,7 +524,7 @@ talosctl cluster create qemu [flags] --disks disks list of disks to create in format ":" (disks after the first one are added only to worker machines) (default virtio:10GiB,virtio:6GiB) -h, --help help for qemu --image-factory-url string image factory url (default "https://factory.talos.dev/") - --kubernetes-version string desired kubernetes version to run (default "1.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.0") --memory-controlplanes string(mb,gb) the limit on memory usage for each control plane/VM (default 2.0GiB) --memory-workers string(mb,gb) the limit on memory usage for each worker/VM (default 2.0GiB) --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') @@ -1877,7 +1877,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.36.0-rc.1") + --kubernetes-version string desired kubernetes version to run (default "1.36.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]) --registry-mirror strings list of registry mirrors to use in format: = @@ -2280,7 +2280,7 @@ talosctl image cache-create [flags] ### Examples ``` -talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.36.0-rc.1 --image-cache-path=/tmp/talos-image-cache +talosctl images cache-create --images=ghcr.io/siderolabs/kubelet:v1.36.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=- @@ -2371,7 +2371,7 @@ talosctl image k8s-bundle [flags] --etcd-version semver ETCD semantic version (default v3.6.9) --flannel-version semver Flannel CNI semantic version (default v0.28.4) -h, --help help for k8s-bundle - --k8s-version semver Kubernetes semantic version (default v1.36.0-rc.1) + --k8s-version semver Kubernetes semantic version (default v1.36.0) --kube-network-policies-version semver kube-network-policies semantic version (default v1.0.0) ``` @@ -3503,7 +3503,7 @@ talosctl upgrade-k8s [flags] --scheduler-image string kube-scheduler image to use (default "registry.k8s.io/kube-scheduler") --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. --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. - --to string the Kubernetes control plane version to upgrade to (default "1.36.0-rc.1") + --to string the Kubernetes control plane version to upgrade to (default "1.36.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.13/reference/configuration/v1alpha1/config.md b/website/content/v1.13/reference/configuration/v1alpha1/config.md index d4ed82cbd..541db6413 100644 --- a/website/content/v1.13/reference/configuration/v1alpha1/config.md +++ b/website/content/v1.13/reference/configuration/v1alpha1/config.md @@ -83,7 +83,7 @@ controlPlane: {{< /highlight >}} | | |`kubelet` |KubeletConfig |Used to provide additional options to the kubelet.
Show example(s)Kubelet definition example.:{{< highlight yaml >}} kubelet: - image: ghcr.io/siderolabs/kubelet:v1.36.0-rc.1 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.36.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 @@ -305,7 +305,7 @@ KubeletConfig represents the kubelet config values. {{< highlight yaml >}} machine: kubelet: - image: ghcr.io/siderolabs/kubelet:v1.36.0-rc.1 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.36.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 @@ -358,7 +358,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.36.0-rc.1 +image: ghcr.io/siderolabs/kubelet:v1.36.0 {{< /highlight >}}
| | |`clusterDNS` |[]string |The `ClusterDNS` field is an optional reference to an alternative kubelet clusterDNS ip list.
Show example(s){{< highlight yaml >}} clusterDNS: @@ -1032,7 +1032,7 @@ serviceAccount: {{< /highlight >}}
| | |`apiServer` |APIServerConfig |API server specific configuration options.
Show example(s){{< highlight yaml >}} apiServer: - image: registry.k8s.io/kube-apiserver:v1.36.0-rc.1 # The container image used in the API server manifest. + image: registry.k8s.io/kube-apiserver:v1.36.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -1097,14 +1097,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.36.0-rc.1 # The container image used in the controller manager manifest. + image: registry.k8s.io/kube-controller-manager:v1.36.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.36.0-rc.1 # The container image used in the kube-proxy manifest. + image: registry.k8s.io/kube-proxy:v1.36.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: @@ -1115,7 +1115,7 @@ proxy: {{< /highlight >}}
| | |`scheduler` |SchedulerConfig |Scheduler server specific configuration options.
Show example(s){{< highlight yaml >}} scheduler: - image: registry.k8s.io/kube-scheduler:v1.36.0-rc.1 # The container image used in the scheduler manifest. + image: registry.k8s.io/kube-scheduler:v1.36.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1360,7 +1360,7 @@ APIServerConfig represents the kube apiserver configuration options. {{< highlight yaml >}} cluster: apiServer: - image: registry.k8s.io/kube-apiserver:v1.36.0-rc.1 # The container image used in the API server manifest. + image: registry.k8s.io/kube-apiserver:v1.36.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -1428,7 +1428,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.36.0-rc.1 +image: registry.k8s.io/kube-apiserver:v1.36.0 {{< /highlight >}}
| | |`extraArgs` |Args |Extra arguments to supply to the API server. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the API server static pod. | | @@ -1639,7 +1639,7 @@ ControllerManagerConfig represents the kube controller manager configuration opt {{< highlight yaml >}} cluster: controllerManager: - image: registry.k8s.io/kube-controller-manager:v1.36.0-rc.1 # The container image used in the controller manager manifest. + image: registry.k8s.io/kube-controller-manager:v1.36.0 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -1649,7 +1649,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.36.0-rc.1 +image: registry.k8s.io/kube-controller-manager:v1.36.0 {{< /highlight >}}
| | |`extraArgs` |Args |Extra arguments to supply to the controller manager. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the controller manager static pod. | | @@ -1719,7 +1719,7 @@ ProxyConfig represents the kube proxy configuration options. {{< highlight yaml >}} cluster: proxy: - image: registry.k8s.io/kube-proxy:v1.36.0-rc.1 # The container image used in the kube-proxy manifest. + image: registry.k8s.io/kube-proxy:v1.36.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: @@ -1736,7 +1736,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.36.0-rc.1 +image: registry.k8s.io/kube-proxy:v1.36.0 {{< /highlight >}}
| | |`mode` |string |proxy mode of kube-proxy.
The default is 'iptables'. | | |`extraArgs` |Args |Extra arguments to supply to kube-proxy. | | @@ -1755,7 +1755,7 @@ SchedulerConfig represents the kube scheduler configuration options. {{< highlight yaml >}} cluster: scheduler: - image: registry.k8s.io/kube-scheduler:v1.36.0-rc.1 # The container image used in the scheduler manifest. + image: registry.k8s.io/kube-scheduler:v1.36.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1765,7 +1765,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.36.0-rc.1 +image: registry.k8s.io/kube-scheduler:v1.36.0 {{< /highlight >}}
| | |`extraArgs` |Args |Extra arguments to supply to the scheduler. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the scheduler static pod. | |