From 4c3485ae3f86c68b80bb8dcf97422d9b74ea5e17 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 12 Aug 2022 00:17:45 +0400 Subject: [PATCH] feat: update Kubernetes to 1.25.0-rc.0 See https://github.com/kubernetes/kubernetes/releases/tag/v1.25.0-rc.0 Signed-off-by: Andrey Smirnov --- Makefile | 2 +- go.mod | 18 +++++----- go.sum | 36 +++++++++---------- go.work.sum | 25 ++++++++++++- hack/release.toml | 2 +- hack/test/e2e.sh | 2 +- pkg/machinery/constants/constants.go | 2 +- website/content/v1.2/_index.md | 2 +- website/content/v1.2/reference/cli.md | 6 ++-- .../content/v1.2/reference/configuration.md | 30 ++++++++-------- 10 files changed, 74 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index a389b31e1..b2821d5cd 100644 --- a/Makefile +++ b/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.25.0-beta.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl +KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.25.0-rc.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl KUBESTR_URL ?= https://github.com/kastenhq/kubestr/releases/download/v0.4.34/kubestr_0.4.34_Linux_amd64.tar.gz HELM_URL ?= https://get.helm.sh/helm-v3.9.2-linux-amd64.tar.gz CLUSTERCTL_VERSION ?= 1.1.3 diff --git a/go.mod b/go.mod index 389b83f1b..9eac9f979 100644 --- a/go.mod +++ b/go.mod @@ -17,14 +17,14 @@ replace ( // Kubernetes dependencies sharing the same version. require ( - k8s.io/api v0.25.0-beta.0 - k8s.io/apimachinery v0.25.0-beta.0 - k8s.io/apiserver v0.25.0-beta.0 - k8s.io/client-go v0.25.0-beta.0 - k8s.io/component-base v0.25.0-beta.0 - k8s.io/cri-api v0.25.0-beta.0 - k8s.io/kubectl v0.25.0-beta.0 - k8s.io/kubelet v0.25.0-beta.0 + k8s.io/api v0.25.0-rc.0 + k8s.io/apimachinery v0.25.0-rc.0 + k8s.io/apiserver v0.25.0-rc.0 + k8s.io/client-go v0.25.0-rc.0 + k8s.io/component-base v0.25.0-rc.0 + k8s.io/cri-api v0.25.0-rc.0 + k8s.io/kubectl v0.25.0-rc.0 + k8s.io/kubelet v0.25.0-rc.0 ) require ( @@ -285,7 +285,7 @@ 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.25.0-beta.0 // indirect + k8s.io/cli-runtime v0.25.0-rc.0 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect diff --git a/go.sum b/go.sum index 167522df1..08374e5b0 100644 --- a/go.sum +++ b/go.sum @@ -1898,37 +1898,37 @@ inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWa k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= -k8s.io/api v0.25.0-beta.0 h1:7gOhPDIb64uxBn9IADZDU2Kz3R7/HzYGMOQ4REsz6rE= -k8s.io/api v0.25.0-beta.0/go.mod h1:N4fOjxA9rFu2Trkid57zYj46pZjtumuyuhDaq30UquA= +k8s.io/api v0.25.0-rc.0 h1:JzQmjOfEAkOyCzDyFTayWB3nCQeS4TcCldrl2Q+417g= +k8s.io/api v0.25.0-rc.0/go.mod h1:H8qkBzdcUEFJEhgA14ip3PpzUFN0XXPgnlDnu/KaDf0= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apimachinery v0.25.0-beta.0 h1:D+AORv53PNNqTb98A0MgWonJP4bTPpWXfNDLWM++0ro= -k8s.io/apimachinery v0.25.0-beta.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/apimachinery v0.25.0-rc.0 h1:k3n1k01fFHrTsRHM8xt+z9yOpak7KmO/pbmD0/tAkzs= +k8s.io/apimachinery v0.25.0-rc.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.25.0-beta.0 h1:647oFg6oWVT+S5nJ6UZUo5ONKMlQtL05c+CTfaQVFCw= -k8s.io/apiserver v0.25.0-beta.0/go.mod h1:3NmUohL2d4im//vZrE5UCJ/1OgHhADxmxWRTJ5hyJWw= -k8s.io/cli-runtime v0.25.0-beta.0 h1:k/cdu0aqbW0srajnHnh7I2fjrTvMbUSWyWl6jHE3x6s= -k8s.io/cli-runtime v0.25.0-beta.0/go.mod h1:D3SRViDXYwr5j83b8YHi9yky4nFBafAvW+Zof7Zv1Us= +k8s.io/apiserver v0.25.0-rc.0 h1:PCLYM37Cq9SEbb6jFhA1E7NpfW6GddG2AzgECMU5jlw= +k8s.io/apiserver v0.25.0-rc.0/go.mod h1:a6uerzON2mpu3JWvoU+MZEj491B0faS6J0w8e10ZOy8= +k8s.io/cli-runtime v0.25.0-rc.0 h1:WWIO77tlIq79wrFgtUs/Zfz/bia7JNNM54LdQ31DLwM= +k8s.io/cli-runtime v0.25.0-rc.0/go.mod h1:fDbKVDhUBEnbKhpPXSYsWdLV4Lod3iN9YYApgkVmmuk= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.25.0-beta.0 h1:tKRREe6F7sJ+Bbya7SOE9IqbCJNbHH2KkERJ603JtEE= -k8s.io/client-go v0.25.0-beta.0/go.mod h1:IOmN/HvdQ/cGVlT809kUgiEVXU955R/3IBa0TGWjRL8= +k8s.io/client-go v0.25.0-rc.0 h1:KL7AczVvcnYc8FpU04Cr8fIe8xwgFnU/UTrc/I73vgQ= +k8s.io/client-go v0.25.0-rc.0/go.mod h1:XjkJ50b7aujTzt+YY6krr3tthIEunuABtlw414f80EU= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.25.0-beta.0 h1:3YOh6H2q4TVQtKEu0klRlsvxzSH+eD2X2ceagLQUc/0= -k8s.io/component-base v0.25.0-beta.0/go.mod h1:RrkcoMHeJT00yv2jNmhzYzfifTkaqSsa5chl0vxGv+0= +k8s.io/component-base v0.25.0-rc.0 h1:2zlYDXYA5DhMmyhIMR5Ekktb2WfAs3Euc138ymPgnCA= +k8s.io/component-base v0.25.0-rc.0/go.mod h1:zDon61JoEHGHW3yhXG/7z0urHK9a/Qgk85g7sh3QWCc= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/cri-api v0.25.0-beta.0 h1:shg+VmvvrqZrYWBLVBx9N7kfG5zuj73Tfeb3Oej/U4M= -k8s.io/cri-api v0.25.0-beta.0/go.mod h1:J1rAyQkSJ2Q6I+aBMOVgg2/cbbebso6FNa0UagiR0kc= +k8s.io/cri-api v0.25.0-rc.0 h1:F7tUAU25UhYy+j5s04SbsMPgcuBXhxXud1BQflWlN5A= +k8s.io/cri-api v0.25.0-rc.0/go.mod h1:J1rAyQkSJ2Q6I+aBMOVgg2/cbbebso6FNa0UagiR0kc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1943,10 +1943,10 @@ k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/kubectl v0.25.0-beta.0 h1:QMpOsKRmok9dAqn1IUfv4I6f39C9cn5W3d1n54Z7fYQ= -k8s.io/kubectl v0.25.0-beta.0/go.mod h1:p8gHEOswE0esy8iIQW/VA+u1+QnfyC6wNOyjOeIIp1A= -k8s.io/kubelet v0.25.0-beta.0 h1:y6vRizTKlc1lftDrC4gWk4CMwnTFPPziU3JhMLmjpIM= -k8s.io/kubelet v0.25.0-beta.0/go.mod h1:+g2L0iS0YcUpUo/5ezSLsZ6ajlDWPYeKUEQmUF0OwlY= +k8s.io/kubectl v0.25.0-rc.0 h1:f1A3uRQdIhAIKsGgtzSxBweP2McpfMHYIELSqyGVhrQ= +k8s.io/kubectl v0.25.0-rc.0/go.mod h1:LqShdqUP5S2pG2f7/rnN2WDvWH4iEE1JSUnRKcb+yJ8= +k8s.io/kubelet v0.25.0-rc.0 h1:tnWBu7gZJM61DXZwUrGtGbPkZWoO7XHuGZEbi1QpQjw= +k8s.io/kubelet v0.25.0-rc.0/go.mod h1:FM+1zDQwCbgWLYnmxxqv/cTYYE37MJO1JTWwFT3OqFc= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= diff --git a/go.work.sum b/go.work.sum index c91d0dec7..6eb71bae4 100644 --- a/go.work.sum +++ b/go.work.sum @@ -66,6 +66,7 @@ github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c h1:Xo2rK1pzOm0jO6abTPIQwbAmqBIOj132otexc1mmzFc= github.com/d2g/dhcp4client v1.0.0 h1:suYBsYZIkSlUMEz4TAYCczKf62IA2UWC+O8+KtdOhCo= @@ -86,6 +87,7 @@ github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415 h1:q1oJaUPdmpDm/Vy github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= github.com/envoyproxy/protoc-gen-validate v0.6.2 h1:JiO+kJTpmYGjEodY7O1Zk8oZcNz1+f30UtwtXoFUPzE= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72 h1:0eU/faU2oDIB2BkQVM02hgRLJjGzzUuRf19HUhp0394= github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= @@ -136,6 +138,7 @@ github.com/hashicorp/serf v0.9.6 h1:uuEX1kLR6aoda1TBttmJQKDLZE1Ob7KN0NPdE7EtCDc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/intel-go/cpuid v0.0.0-20200819041909-2aa72927c3e2 h1:h+RKaNPjka7LRJGoeub/IQBdXSoEaJjfADkBq02hvjw= github.com/intel/goresctrl v0.2.0 h1:JyZjdMQu9Kl/wLXe9xA6s1X+tF6BWsQPFGJMEeCfWzE= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56 h1:742eGXur0715JMq73aD95/FU0XpVKXqNuTnEfXsLOYQ= @@ -197,12 +200,12 @@ github.com/sclevine/spec v1.2.0 h1:1Jwdf9jSfDl9NVmt8ndHqbTZ7XCCPbh1jI3hkDBHVYA= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/siderolabs/protoenc v0.1.3/go.mod h1:mu4gc6pJxhdJYpuloacKE4jsJojj87qDXwn8LUvs2bY= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 h1:lIOOHPEbXzO3vnmx2gok1Tfs31Q8GQqKLc8vVqyQq/I= github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= @@ -244,6 +247,7 @@ go.opentelemetry.io/otel/sdk/export/metric v0.20.0 h1:c5VRjxCXdQlx1HjzwGdQHzZaVI go.opentelemetry.io/otel/sdk/metric v0.20.0 h1:7ao1wpzHRVKf0OQ7GIxiQJA6X7DLX9o14gmVon7mMK8= go.opentelemetry.io/proto/otlp v0.11.0 h1:cLDgIBTf4lLOlztkhzAEdQsJ4Lj+i5Wc9k6Nn0K1VyU= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= @@ -259,6 +263,7 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JC golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.zx2c4.com/go118/netip v0.0.0-20211106132939-9d41d90554dd h1:gUHae7sCd+tFJLcCximWeBFD2b6Jg3O7UaNaPvjIJHc= golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL17LSCBGFDnphBBhzmILHsM5TY= @@ -279,27 +284,45 @@ gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w honnef.co/go/tools v0.2.2 h1:MNh1AVMyVX23VUHE2O27jm6lNj3vjO5DexS4A1xvnzk= k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= +k8s.io/api v0.25.0-rc.0 h1:JzQmjOfEAkOyCzDyFTayWB3nCQeS4TcCldrl2Q+417g= +k8s.io/api v0.25.0-rc.0/go.mod h1:H8qkBzdcUEFJEhgA14ip3PpzUFN0XXPgnlDnu/KaDf0= k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.25.0-rc.0 h1:k3n1k01fFHrTsRHM8xt+z9yOpak7KmO/pbmD0/tAkzs= +k8s.io/apimachinery v0.25.0-rc.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apiserver v0.24.2 h1:orxipm5elPJSkkFNlwH9ClqaKEDJJA3yR2cAAlCnyj4= k8s.io/apiserver v0.24.2/go.mod h1:pSuKzr3zV+L+MWqsEo0kHHYwCo77AT5qXbFXP2jbvFI= +k8s.io/apiserver v0.25.0-rc.0 h1:PCLYM37Cq9SEbb6jFhA1E7NpfW6GddG2AzgECMU5jlw= +k8s.io/apiserver v0.25.0-rc.0/go.mod h1:a6uerzON2mpu3JWvoU+MZEj491B0faS6J0w8e10ZOy8= k8s.io/cli-runtime v0.24.2 h1:KxY6tSgPGsahA6c1/dmR3uF5jOxXPx2QQY6C5ZrLmtE= k8s.io/cli-runtime v0.24.2/go.mod h1:1LIhKL2RblkhfG4v5lZEt7FtgFG5mVb8wqv5lE9m5qY= +k8s.io/cli-runtime v0.25.0-rc.0 h1:WWIO77tlIq79wrFgtUs/Zfz/bia7JNNM54LdQ31DLwM= +k8s.io/cli-runtime v0.25.0-rc.0/go.mod h1:fDbKVDhUBEnbKhpPXSYsWdLV4Lod3iN9YYApgkVmmuk= k8s.io/client-go v0.24.2 h1:CoXFSf8if+bLEbinDqN9ePIDGzcLtqhfd6jpfnwGOFA= k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= +k8s.io/client-go v0.25.0-rc.0 h1:KL7AczVvcnYc8FpU04Cr8fIe8xwgFnU/UTrc/I73vgQ= +k8s.io/client-go v0.25.0-rc.0/go.mod h1:XjkJ50b7aujTzt+YY6krr3tthIEunuABtlw414f80EU= k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/code-generator v0.24.3 h1:itd1V1ZAYKM+WT+qQDlFKhU1D/Ff5HcEFL/icfClnZA= k8s.io/component-base v0.24.2 h1:kwpQdoSfbcH+8MPN4tALtajLDfSfYxBDYlXobNWI6OU= k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= +k8s.io/component-base v0.25.0-rc.0 h1:2zlYDXYA5DhMmyhIMR5Ekktb2WfAs3Euc138ymPgnCA= +k8s.io/component-base v0.25.0-rc.0/go.mod h1:zDon61JoEHGHW3yhXG/7z0urHK9a/Qgk85g7sh3QWCc= k8s.io/component-helpers v0.24.2/go.mod h1:TRQPBQKfmqkmV6c0HAmUs8cXVNYYYLsXy4zu8eODi9g= k8s.io/component-helpers v0.24.3 h1:HKZTNf77K96StY2+FAgKvsXvHwoLvexeGDJatyuWlyI= k8s.io/cri-api v0.24.2 h1:8i65YM7mC/VkeH0EFavTI0oXnxRZaQ4gPgOLJrj8LJs= k8s.io/cri-api v0.24.2/go.mod h1:t3tImFtGeStN+ES69bQUX9sFg67ek38BM9YIJhMmuig= +k8s.io/cri-api v0.25.0-rc.0 h1:F7tUAU25UhYy+j5s04SbsMPgcuBXhxXud1BQflWlN5A= +k8s.io/cri-api v0.25.0-rc.0/go.mod h1:J1rAyQkSJ2Q6I+aBMOVgg2/cbbebso6FNa0UagiR0kc= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/kubectl v0.24.2 h1:+RfQVhth8akUmIc2Ge8krMl/pt66V7210ka3RE/p0J4= k8s.io/kubectl v0.24.2/go.mod h1:+HIFJc0bA6Tzu5O/YcuUt45APAxnNL8LeMuXwoiGsPg= +k8s.io/kubectl v0.25.0-rc.0 h1:f1A3uRQdIhAIKsGgtzSxBweP2McpfMHYIELSqyGVhrQ= +k8s.io/kubectl v0.25.0-rc.0/go.mod h1:LqShdqUP5S2pG2f7/rnN2WDvWH4iEE1JSUnRKcb+yJ8= k8s.io/kubelet v0.24.2 h1:VAvULig8RiylCtyxudgHV7nhKsLnNIrdVBCRD4bXQ3Y= k8s.io/kubelet v0.24.2/go.mod h1:Xm9DkWQjwOs+uGOUIIGIPMvvmenvj0lDVOErvIKOOt0= +k8s.io/kubelet v0.25.0-rc.0 h1:tnWBu7gZJM61DXZwUrGtGbPkZWoO7XHuGZEbi1QpQjw= +k8s.io/kubelet v0.25.0-rc.0/go.mod h1:FM+1zDQwCbgWLYnmxxqv/cTYYE37MJO1JTWwFT3OqFc= k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8= k8s.io/metrics v0.24.2/go.mod h1:5NWURxZ6Lz5gj8TFU83+vdWIVASx7W8lwPpHYCqopMo= k8s.io/metrics v0.24.3 h1:pXzh+PG8L8ANg0PD3Ce8+yG5oj8BLvzBgsz8yCVEXyg= diff --git a/hack/release.toml b/hack/release.toml index c84dd7885..6d2084ce5 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -164,7 +164,7 @@ vlan=eth1.5:eth1 ip=172.20.0.2::172.20.0.1:255.255.255.0::eth1.5::::: * Linux: 5.15.60 * Flannel 0.19.1 * containerd 1.16.7 -* Kubernetes: v1.25.0-beta.0 +* Kubernetes: v1.25.0-rc.0 Talos is built with Go 1.19. """ diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index c7510a95b..89ec30c47 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -30,7 +30,7 @@ export TALOS_VERSION=v1.1 # Kubernetes export KUBECONFIG="${TMP}/kubeconfig" -export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.25.0-beta.0} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.25.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 4431d9db5..b0eb89847 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -281,7 +281,7 @@ const ( SeccompProfilesDirectory = "/var/lib/kubelet/seccomp/profiles" // DefaultKubernetesVersion is the default target version of the control plane. - DefaultKubernetesVersion = "1.25.0-beta.0" + DefaultKubernetesVersion = "1.25.0-rc.0" // DefaultControlPlanePort is the default port to use for the control plane. DefaultControlPlanePort = 6443 diff --git a/website/content/v1.2/_index.md b/website/content/v1.2/_index.md index 7796d4357..4789aa2ad 100644 --- a/website/content/v1.2/_index.md +++ b/website/content/v1.2/_index.md @@ -6,7 +6,7 @@ cascade: type: docs preRelease: true lastRelease: v1.2.0-alpha.1 -kubernetesRelease: "v1.25.0-beta.0" +kubernetesRelease: "v1.25.0-rc.0" prevKubernetesRelease: "1.24.3" theilaRelease: "v0.2.1" --- diff --git a/website/content/v1.2/reference/cli.md b/website/content/v1.2/reference/cli.md index 68c91f5dc..2e3e6c6b9 100644 --- a/website/content/v1.2/reference/cli.md +++ b/website/content/v1.2/reference/cli.md @@ -128,7 +128,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.25.0-beta.0") + --kubernetes-version string desired kubernetes version to run (default "1.25.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) --mtu int MTU of the cluster network (default 1500) @@ -1099,7 +1099,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.25.0-beta.0") + --kubernetes-version string desired kubernetes version to run (default "1.25.0-rc.0") -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: = @@ -2164,7 +2164,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.25.0-beta.0") + --to string the Kubernetes control plane version to upgrade to (default "1.25.0-rc.0") --upgrade-kubelet upgrade kubelet service (default true) ``` diff --git a/website/content/v1.2/reference/configuration.md b/website/content/v1.2/reference/configuration.md index da3ffa101..4b873302b 100644 --- a/website/content/v1.2/reference/configuration.md +++ b/website/content/v1.2/reference/configuration.md @@ -102,7 +102,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.25.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.25.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 @@ -504,7 +504,7 @@ serviceAccount: {{< /highlight >}}
| | |`apiServer` |APIServerConfig |API server specific configuration options.
Show example(s){{< highlight yaml >}} apiServer: - image: k8s.gcr.io/kube-apiserver:v1.25.0-beta.0 # The container image used in the API server manifest. + image: k8s.gcr.io/kube-apiserver:v1.25.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 @@ -536,14 +536,14 @@ apiServer: {{< /highlight >}}
| | |`controllerManager` |ControllerManagerConfig |Controller manager server specific configuration options.
Show example(s){{< highlight yaml >}} controllerManager: - image: k8s.gcr.io/kube-controller-manager:v1.25.0-beta.0 # The container image used in the controller manager manifest. + image: k8s.gcr.io/kube-controller-manager:v1.25.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: k8s.gcr.io/kube-proxy:v1.25.0-beta.0 # The container image used in the kube-proxy manifest. + image: k8s.gcr.io/kube-proxy:v1.25.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: @@ -554,7 +554,7 @@ proxy: {{< /highlight >}}
| | |`scheduler` |SchedulerConfig |Scheduler server specific configuration options.
Show example(s){{< highlight yaml >}} scheduler: - image: k8s.gcr.io/kube-scheduler:v1.25.0-beta.0 # The container image used in the scheduler manifest. + image: k8s.gcr.io/kube-scheduler:v1.25.0-rc.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -718,7 +718,7 @@ Appears in: {{< highlight yaml >}} -image: ghcr.io/siderolabs/kubelet:v1.25.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image. +image: ghcr.io/siderolabs/kubelet:v1.25.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 @@ -755,7 +755,7 @@ extraArgs: | 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.25.0-beta.0 +image: ghcr.io/siderolabs/kubelet:v1.25.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: @@ -1352,7 +1352,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-apiserver:v1.25.0-beta.0 # The container image used in the API server manifest. +image: k8s.gcr.io/kube-apiserver:v1.25.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 @@ -1387,7 +1387,7 @@ certSANs: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the API server manifest.
Show example(s){{< highlight yaml >}} -image: k8s.gcr.io/kube-apiserver:v1.25.0-beta.0 +image: k8s.gcr.io/kube-apiserver:v1.25.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. | | @@ -1466,7 +1466,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-controller-manager:v1.25.0-beta.0 # The container image used in the controller manager manifest. +image: k8s.gcr.io/kube-controller-manager:v1.25.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 @@ -1476,7 +1476,7 @@ extraArgs: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the controller manager manifest.
Show example(s){{< highlight yaml >}} -image: k8s.gcr.io/kube-controller-manager:v1.25.0-beta.0 +image: k8s.gcr.io/kube-controller-manager:v1.25.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. | | @@ -1495,7 +1495,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-proxy:v1.25.0-beta.0 # The container image used in the kube-proxy manifest. +image: k8s.gcr.io/kube-proxy:v1.25.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: @@ -1512,7 +1512,7 @@ extraArgs: disabled: false {{< /highlight >}}
| | |`image` |string |The container image used in the kube-proxy manifest.
Show example(s){{< highlight yaml >}} -image: k8s.gcr.io/kube-proxy:v1.25.0-beta.0 +image: k8s.gcr.io/kube-proxy:v1.25.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. | | @@ -1530,7 +1530,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-scheduler:v1.25.0-beta.0 # The container image used in the scheduler manifest. +image: k8s.gcr.io/kube-scheduler:v1.25.0-rc.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1540,7 +1540,7 @@ extraArgs: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used in the scheduler manifest.
Show example(s){{< highlight yaml >}} -image: k8s.gcr.io/kube-scheduler:v1.25.0-beta.0 +image: k8s.gcr.io/kube-scheduler:v1.25.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. | |