chore: bump k8s to v0.25.0-alpha.2

Bump k8s to v0.25.0-alpha.2

Signed-off-by: Noel Georgi <git@frezbo.dev>

Makefile

@@ -30,7 +30,7 @@ OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]")
 TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM)
 INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)
 INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
-KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.24.2/bin/$(OPERATING_SYSTEM)/amd64/kubectl
+KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.25.0-alpha.2/bin/$(OPERATING_SYSTEM)/amd64/kubectl
 KUBESTR_URL ?= https://github.com/kastenhq/kubestr/releases/download/v0.4.31/kubestr_0.4.31_Linux_amd64.tar.gz
 CLUSTERCTL_VERSION ?= 1.1.3
 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64

go.mod

@@ -17,14 +17,14 @@ replace (
 
 // Kubernetes dependencies sharing the same version.
 require (
-	k8s.io/api v0.24.2
-	k8s.io/apimachinery v0.24.2
-	k8s.io/apiserver v0.24.2
-	k8s.io/client-go v0.24.2
-	k8s.io/component-base v0.24.2
-	k8s.io/cri-api v0.24.2
-	k8s.io/kubectl v0.24.2
-	k8s.io/kubelet v0.24.2
+	k8s.io/api v0.25.0-alpha.2
+	k8s.io/apimachinery v0.25.0-alpha.2
+	k8s.io/apiserver v0.25.0-alpha.2
+	k8s.io/client-go v0.25.0-alpha.2
+	k8s.io/component-base v0.25.0-alpha.2
+	k8s.io/cri-api v0.25.0-alpha.2
+	k8s.io/kubectl v0.25.0-alpha.2
+	k8s.io/kubelet v0.25.0-alpha.2
 )
 
 require (
@@ -138,13 +138,7 @@ require (
 	cloud.google.com/go/iam v0.3.0 // indirect
 	cloud.google.com/go/storage v1.22.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/Microsoft/hcsshim v0.9.3 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
@@ -155,7 +149,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/briandowns/spinner v1.6.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/cilium/ebpf v0.8.1 // indirect
 	github.com/containerd/continuity v0.2.2 // indirect
 	github.com/containerd/fifo v1.0.0 // indirect
@@ -168,13 +162,14 @@ require (
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gertd/go-pluralize v0.2.1 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
-	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -287,9 +282,9 @@ require (
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 // indirect
-	k8s.io/cli-runtime v0.24.2 // indirect
+	k8s.io/cli-runtime v0.25.0-alpha.2 // indirect
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	kernel.org/pub/linux/libs/security/libcap/psx v1.2.64 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect

hack/release.toml

@@ -53,6 +53,7 @@ vlan=eth1.5:eth1 ip=172.20.0.2::172.20.0.1:255.255.255.0::eth1.5:::::
         title = "Component Updates"
         description="""\
 * Linux: 5.15.53
+* Kubernetes: v1.25.0-alpha.2
 """
 
     [notes.talos-config-kernel-param-variable-substitution]

hack/test/e2e.sh

@@ -30,7 +30,7 @@ export TALOS_VERSION=v1.1
 # Kubernetes
 
 export KUBECONFIG="${TMP}/kubeconfig"
-export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.24.2}
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.25.0-alpha.2}
 
 export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
 export TIMEOUT=1200

internal/app/machined/pkg/controllers/k8s/kubelet_spec_test.go

@@ -26,7 +26,7 @@ import (
 	"inet.af/netaddr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/component-base/config/v1alpha1"
+	v1 "k8s.io/component-base/logs/api/v1"
 	kubeletconfig "k8s.io/kubelet/config/v1beta1"
 
 	k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s"
@@ -361,7 +361,7 @@ func TestNewKubeletConfigurationMerge(t *testing.T) {
 			"pid":               constants.KubeletSystemReservedPid,
 			"ephemeral-storage": constants.KubeletSystemReservedEphemeralStorage,
 		},
-		Logging: v1alpha1.LoggingConfiguration{
+		Logging: v1.LoggingConfiguration{
 			Format: "json",
 		},
 		ShutdownGracePeriod:             metav1.Duration{Duration: constants.KubeletShutdownGracePeriod},

internal/integration/base/cli.go

@@ -88,11 +88,11 @@ func (cliSuite *CLISuite) discoverKubectl() cluster.Info {
 	cliSuite.RunCLI([]string{"kubeconfig", tempDir}, StdoutEmpty())
 
 	masterNodes, err := cmd.Run(cliSuite.KubectlPath, "--kubeconfig", filepath.Join(tempDir, "kubeconfig"), "get", "nodes",
-		"-o", "jsonpath={.items[*].status.addresses[?(@.type==\"InternalIP\")].address}", fmt.Sprintf("--selector=%s", constants.LabelNodeRoleMaster))
+		"-o", "jsonpath={.items[*].status.addresses[?(@.type==\"InternalIP\")].address}", fmt.Sprintf("--selector=%s", constants.LabelNodeRoleControlPlane))
 	cliSuite.Require().NoError(err)
 
 	workerNodes, err := cmd.Run(cliSuite.KubectlPath, "--kubeconfig", filepath.Join(tempDir, "kubeconfig"), "get", "nodes",
-		"-o", "jsonpath={.items[*].status.addresses[?(@.type==\"InternalIP\")].address}", fmt.Sprintf("--selector=!%s", constants.LabelNodeRoleMaster))
+		"-o", "jsonpath={.items[*].status.addresses[?(@.type==\"InternalIP\")].address}", fmt.Sprintf("--selector=!%s", constants.LabelNodeRoleControlPlane))
 	cliSuite.Require().NoError(err)
 
 	nodeInfo, err := newNodeInfo(

internal/integration/base/discovery_k8s.go

@@ -69,7 +69,7 @@ func discoverNodesK8s(ctx context.Context, client *client.Client, suite *TalosSu
 			continue
 		}
 
-		if _, ok := node.Labels[constants.LabelNodeRoleMaster]; ok {
+		if _, ok := node.Labels[constants.LabelNodeRoleControlPlane]; ok {
 			masterNodes = append(masterNodes, address)
 		} else {
 			workerNodes = append(workerNodes, address)

internal/integration/provision/upgrade.go

@@ -674,7 +674,7 @@ func (suite *UpgradeSuite) untaint(name string) {
 	k := 0
 
 	for _, taint := range n.Spec.Taints {
-		if taint.Key != constants.LabelNodeRoleMaster {
+		if taint.Key != constants.LabelNodeRoleMaster && taint.Key != constants.LabelNodeRoleControlPlane {
 			n.Spec.Taints[k] = taint
 			k++
 		}

internal/pkg/discovery/registry/kubernetes.go

@@ -94,7 +94,7 @@ func AffiliateFromNode(node *v1.Node) *cluster.AffiliateSpec {
 	}
 
 	// Machine type is derived from node roles.
-	_, labelMaster := node.Labels[constants.LabelNodeRoleMaster]
+	_, labelMaster := node.Labels[constants.LabelNodeRoleControlPlane]
 	_, labelControlPlane := node.Labels[constants.LabelNodeRoleControlPlane]
 
 	affiliate.MachineType = machine.TypeWorker

pkg/kubernetes/kubernetes.go

@@ -234,15 +234,12 @@ func (h *Client) LabelNodeAsMaster(ctx context.Context, name string, taintNoSche
 		return fmt.Errorf("failed to marshal unmodified node %q into JSON: %w", n.Name, err)
 	}
 
-	n.Labels[constants.LabelNodeRoleMaster] = ""
 	n.Labels[constants.LabelNodeRoleControlPlane] = ""
 
 	taintIndex := -1
 
-	// TODO: with K8s 1.21, add new taint LabelNodeRoleControlPlane
-
 	for i, taint := range n.Spec.Taints {
-		if taint.Key == constants.LabelNodeRoleMaster {
+		if taint.Key == constants.LabelNodeRoleControlPlane {
 			taintIndex = i
 
 			break
@@ -251,7 +248,7 @@ func (h *Client) LabelNodeAsMaster(ctx context.Context, name string, taintNoSche
 
 	if taintIndex == -1 && taintNoSchedule {
 		n.Spec.Taints = append(n.Spec.Taints, corev1.Taint{
-			Key:    constants.LabelNodeRoleMaster,
+			Key:    constants.LabelNodeRoleControlPlane,
 			Effect: corev1.TaintEffectNoSchedule,
 		})
 	} else if taintIndex != -1 && !taintNoSchedule {

pkg/machinery/constants/constants.go

@@ -260,7 +260,7 @@ const (
 	KubeletShutdownGracePeriodCriticalPods = 10 * time.Second
 
 	// DefaultKubernetesVersion is the default target version of the control plane.
-	DefaultKubernetesVersion = "1.24.2"
+	DefaultKubernetesVersion = "1.25.0-alpha.2"
 
 	// DefaultControlPlanePort is the default port to use for the control plane.
 	DefaultControlPlanePort = 6443

website/content/v1.2/_index.md

@@ -6,8 +6,8 @@ cascade:
   type: docs
 preRelease: true
 lastRelease: v1.2.0-alpha.0
-kubernetesRelease: "1.24.2"
-prevKubernetesRelease: "1.24.1"
+kubernetesRelease: "v1.25.0-alpha.2"
+prevKubernetesRelease: "1.24.2"
 theilaRelease: "v0.2.1"
 ---
 

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

@@ -126,7 +126,7 @@ talosctl cluster create [flags]
       --ipv4                                     enable IPv4 network in the cluster (default true)
       --ipv6                                     enable IPv6 network in the cluster (QEMU provisioner only)
       --iso-path string                          the ISO path to use for the initial boot (VM only)
-      --kubernetes-version string                desired kubernetes version to run (default "1.24.2")
+      --kubernetes-version string                desired kubernetes version to run (default "1.25.0-alpha.2")
       --masters int                              the number of masters to create (default 1)
       --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)
@@ -1098,7 +1098,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.24.2")
+      --kubernetes-version string                desired kubernetes version to run (default "1.25.0-alpha.2")
   -o, --output-dir string                        destination to output generated files
   -p, --persist                                  the desired persist value for configs (default true)
       --registry-mirror strings                  list of registry mirrors to use in format: <registry host>=<mirror URL>
@@ -2037,7 +2037,7 @@ talosctl upgrade-k8s [flags]
       --endpoint string   the cluster control plane endpoint
       --from string       the Kubernetes control plane version to upgrade from
   -h, --help              help for upgrade-k8s
-      --to string         the Kubernetes control plane version to upgrade to (default "1.24.2")
+      --to string         the Kubernetes control plane version to upgrade to (default "1.25.0-alpha.2")
       --upgrade-kubelet   upgrade kubelet service (default true)
 ```
 

website/content/v1.2/reference/configuration.md

@@ -101,7 +101,7 @@ controlPlane:
 {{< /highlight >}}</details> | |
 |`kubelet` |<a href="#kubeletconfig">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.24.2 # The `image` field is an optional reference to an alternative kubelet image.
+    image: ghcr.io/siderolabs/kubelet:v1.25.0-alpha.2 # 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
@@ -460,7 +460,7 @@ serviceAccount:
 {{< /highlight >}}</details> | |
 |`apiServer` |<a href="#apiserverconfig">APIServerConfig</a> |API server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
 apiServer:
-    image: k8s.gcr.io/kube-apiserver:v1.24.2 # The container image used in the API server manifest.
+    image: k8s.gcr.io/kube-apiserver:v1.25.0-alpha.2 # The container image used in the API server manifest.
     # Extra arguments to supply to the API server.
     extraArgs:
         feature-gates: ServerSideApply=true
@@ -492,14 +492,14 @@ apiServer:
 {{< /highlight >}}</details> | |
 |`controllerManager` |<a href="#controllermanagerconfig">ControllerManagerConfig</a> |Controller manager server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
 controllerManager:
-    image: k8s.gcr.io/kube-controller-manager:v1.24.2 # The container image used in the controller manager manifest.
+    image: k8s.gcr.io/kube-controller-manager:v1.25.0-alpha.2 # 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="#proxyconfig">ProxyConfig</a> |Kube-proxy server-specific configuration options <details><summary>Show example(s)</summary>{{< highlight yaml >}}
 proxy:
-    image: k8s.gcr.io/kube-proxy:v1.24.2 # The container image used in the kube-proxy manifest.
+    image: k8s.gcr.io/kube-proxy:v1.25.0-alpha.2 # The container image used in the kube-proxy manifest.
     mode: ipvs # proxy mode of kube-proxy.
     # Extra arguments to supply to kube-proxy.
     extraArgs:
@@ -510,7 +510,7 @@ proxy:
 {{< /highlight >}}</details> | |
 |`scheduler` |<a href="#schedulerconfig">SchedulerConfig</a> |Scheduler server specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
 scheduler:
-    image: k8s.gcr.io/kube-scheduler:v1.24.2 # The container image used in the scheduler manifest.
+    image: k8s.gcr.io/kube-scheduler:v1.25.0-alpha.2 # The container image used in the scheduler manifest.
     # Extra arguments to supply to the scheduler.
     extraArgs:
         feature-gates: AllBeta=true
@@ -674,7 +674,7 @@ Appears in:
 
 
 {{< highlight yaml >}}
-image: ghcr.io/siderolabs/kubelet:v1.24.2 # The `image` field is an optional reference to an alternative kubelet image.
+image: ghcr.io/siderolabs/kubelet:v1.25.0-alpha.2 # 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
@@ -711,7 +711,7 @@ extraArgs:
 | 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.24.2
+image: ghcr.io/siderolabs/kubelet:v1.25.0-alpha.2
 {{< /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:
@@ -1304,7 +1304,7 @@ Appears in:
 
 
 {{< highlight yaml >}}
-image: k8s.gcr.io/kube-apiserver:v1.24.2 # The container image used in the API server manifest.
+image: k8s.gcr.io/kube-apiserver:v1.25.0-alpha.2 # The container image used in the API server manifest.
 # Extra arguments to supply to the API server.
 extraArgs:
     feature-gates: ServerSideApply=true
@@ -1339,7 +1339,7 @@ certSANs:
 | 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: k8s.gcr.io/kube-apiserver:v1.24.2
+image: k8s.gcr.io/kube-apiserver:v1.25.0-alpha.2
 {{< /highlight >}}</details> | |
 |`extraArgs` |map[string]string |Extra arguments to supply to the API server.  | |
 |`extraVolumes` |[]<a href="#volumemountconfig">VolumeMountConfig</a> |Extra volumes to mount to the API server static pod.  | |
@@ -1418,7 +1418,7 @@ Appears in:
 
 
 {{< highlight yaml >}}
-image: k8s.gcr.io/kube-controller-manager:v1.24.2 # The container image used in the controller manager manifest.
+image: k8s.gcr.io/kube-controller-manager:v1.25.0-alpha.2 # The container image used in the controller manager manifest.
 # Extra arguments to supply to the controller manager.
 extraArgs:
     feature-gates: ServerSideApply=true
@@ -1428,7 +1428,7 @@ extraArgs:
 | 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: k8s.gcr.io/kube-controller-manager:v1.24.2
+image: k8s.gcr.io/kube-controller-manager:v1.25.0-alpha.2
 {{< /highlight >}}</details> | |
 |`extraArgs` |map[string]string |Extra arguments to supply to the controller manager.  | |
 |`extraVolumes` |[]<a href="#volumemountconfig">VolumeMountConfig</a> |Extra volumes to mount to the controller manager static pod.  | |
@@ -1447,7 +1447,7 @@ Appears in:
 
 
 {{< highlight yaml >}}
-image: k8s.gcr.io/kube-proxy:v1.24.2 # The container image used in the kube-proxy manifest.
+image: k8s.gcr.io/kube-proxy:v1.25.0-alpha.2 # The container image used in the kube-proxy manifest.
 mode: ipvs # proxy mode of kube-proxy.
 # Extra arguments to supply to kube-proxy.
 extraArgs:
@@ -1464,7 +1464,7 @@ extraArgs:
 disabled: false
 {{< /highlight >}}</details> | |
 |`image` |string |The container image used in the kube-proxy manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
-image: k8s.gcr.io/kube-proxy:v1.24.2
+image: k8s.gcr.io/kube-proxy:v1.25.0-alpha.2
 {{< /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.  | |
@@ -1482,7 +1482,7 @@ Appears in:
 
 
 {{< highlight yaml >}}
-image: k8s.gcr.io/kube-scheduler:v1.24.2 # The container image used in the scheduler manifest.
+image: k8s.gcr.io/kube-scheduler:v1.25.0-alpha.2 # The container image used in the scheduler manifest.
 # Extra arguments to supply to the scheduler.
 extraArgs:
     feature-gates: AllBeta=true
@@ -1492,7 +1492,7 @@ extraArgs:
 | Field | Type | Description | Value(s) |
 |-------|------|-------------|----------|
 |`image` |string |The container image used in the scheduler manifest. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
-image: k8s.gcr.io/kube-scheduler:v1.24.2
+image: k8s.gcr.io/kube-scheduler:v1.25.0-alpha.2
 {{< /highlight >}}</details> | |
 |`extraArgs` |map[string]string |Extra arguments to supply to the scheduler.  | |
 |`extraVolumes` |[]<a href="#volumemountconfig">VolumeMountConfig</a> |Extra volumes to mount to the scheduler static pod.  | |