mirror of
https://github.com/siderolabs/talos.git
synced 2025-10-08 22:21:16 +02:00
feat: update Kubernetes to v1.26.0-alpha.1
Talos 1.3.0 will ship with Kubernetes 1.26.0. See https://github.com/kubernetes/kubernetes/releases/tag/v1.26.0-alpha.1 Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov
parent
276d4175bb
commit
8b09bd4b04
2
Makefile
2
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.1/bin/$(OPERATING_SYSTEM)/amd64/kubectl
|
||||
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.26.0-alpha.1/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
|
||||
|
||||
37
go.mod
37
go.mod
@ -17,14 +17,14 @@ replace (
|
||||
|
||||
// Kubernetes dependencies sharing the same version.
|
||||
require (
|
||||
k8s.io/api v0.25.1
|
||||
k8s.io/apimachinery v0.25.1
|
||||
k8s.io/apiserver v0.25.1
|
||||
k8s.io/client-go v0.25.1
|
||||
k8s.io/component-base v0.25.1
|
||||
k8s.io/cri-api v0.25.1
|
||||
k8s.io/kubectl v0.25.1
|
||||
k8s.io/kubelet v0.25.1
|
||||
k8s.io/api v0.26.0-alpha.1
|
||||
k8s.io/apimachinery v0.26.0-alpha.1
|
||||
k8s.io/apiserver v0.26.0-alpha.1
|
||||
k8s.io/client-go v0.26.0-alpha.1
|
||||
k8s.io/component-base v0.26.0-alpha.1
|
||||
k8s.io/cri-api v0.26.0-alpha.1
|
||||
k8s.io/kubectl v0.26.0-alpha.1
|
||||
k8s.io/kubelet v0.26.0-alpha.1
|
||||
)
|
||||
|
||||
require (
|
||||
@ -141,12 +141,6 @@ require (
|
||||
cloud.google.com/go/iam v0.3.0 // indirect
|
||||
cloud.google.com/go/storage v1.26.0 // 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.27 // indirect
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.20 // 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 v1.0.0 // indirect
|
||||
github.com/Microsoft/go-winio v0.5.1 // indirect
|
||||
github.com/Microsoft/hcsshim v0.9.4 // indirect
|
||||
@ -171,7 +165,7 @@ 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/emicklei/go-restful/v3 v3.9.0 // indirect
|
||||
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
|
||||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
|
||||
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
|
||||
@ -185,7 +179,6 @@ require (
|
||||
github.com/go-openapi/swag v0.19.14 // indirect
|
||||
github.com/gogo/googleapis v1.4.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/google/btree v1.0.1 // indirect
|
||||
@ -243,9 +236,9 @@ require (
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/prometheus/client_golang v1.12.1 // indirect
|
||||
github.com/prometheus/client_golang v1.13.0 // indirect
|
||||
github.com/prometheus/client_model v0.2.0 // indirect
|
||||
github.com/prometheus/common v0.32.1 // 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
|
||||
github.com/russross/blackfriday v1.5.2 // indirect
|
||||
@ -270,9 +263,9 @@ require (
|
||||
go.etcd.io/etcd/raft/v3 v3.5.5 // indirect
|
||||
go.etcd.io/etcd/server/v3 v3.5.5 // indirect
|
||||
go.opencensus.io v0.23.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
|
||||
go.opentelemetry.io/otel v1.3.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.3.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
|
||||
go.opentelemetry.io/otel v1.10.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.10.0 // indirect
|
||||
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
|
||||
go.uber.org/multierr v1.8.0 // indirect
|
||||
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
|
||||
@ -291,7 +284,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.1 // indirect
|
||||
k8s.io/cli-runtime v0.26.0-alpha.1 // 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
|
||||
|
||||
82
go.sum
82
go.sum
@ -69,26 +69,14 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX
|
||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
|
||||
github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
|
||||
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
|
||||
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
|
||||
github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
|
||||
github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=
|
||||
github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
|
||||
github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
|
||||
github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU=
|
||||
github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
|
||||
github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
|
||||
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
|
||||
github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
|
||||
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
|
||||
@ -398,8 +386,8 @@ github.com/emicklei/dot v1.0.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6
|
||||
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
|
||||
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw=
|
||||
github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
|
||||
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
|
||||
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
@ -453,17 +441,17 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
|
||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
|
||||
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
|
||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
|
||||
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
||||
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
|
||||
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
|
||||
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
|
||||
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
|
||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||
github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
|
||||
@ -503,9 +491,6 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
|
||||
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
|
||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
||||
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
|
||||
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
|
||||
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
@ -904,7 +889,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
|
||||
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
|
||||
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
|
||||
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
|
||||
github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
|
||||
github.com/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI=
|
||||
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
|
||||
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
|
||||
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
@ -979,8 +964,9 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ
|
||||
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
|
||||
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 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
|
||||
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_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=
|
||||
@ -994,8 +980,9 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
|
||||
github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
|
||||
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
||||
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
|
||||
github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
|
||||
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
|
||||
github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
|
||||
github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
|
||||
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
@ -1239,17 +1226,17 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
|
||||
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
|
||||
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 h1:Ky1MObd188aGbgb5OgNnwGuEEwI9MVIcc7rBW6zk5Ak=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
|
||||
go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
|
||||
go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y=
|
||||
go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
|
||||
go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4=
|
||||
go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ=
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw=
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk=
|
||||
go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI=
|
||||
go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
|
||||
go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY=
|
||||
go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
|
||||
go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E=
|
||||
go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM=
|
||||
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
|
||||
go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg=
|
||||
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
|
||||
@ -1292,8 +1279,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
|
||||
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
|
||||
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
@ -1840,7 +1825,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
|
||||
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
|
||||
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
|
||||
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
|
||||
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
||||
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
||||
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
|
||||
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
|
||||
@ -1920,37 +1904,37 @@ inet.af/netaddr v0.0.0-20220811202034-502d2d690317/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.1 h1:yL7du50yc93k17nH/Xe9jujAYrcDkI/i5DL1jPz4E3M=
|
||||
k8s.io/api v0.25.1/go.mod h1:hh4itDvrWSJsmeUc28rIFNri8MatNAAxJjKcQmhX6TU=
|
||||
k8s.io/api v0.26.0-alpha.1 h1:0uaX04eLS9dwIcuWgRvu+WoB63hXFdc9s8fSeR6C1PI=
|
||||
k8s.io/api v0.26.0-alpha.1/go.mod h1:snuTxVDYyZ0s0Ftc/3Cvl8jZ9zLPDn7PQliEqn93Rrs=
|
||||
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.1 h1:t0XrnmCEHVgJlR2arwO8Awp9ylluDic706WePaYCBTI=
|
||||
k8s.io/apimachinery v0.25.1/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA=
|
||||
k8s.io/apimachinery v0.26.0-alpha.1 h1:9ZD9i3tISdlxc18MpS3SGc3Hlsyqtkf8/FeRucTfUTI=
|
||||
k8s.io/apimachinery v0.26.0-alpha.1/go.mod h1:YxcSfgHt+jqvurbA0MLOvpo1OlrnkzW3sZTxMu+hrgI=
|
||||
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.1 h1:A3gnoQL6lhqRiwWN6f2DGBGdCb+7brCSTrW3klR9Xwc=
|
||||
k8s.io/apiserver v0.25.1/go.mod h1:IB1EhM28U3cCrV+VNC06p1/YSZMCNYiH+P5sI5yLaZY=
|
||||
k8s.io/cli-runtime v0.25.1 h1:AtaruGux+ECpq2c0uWhYIpRlcI3aa8N7yTe6S2y72Fo=
|
||||
k8s.io/cli-runtime v0.25.1/go.mod h1:JSzAcqIK3JK7Ab/TY0PENKhmEg/HboNWK3VKiwsYB6E=
|
||||
k8s.io/apiserver v0.26.0-alpha.1 h1:H+sMw9G3sSdIqBW3073t6nCLyRLHNS5FGf0x4SzIbWg=
|
||||
k8s.io/apiserver v0.26.0-alpha.1/go.mod h1:0RiEsxN/so19KoQgF0qlb12q1auGiyIZx9aNQc7M8UU=
|
||||
k8s.io/cli-runtime v0.26.0-alpha.1 h1:+OwfMQV5o/3IqIiQbXD2CdiVvwmgTnX9zSqdgiPmj5g=
|
||||
k8s.io/cli-runtime v0.26.0-alpha.1/go.mod h1:ygRpos+mpuJDoHYLKBK8+S2csIhZbc9m6kk51y88W/c=
|
||||
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.1 h1:uFj4AJKtE1/ckcSKz8IhgAuZTdRXZDKev8g387ndD58=
|
||||
k8s.io/client-go v0.25.1/go.mod h1:rdFWTLV/uj2C74zGbQzOsmXPUtMAjSf7ajil4iJUNKo=
|
||||
k8s.io/client-go v0.26.0-alpha.1 h1:aTgsWuSi6bwEbh2qYzvcfa25CDNaB6KKHMgittG6z6A=
|
||||
k8s.io/client-go v0.26.0-alpha.1/go.mod h1:8LBK5Q9ctG2DXoyBhrohiw+cWMhHT49ixDitQvOF8V4=
|
||||
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.1 h1:Wmj33QwddVwsJFJWmXlf24Nu8do2bGHLabXHrKz7Org=
|
||||
k8s.io/component-base v0.25.1/go.mod h1:j78+TFdsKM8RXHfM88oeAdZu2v9qMZdQZOfg0LGW+q4=
|
||||
k8s.io/component-base v0.26.0-alpha.1 h1:FF38n6FV9llwNQpDB4GpToPMG1cEYdStcN27UL/thSk=
|
||||
k8s.io/component-base v0.26.0-alpha.1/go.mod h1:o8nI6R1SwAgvNllHlVnSu9ossz8hWa0h4RZ4tnVicYc=
|
||||
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.1 h1:Bwc2stfsK8KWs3wvHmc4IDCGB2PIFGcl5yfvl4yXciA=
|
||||
k8s.io/cri-api v0.25.1/go.mod h1:LFvFRFKuO7cFzrcmLle/cwnuVMgoIZ6bMQ+jrzk24Yc=
|
||||
k8s.io/cri-api v0.26.0-alpha.1 h1:Yew44uPC8GtVSheZsLPLJHHSevINCWvLwuw0Mz3SA8I=
|
||||
k8s.io/cri-api v0.26.0-alpha.1/go.mod h1:7UeZMreKl45xL4WUcz40IeIpqHd9+75ONk5rH/niMgQ=
|
||||
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=
|
||||
@ -1965,10 +1949,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.1 h1:M488FUhCMLugm5+kACkDMlldaOz0yLzYpQzUvUP+nDE=
|
||||
k8s.io/kubectl v0.25.1/go.mod h1:ki8ymtGZau2M1lloUV2fqMxP9UCX/i0WIhnWTfqsGSY=
|
||||
k8s.io/kubelet v0.25.1 h1:FBGOmIM4qR4Ov+RU90VXnxO/hvvniUMTGUriVOa9FfY=
|
||||
k8s.io/kubelet v0.25.1/go.mod h1:mXo8HjxCrwVduGBk4tzuhegJYPvNwPyycRf39H4KKqE=
|
||||
k8s.io/kubectl v0.26.0-alpha.1 h1:9wicOvUM2Iai3UaD/mWZ+aGCK9ljYpzrkGrmHLKv+Tw=
|
||||
k8s.io/kubectl v0.26.0-alpha.1/go.mod h1:6ASYuT5sxm/JBrRwQ99tE14r/6K27AHxutQIP/Ah5uk=
|
||||
k8s.io/kubelet v0.26.0-alpha.1 h1:CckxuQRI5gFIM5QZG24P9h+BxFbJMvPiwCtqwhAXlWU=
|
||||
k8s.io/kubelet v0.26.0-alpha.1/go.mod h1:c7y4ZuPUDTIxN8LP8uq/FIJU2DZHL1AtazMp5IiLZ7I=
|
||||
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=
|
||||
|
||||
@ -41,7 +41,7 @@ Talos now supports the Nano Pi R4S SBC.
|
||||
[notes.updates]
|
||||
title = "Component Updates"
|
||||
description="""\
|
||||
* Kubernetes: v1.25.1
|
||||
* Kubernetes: v1.26.0-alpha.1
|
||||
* Flannel: v0.19.2
|
||||
* CoreDNS: v1.10.0
|
||||
* etcd: v3.5.5
|
||||
|
||||
@ -30,7 +30,7 @@ export TALOS_VERSION=v1.1
|
||||
# Kubernetes
|
||||
|
||||
export KUBECONFIG="${TMP}/kubeconfig"
|
||||
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.25.1}
|
||||
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.26.0-alpha.1}
|
||||
|
||||
export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
|
||||
export TIMEOUT=1200
|
||||
|
||||
@ -68,6 +68,7 @@ func (ctrl *KubernetesPullController) Run(ctx context.Context, r controller.Runt
|
||||
kubernetesRegistry *registry.Kubernetes
|
||||
watchCtxCancel context.CancelFunc
|
||||
notifyCh <-chan struct{}
|
||||
notifyCloser func()
|
||||
)
|
||||
|
||||
defer func() {
|
||||
@ -75,6 +76,10 @@ func (ctrl *KubernetesPullController) Run(ctx context.Context, r controller.Runt
|
||||
watchCtxCancel()
|
||||
}
|
||||
|
||||
if notifyCloser != nil {
|
||||
notifyCloser()
|
||||
}
|
||||
|
||||
if kubernetesClient != nil {
|
||||
kubernetesClient.Close() //nolint:errcheck
|
||||
}
|
||||
@ -134,7 +139,7 @@ func (ctrl *KubernetesPullController) Run(ctx context.Context, r controller.Runt
|
||||
var watchCtx context.Context
|
||||
watchCtx, watchCtxCancel = context.WithCancel(ctx) //nolint:govet
|
||||
|
||||
notifyCh, err = kubernetesRegistry.Watch(watchCtx, logger)
|
||||
notifyCh, notifyCloser, err = kubernetesRegistry.Watch(watchCtx, logger)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error setting up registry watcher: %w", err) //nolint:govet
|
||||
}
|
||||
|
||||
@ -239,7 +239,16 @@ func (ctrl *EndpointController) watchKubernetesEndpoint(ctx context.Context, r c
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
defer cancel()
|
||||
|
||||
notifyCh := kubernetesEndpointWatcher(ctx, logger, client)
|
||||
notifyCh, watchCloser, err := kubernetesEndpointWatcher(ctx, logger, client)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error watching Kubernetes endpoint: %w", err)
|
||||
}
|
||||
|
||||
defer func() {
|
||||
cancel() // cancel the context before stopping the watcher
|
||||
|
||||
watchCloser()
|
||||
}()
|
||||
|
||||
for {
|
||||
select {
|
||||
@ -258,7 +267,7 @@ func (ctrl *EndpointController) watchKubernetesEndpoint(ctx context.Context, r c
|
||||
}
|
||||
}
|
||||
|
||||
func kubernetesEndpointWatcher(ctx context.Context, logger *zap.Logger, client *kubernetes.Client) chan *corev1.Endpoints {
|
||||
func kubernetesEndpointWatcher(ctx context.Context, logger *zap.Logger, client *kubernetes.Client) (chan *corev1.Endpoints, func(), error) {
|
||||
informerFactory := informers.NewSharedInformerFactoryWithOptions(
|
||||
client.Clientset, 30*time.Second,
|
||||
informers.WithNamespace(corev1.NamespaceDefault),
|
||||
@ -270,16 +279,22 @@ func kubernetesEndpointWatcher(ctx context.Context, logger *zap.Logger, client *
|
||||
notifyCh := make(chan *corev1.Endpoints, 1)
|
||||
|
||||
informer := informerFactory.Core().V1().Endpoints().Informer()
|
||||
informer.SetWatchErrorHandler(func(r *cache.Reflector, err error) { //nolint:errcheck
|
||||
|
||||
if err := informer.SetWatchErrorHandler(func(r *cache.Reflector, err error) {
|
||||
logger.Error("kubernetes endpoint watch error", zap.Error(err))
|
||||
})
|
||||
informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
}); err != nil {
|
||||
return nil, nil, fmt.Errorf("error setting watch error handler: %w", err)
|
||||
}
|
||||
|
||||
if _, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
AddFunc: func(obj interface{}) { notifyCh <- obj.(*corev1.Endpoints) },
|
||||
DeleteFunc: func(_ interface{}) { notifyCh <- &corev1.Endpoints{} },
|
||||
UpdateFunc: func(_, obj interface{}) { notifyCh <- obj.(*corev1.Endpoints) },
|
||||
})
|
||||
}); err != nil {
|
||||
return nil, nil, fmt.Errorf("error adding watch event handler: %w", err)
|
||||
}
|
||||
|
||||
informerFactory.Start(ctx.Done())
|
||||
|
||||
return notifyCh
|
||||
return notifyCh, informerFactory.Shutdown, nil
|
||||
}
|
||||
|
||||
@ -173,14 +173,16 @@ func NewCRDController(
|
||||
secretsLister: secrets.Lister(),
|
||||
}
|
||||
|
||||
informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
if _, err = informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
AddFunc: controller.enqueueTalosSA,
|
||||
UpdateFunc: func(oldTalosSA, newTalosSA interface{}) {
|
||||
controller.enqueueTalosSA(newTalosSA)
|
||||
},
|
||||
})
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
secrets.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
if _, err = secrets.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
AddFunc: controller.handleSecret,
|
||||
UpdateFunc: func(oldSec, newSec interface{}) {
|
||||
newSecret := newSec.(*corev1.Secret) //nolint:errcheck
|
||||
@ -193,7 +195,9 @@ func NewCRDController(
|
||||
controller.handleSecret(newSec)
|
||||
},
|
||||
DeleteFunc: controller.handleSecret,
|
||||
})
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &controller, nil
|
||||
}
|
||||
@ -238,6 +242,8 @@ func (t *CRDController) Run(ctx context.Context, workers int) error {
|
||||
|
||||
t.logger.Debug("shutting down workers")
|
||||
|
||||
t.kubeInformerFactory.Shutdown()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@ -247,7 +247,7 @@ func (r *Kubernetes) List(localNodeName string) ([]*cluster.AffiliateSpec, error
|
||||
}
|
||||
|
||||
// Watch starts watching Node state and notifies on updates via notify channel.
|
||||
func (r *Kubernetes) Watch(ctx context.Context, logger *zap.Logger) (<-chan struct{}, error) {
|
||||
func (r *Kubernetes) Watch(ctx context.Context, logger *zap.Logger) (<-chan struct{}, func(), error) {
|
||||
informerFactory := informers.NewSharedInformerFactory(r.client.Clientset, 30*time.Second)
|
||||
|
||||
notifyCh := make(chan struct{}, 1)
|
||||
@ -260,16 +260,22 @@ func (r *Kubernetes) Watch(ctx context.Context, logger *zap.Logger) (<-chan stru
|
||||
}
|
||||
|
||||
r.nodes = informerFactory.Core().V1().Nodes()
|
||||
r.nodes.Informer().SetWatchErrorHandler(func(r *cache.Reflector, err error) { //nolint:errcheck
|
||||
|
||||
if err := r.nodes.Informer().SetWatchErrorHandler(func(r *cache.Reflector, err error) {
|
||||
logger.Error("kubernetes registry node watch error", zap.Error(err))
|
||||
})
|
||||
r.nodes.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
}); err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to set watch error handler: %w", err)
|
||||
}
|
||||
|
||||
if _, err := r.nodes.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
AddFunc: notify,
|
||||
DeleteFunc: notify,
|
||||
UpdateFunc: func(_, _ interface{}) { notify(nil) },
|
||||
})
|
||||
}); err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to add event handler: %w", err)
|
||||
}
|
||||
|
||||
informerFactory.Start(ctx.Done())
|
||||
|
||||
return notifyCh, nil
|
||||
return notifyCh, informerFactory.Shutdown, nil
|
||||
}
|
||||
|
||||
@ -69,6 +69,11 @@ var deprecations = map[string][]string{
|
||||
"podsecuritypolicies.v1beta1.policy",
|
||||
"runtimeclasses.v1beta1.node.k8s.io",
|
||||
},
|
||||
"1.25->1.26": {
|
||||
"flowschemas.v1beta1.flowcontrol.apiserver.k8s.io",
|
||||
"prioritylevelconfigurations.v1beta1.flowcontrol.apiserver.k8s.io",
|
||||
"horizontalpodautoscalers.v2beta2.autoscaling",
|
||||
},
|
||||
}
|
||||
|
||||
// UpgradeTalosManaged the Kubernetes control plane.
|
||||
@ -94,6 +99,8 @@ func UpgradeTalosManaged(ctx context.Context, cluster UpgradeProvider, options U
|
||||
case "1.24->1.24":
|
||||
case "1.24->1.25":
|
||||
case "1.25->1.25":
|
||||
case "1.25->1.26":
|
||||
case "1.26->1.26":
|
||||
|
||||
default:
|
||||
return fmt.Errorf("unsupported upgrade path %q (from %q to %q)", path, options.FromVersion, options.ToVersion)
|
||||
|
||||
@ -287,7 +287,7 @@ const (
|
||||
SeccompProfilesDirectory = "/var/lib/kubelet/seccomp/profiles"
|
||||
|
||||
// DefaultKubernetesVersion is the default target version of the control plane.
|
||||
DefaultKubernetesVersion = "1.25.1"
|
||||
DefaultKubernetesVersion = "1.26.0-alpha.1"
|
||||
|
||||
// DefaultControlPlanePort is the default port to use for the control plane.
|
||||
DefaultControlPlanePort = 6443
|
||||
|
||||
@ -4,8 +4,8 @@ no_list: true
|
||||
linkTitle: "Documentation"
|
||||
cascade:
|
||||
type: docs
|
||||
lastRelease: v1.2.2
|
||||
kubernetesRelease: "1.25.0"
|
||||
lastRelease: v1.2.3
|
||||
kubernetesRelease: "1.25.1"
|
||||
prevKubernetesRelease: "1.24.3"
|
||||
theilaRelease: "v0.2.1"
|
||||
nvidiaContainerToolkitRelease: "v1.10.0"
|
||||
|
||||
@ -5,8 +5,8 @@ linkTitle: "Documentation"
|
||||
cascade:
|
||||
type: docs
|
||||
lastRelease: v1.3.0-alpha.0
|
||||
kubernetesRelease: "1.25.1"
|
||||
prevKubernetesRelease: "1.25.0"
|
||||
kubernetesRelease: "1.26.0-alpha.1"
|
||||
prevKubernetesRelease: "1.25.1"
|
||||
theilaRelease: "v0.2.1"
|
||||
nvidiaContainerToolkitRelease: "v1.10.0"
|
||||
nvidiaDriverRelease: "515.65.01"
|
||||
|
||||
@ -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.25.1")
|
||||
--kubernetes-version string desired kubernetes version to run (default "1.26.0-alpha.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)
|
||||
--mtu int MTU of the cluster network (default 1500)
|
||||
@ -1133,7 +1133,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.25.1")
|
||||
--kubernetes-version string desired kubernetes version to run (default "1.26.0-alpha.1")
|
||||
-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>
|
||||
@ -2239,7 +2239,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.1")
|
||||
--to string the Kubernetes control plane version to upgrade to (default "1.26.0-alpha.1")
|
||||
--upgrade-kubelet upgrade kubelet service (default true)
|
||||
```
|
||||
|
||||
|
||||
@ -102,7 +102,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.25.1 # The `image` field is an optional reference to an alternative kubelet image.
|
||||
image: ghcr.io/siderolabs/kubelet:v1.26.0-alpha.1 # 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 >}}</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.25.1 # The container image used in the API server manifest.
|
||||
image: k8s.gcr.io/kube-apiserver:v1.26.0-alpha.1 # 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 >}}</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.25.1 # The container image used in the controller manager manifest.
|
||||
image: k8s.gcr.io/kube-controller-manager:v1.26.0-alpha.1 # 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.25.1 # The container image used in the kube-proxy manifest.
|
||||
image: k8s.gcr.io/kube-proxy:v1.26.0-alpha.1 # 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 >}}</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.25.1 # The container image used in the scheduler manifest.
|
||||
image: k8s.gcr.io/kube-scheduler:v1.26.0-alpha.1 # The container image used in the scheduler manifest.
|
||||
# Extra arguments to supply to the scheduler.
|
||||
extraArgs:
|
||||
feature-gates: AllBeta=true
|
||||
@ -719,7 +719,7 @@ Appears in:
|
||||
|
||||
|
||||
{{< highlight yaml >}}
|
||||
image: ghcr.io/siderolabs/kubelet:v1.25.1 # The `image` field is an optional reference to an alternative kubelet image.
|
||||
image: ghcr.io/siderolabs/kubelet:v1.26.0-alpha.1 # 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
|
||||
@ -756,7 +756,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.25.1
|
||||
image: ghcr.io/siderolabs/kubelet:v1.26.0-alpha.1
|
||||
{{< /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:
|
||||
@ -1353,7 +1353,7 @@ Appears in:
|
||||
|
||||
|
||||
{{< highlight yaml >}}
|
||||
image: k8s.gcr.io/kube-apiserver:v1.25.1 # The container image used in the API server manifest.
|
||||
image: k8s.gcr.io/kube-apiserver:v1.26.0-alpha.1 # The container image used in the API server manifest.
|
||||
# Extra arguments to supply to the API server.
|
||||
extraArgs:
|
||||
feature-gates: ServerSideApply=true
|
||||
@ -1388,7 +1388,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.25.1
|
||||
image: k8s.gcr.io/kube-apiserver:v1.26.0-alpha.1
|
||||
{{< /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. | |
|
||||
@ -1467,7 +1467,7 @@ Appears in:
|
||||
|
||||
|
||||
{{< highlight yaml >}}
|
||||
image: k8s.gcr.io/kube-controller-manager:v1.25.1 # The container image used in the controller manager manifest.
|
||||
image: k8s.gcr.io/kube-controller-manager:v1.26.0-alpha.1 # The container image used in the controller manager manifest.
|
||||
# Extra arguments to supply to the controller manager.
|
||||
extraArgs:
|
||||
feature-gates: ServerSideApply=true
|
||||
@ -1477,7 +1477,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.25.1
|
||||
image: k8s.gcr.io/kube-controller-manager:v1.26.0-alpha.1
|
||||
{{< /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. | |
|
||||
@ -1496,7 +1496,7 @@ Appears in:
|
||||
|
||||
|
||||
{{< highlight yaml >}}
|
||||
image: k8s.gcr.io/kube-proxy:v1.25.1 # The container image used in the kube-proxy manifest.
|
||||
image: k8s.gcr.io/kube-proxy:v1.26.0-alpha.1 # The container image used in the kube-proxy manifest.
|
||||
mode: ipvs # proxy mode of kube-proxy.
|
||||
# Extra arguments to supply to kube-proxy.
|
||||
extraArgs:
|
||||
@ -1513,7 +1513,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.25.1
|
||||
image: k8s.gcr.io/kube-proxy:v1.26.0-alpha.1
|
||||
{{< /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. | |
|
||||
@ -1531,7 +1531,7 @@ Appears in:
|
||||
|
||||
|
||||
{{< highlight yaml >}}
|
||||
image: k8s.gcr.io/kube-scheduler:v1.25.1 # The container image used in the scheduler manifest.
|
||||
image: k8s.gcr.io/kube-scheduler:v1.26.0-alpha.1 # The container image used in the scheduler manifest.
|
||||
# Extra arguments to supply to the scheduler.
|
||||
extraArgs:
|
||||
feature-gates: AllBeta=true
|
||||
@ -1541,7 +1541,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.25.1
|
||||
image: k8s.gcr.io/kube-scheduler:v1.26.0-alpha.1
|
||||
{{< /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. | |
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user