diff --git a/Makefile b/Makefile index 376f325e5..fea46d0cb 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.26.0-alpha.3/bin/$(OPERATING_SYSTEM)/amd64/kubectl +KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.26.0-beta.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 c5d7d8099..936a59059 100644 --- a/go.mod +++ b/go.mod @@ -17,14 +17,14 @@ replace ( // Kubernetes dependencies sharing the same version. require ( - k8s.io/api v0.26.0-alpha.3 - k8s.io/apimachinery v0.26.0-alpha.3 - k8s.io/apiserver v0.26.0-alpha.3 - k8s.io/client-go v0.26.0-alpha.3 - k8s.io/component-base v0.26.0-alpha.3 - k8s.io/cri-api v0.26.0-alpha.3 - k8s.io/kubectl v0.26.0-alpha.3 - k8s.io/kubelet v0.26.0-alpha.3 + k8s.io/api v0.26.0-beta.0 + k8s.io/apimachinery v0.26.0-beta.0 + k8s.io/apiserver v0.26.0-beta.0 + k8s.io/client-go v0.26.0-beta.0 + k8s.io/component-base v0.26.0-beta.0 + k8s.io/cri-api v0.26.0-beta.0 + k8s.io/kubectl v0.26.0-beta.0 + k8s.io/kubelet v0.26.0-beta.0 ) require ( @@ -231,7 +231,7 @@ require ( github.com/moby/spdystream v0.2.0 // indirect github.com/moby/sys/mountinfo v0.5.0 // indirect github.com/moby/sys/signal v0.6.0 // indirect - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect @@ -244,8 +244,8 @@ require ( github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect github.com/rivo/uniseg v0.4.2 // indirect @@ -290,10 +290,10 @@ require ( gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 // indirect - k8s.io/cli-runtime v0.26.0-alpha.3 // indirect + k8s.io/cli-runtime v0.26.0-beta.0 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect + k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect kernel.org/pub/linux/libs/security/libcap/psx v1.2.66 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect diff --git a/go.sum b/go.sum index 2318f55b9..e9ecedcae 100644 --- a/go.sum +++ b/go.sum @@ -815,8 +815,8 @@ github.com/moby/sys/signal v0.6.0 h1:aDpY94H8VlhTGa9sNYUFCFsMZIUh5wm0B6XkIoJj/iY github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -935,14 +935,15 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1736,37 +1737,37 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 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.26.0-alpha.3 h1:BDEgBeZMrDND/zz9qZ3lCt7Q+dl5F9RkZSG9zgZgVJE= -k8s.io/api v0.26.0-alpha.3/go.mod h1:aZAAOxt17tk0NlKqpw0CUdwZXV8QJ4PSOxh7ZkPq7+0= +k8s.io/api v0.26.0-beta.0 h1:ZAZ9dHpDUt++oG9VGtpaJIMrrCkms+wj0MAoSHtPQGQ= +k8s.io/api v0.26.0-beta.0/go.mod h1:gAldZu9jyeLw80k2Shz10ILfiSHDxdT+j3iJKeeeSzM= 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.26.0-alpha.3 h1:Tfo5DZs+FJEO5+VRDO2t5/GFPfDC96exqvux7QH5aNs= -k8s.io/apimachinery v0.26.0-alpha.3/go.mod h1:zSkBXgO5G/dSQOe256tx5Yo2OJytojpY3bsXu/4/ZJE= +k8s.io/apimachinery v0.26.0-beta.0 h1:msP5nt+xH4dfAcYRiZU57+SXUlTq1yH6/R4/WjgGqkU= +k8s.io/apimachinery v0.26.0-beta.0/go.mod h1:VXMmlsE7YRJ5vyAyWpkKIfFkEbDNpVs0ObpkuQf1WfM= 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.26.0-alpha.3 h1:dmpPHeKiYQd7/0U7wbohjkHrApfpr48Z9hiE/g640Ps= -k8s.io/apiserver v0.26.0-alpha.3/go.mod h1:U28GheTlpPGcBqzbF7fMrb9b+7dVt95AXAeYf+uneLA= -k8s.io/cli-runtime v0.26.0-alpha.3 h1:NrMkCfijSPK40/kExVMIpcDSxoA3g1hlETpBKCJ5+P8= -k8s.io/cli-runtime v0.26.0-alpha.3/go.mod h1:Zb0ZckuxZi3GdLQzWMBvw3JxUbxjYlOFoOVnbpz8DyE= +k8s.io/apiserver v0.26.0-beta.0 h1:eAiRGfGV3r74z63uyvk3ibqsNrL90khJ5wJ68dL7GV4= +k8s.io/apiserver v0.26.0-beta.0/go.mod h1:0zZe3zaNW59mEz9P3jTm0oHmZMQFDCuMO6JwcOYiY1w= +k8s.io/cli-runtime v0.26.0-beta.0 h1:xLaKtb1hiH1abPf8hh459OGrq+4O/9f1uhJcVlW7krI= +k8s.io/cli-runtime v0.26.0-beta.0/go.mod h1:bZj4eLQCbSGIBlVyrOuNhu0YrycxDTZo9mmAZ2cq0qw= 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.26.0-alpha.3 h1:3XWtCf3gWOnrTyuEZ32QSI8vZVqZuQI9CLtkYjmTZpY= -k8s.io/client-go v0.26.0-alpha.3/go.mod h1:zDKMziul3e15XShoRBGcoF9jp/V/QaauvDUhv8/0o7E= +k8s.io/client-go v0.26.0-beta.0 h1:bC2qzjf6rTTPW90D7appNv7IFk1EhmGPQs8DuMuIFNs= +k8s.io/client-go v0.26.0-beta.0/go.mod h1:64b6/SxUosWiyIU6fXuzdRSA62gBs50He6eDx0tZ6b0= 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.26.0-alpha.3 h1:zbYawCLVDrMQhMcxKZ0Z7h4OYRRY5QCxP/S3KR5oBn4= -k8s.io/component-base v0.26.0-alpha.3/go.mod h1:PjyV13TXUPcTZEqK63PUe5GLZsm8MsSelkRPJ7vBcqA= +k8s.io/component-base v0.26.0-beta.0 h1:Ln6fuwJjTdbNAWvUtCyE2b5gCvp1uXdbHxFhuZs67ls= +k8s.io/component-base v0.26.0-beta.0/go.mod h1:BsrAKmhP4kY5bP6st+vG1DNtQQMokjCsVvtjv+9FTR0= 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.26.0-alpha.3 h1:l4/zlUbphoQ2r4S0uhUi4GNHzUtaL1sNQcqb74ZoQdM= -k8s.io/cri-api v0.26.0-alpha.3/go.mod h1:E49tenyB7esgfIguEd7+g9qYhHOr9peyyBcSaeH6Gxw= +k8s.io/cri-api v0.26.0-beta.0 h1:mVt2/80VZy2dRN4mpVYJbPB9L/Zt/EvVev++zPTV9Tw= +k8s.io/cri-api v0.26.0-beta.0/go.mod h1:E49tenyB7esgfIguEd7+g9qYhHOr9peyyBcSaeH6Gxw= 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= @@ -1781,14 +1782,14 @@ 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-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kubectl v0.26.0-alpha.3 h1:Z88gjp0rGWDjyDa3UvdCKUmUXWieyWqxCntPclKBO5s= -k8s.io/kubectl v0.26.0-alpha.3/go.mod h1:CoWkcIMYfZhUIie9ECNgLPWJasAdOJn0avpG011ylyU= -k8s.io/kubelet v0.26.0-alpha.3 h1:gUwUK5kDCJYvRk96utqHwehTbxG5oPqvJ1BOV0PXEN8= -k8s.io/kubelet v0.26.0-alpha.3/go.mod h1:YyEXn9TG1FQlESNWpEN4GRtWaLgqvtKhV5Y1SY4jLPM= +k8s.io/kubectl v0.26.0-beta.0 h1:4YQCgjugkMd42XDWAMGBysMRFvqMBH0sYcVMcHsJELg= +k8s.io/kubectl v0.26.0-beta.0/go.mod h1:sO0MRK+3abZ2woI9FU0GDLcQS8NAoaMj8g4pqq9JoA8= +k8s.io/kubelet v0.26.0-beta.0 h1:MK2RBzDsr9NKNRBavJtmgAJgTP04PovdeFBXXnuHxv4= +k8s.io/kubelet v0.26.0-beta.0/go.mod h1:r7bvxutowxmUfcwCN66kRJGBnXJoVNQkWRgNa+Q2xRM= 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-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI= -k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kernel.org/pub/linux/libs/security/libcap/cap v1.2.66 h1:3P0DgIuplTGQ4dQdbBSVN0bALFZ4KtE1PndMh1SyEIM= kernel.org/pub/linux/libs/security/libcap/cap v1.2.66/go.mod h1:uBDKZw0kXu6ULhetpF19Z7izd74o3u0nO2dXIPQGmb0= kernel.org/pub/linux/libs/security/libcap/psx v1.2.66 h1:ikIhPzfkSSAEwBOU+2DWhoF+xnGUhvlMTfQjBVhvzQY= diff --git a/hack/release.toml b/hack/release.toml index 2efb21b62..e70922281 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -49,7 +49,7 @@ Refer to the docs at https://www.talos.dev/v1.3/talos-guides/install/single-boar [notes.updates] title = "Component Updates" description="""\ -* Kubernetes: v1.26.0-alpha.3 +* Kubernetes: v1.26.0-beta.0 * Flannel: v0.20.1 * CoreDNS: v1.10.0 * etcd: v3.5.5 diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index bde6b4430..a75445167 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.26.0-alpha.3} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.26.0-beta.0} export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}" export TIMEOUT=1200 diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go index e9f730aeb..4de86035e 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go @@ -39,7 +39,7 @@ import ( "github.com/siderolabs/go-retry/retry" clientv3 "go.etcd.io/etcd/client/v3" "golang.org/x/sys/unix" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "kernel.org/pub/linux/libs/security/libcap/cap" installer "github.com/siderolabs/talos/cmd/installer/pkg/install" diff --git a/internal/pkg/containers/cri/cri.go b/internal/pkg/containers/cri/cri.go index 78b71f2dd..22e53891f 100644 --- a/internal/pkg/containers/cri/cri.go +++ b/internal/pkg/containers/cri/cri.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" ctrs "github.com/siderolabs/talos/internal/pkg/containers" criclient "github.com/siderolabs/talos/internal/pkg/cri" diff --git a/internal/pkg/containers/cri/cri_test.go b/internal/pkg/containers/cri/cri_test.go index 6482a3795..08b2f3edf 100644 --- a/internal/pkg/containers/cri/cri_test.go +++ b/internal/pkg/containers/cri/cri_test.go @@ -17,7 +17,7 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/suite" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/siderolabs/talos/internal/app/machined/pkg/runtime/logging" "github.com/siderolabs/talos/internal/app/machined/pkg/system/events" diff --git a/internal/pkg/cri/client.go b/internal/pkg/cri/client.go index f100719ae..0912827d5 100644 --- a/internal/pkg/cri/client.go +++ b/internal/pkg/cri/client.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/siderolabs/talos/pkg/grpc/dialer" ) diff --git a/internal/pkg/cri/containers.go b/internal/pkg/cri/containers.go index c178cec98..b688730ee 100644 --- a/internal/pkg/cri/containers.go +++ b/internal/pkg/cri/containers.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" ) // CreateContainer creates a new container in the specified PodSandbox. diff --git a/internal/pkg/cri/cri_test.go b/internal/pkg/cri/cri_test.go index 2eb3bb6c1..b51afdf69 100644 --- a/internal/pkg/cri/cri_test.go +++ b/internal/pkg/cri/cri_test.go @@ -16,7 +16,7 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/suite" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/siderolabs/talos/internal/app/machined/pkg/runtime/logging" "github.com/siderolabs/talos/internal/app/machined/pkg/system/events" diff --git a/internal/pkg/cri/images.go b/internal/pkg/cri/images.go index 4dced165b..43c73761f 100644 --- a/internal/pkg/cri/images.go +++ b/internal/pkg/cri/images.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" ) // PullImage pulls container image. diff --git a/internal/pkg/cri/pods.go b/internal/pkg/cri/pods.go index 06741f943..be36552ab 100644 --- a/internal/pkg/cri/pods.go +++ b/internal/pkg/cri/pods.go @@ -12,7 +12,7 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" grpcstatus "google.golang.org/grpc/status" - runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/siderolabs/talos/pkg/machinery/constants" ) diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 0d8741b77..889d52231 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -290,7 +290,7 @@ const ( SeccompProfilesDirectory = "/var/lib/kubelet/seccomp/profiles" // DefaultKubernetesVersion is the default target version of the control plane. - DefaultKubernetesVersion = "1.26.0-alpha.3" + DefaultKubernetesVersion = "1.26.0-beta.0" // DefaultControlPlanePort is the default port to use for the control plane. DefaultControlPlanePort = 6443 diff --git a/website/content/v1.3/_index.md b/website/content/v1.3/_index.md index 307fea6c4..26136ae46 100644 --- a/website/content/v1.3/_index.md +++ b/website/content/v1.3/_index.md @@ -5,7 +5,7 @@ linkTitle: "Documentation" cascade: type: docs lastRelease: v1.3.0-alpha.1 -kubernetesRelease: "1.26.0-alpha.3" +kubernetesRelease: "1.26.0-beta.0" prevKubernetesRelease: "1.25.3" theilaRelease: "v0.2.1" nvidiaContainerToolkitRelease: "v1.10.0" diff --git a/website/content/v1.3/reference/cli.md b/website/content/v1.3/reference/cli.md index bd2058311..abbaff7e2 100644 --- a/website/content/v1.3/reference/cli.md +++ b/website/content/v1.3/reference/cli.md @@ -131,7 +131,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.26.0-alpha.3") + --kubernetes-version string desired kubernetes version to run (default "1.26.0-beta.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) @@ -1134,7 +1134,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.26.0-alpha.3") + --kubernetes-version string desired kubernetes version to run (default "1.26.0-beta.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: = @@ -2245,7 +2245,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.26.0-alpha.3") + --to string the Kubernetes control plane version to upgrade to (default "1.26.0-beta.0") --upgrade-kubelet upgrade kubelet service (default true) ``` diff --git a/website/content/v1.3/reference/configuration.md b/website/content/v1.3/reference/configuration.md index 88e0d9067..76bffaa44 100644 --- a/website/content/v1.3/reference/configuration.md +++ b/website/content/v1.3/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.26.0-alpha.3 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/siderolabs/kubelet:v1.26.0-beta.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 @@ -505,7 +505,7 @@ serviceAccount: {{< /highlight >}}
| | |`apiServer` |APIServerConfig |API server specific configuration options.
Show example(s){{< highlight yaml >}} apiServer: - image: k8s.gcr.io/kube-apiserver:v1.26.0-alpha.3 # The container image used in the API server manifest. + image: k8s.gcr.io/kube-apiserver:v1.26.0-beta.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -544,14 +544,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.26.0-alpha.3 # The container image used in the controller manager manifest. + image: k8s.gcr.io/kube-controller-manager:v1.26.0-beta.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.26.0-alpha.3 # The container image used in the kube-proxy manifest. + image: k8s.gcr.io/kube-proxy:v1.26.0-beta.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: @@ -562,7 +562,7 @@ proxy: {{< /highlight >}}
| | |`scheduler` |SchedulerConfig |Scheduler server specific configuration options.
Show example(s){{< highlight yaml >}} scheduler: - image: k8s.gcr.io/kube-scheduler:v1.26.0-alpha.3 # The container image used in the scheduler manifest. + image: k8s.gcr.io/kube-scheduler:v1.26.0-beta.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -727,7 +727,7 @@ Appears in: {{< highlight yaml >}} -image: ghcr.io/siderolabs/kubelet:v1.26.0-alpha.3 # The `image` field is an optional reference to an alternative kubelet image. +image: ghcr.io/siderolabs/kubelet:v1.26.0-beta.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 @@ -764,7 +764,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.26.0-alpha.3 +image: ghcr.io/siderolabs/kubelet:v1.26.0-beta.0 {{< /highlight >}}
| | |`clusterDNS` |[]string |The `ClusterDNS` field is an optional reference to an alternative kubelet clusterDNS ip list.
Show example(s){{< highlight yaml >}} clusterDNS: @@ -1362,7 +1362,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-apiserver:v1.26.0-alpha.3 # The container image used in the API server manifest. +image: k8s.gcr.io/kube-apiserver:v1.26.0-beta.0 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -1404,7 +1404,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.26.0-alpha.3 +image: k8s.gcr.io/kube-apiserver:v1.26.0-beta.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. | | @@ -1490,7 +1490,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-controller-manager:v1.26.0-alpha.3 # The container image used in the controller manager manifest. +image: k8s.gcr.io/kube-controller-manager:v1.26.0-beta.0 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -1500,7 +1500,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.26.0-alpha.3 +image: k8s.gcr.io/kube-controller-manager:v1.26.0-beta.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. | | @@ -1519,7 +1519,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-proxy:v1.26.0-alpha.3 # The container image used in the kube-proxy manifest. +image: k8s.gcr.io/kube-proxy:v1.26.0-beta.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: @@ -1536,7 +1536,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.26.0-alpha.3 +image: k8s.gcr.io/kube-proxy:v1.26.0-beta.0 {{< /highlight >}}
| | |`mode` |string |
proxy mode of kube-proxy.The default is 'iptables'.
| | |`extraArgs` |map[string]string |Extra arguments to supply to kube-proxy. | | @@ -1554,7 +1554,7 @@ Appears in: {{< highlight yaml >}} -image: k8s.gcr.io/kube-scheduler:v1.26.0-alpha.3 # The container image used in the scheduler manifest. +image: k8s.gcr.io/kube-scheduler:v1.26.0-beta.0 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1564,7 +1564,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.26.0-alpha.3 +image: k8s.gcr.io/kube-scheduler:v1.26.0-beta.0 {{< /highlight >}}
| | |`extraArgs` |map[string]string |Extra arguments to supply to the scheduler. | | |`extraVolumes` |[]VolumeMountConfig |Extra volumes to mount to the scheduler static pod. | |