Skip to content

Commit

Permalink
feat: update Kubernetes to 1.23.0-rc.0
Browse files Browse the repository at this point in the history 
Still no proper tags for Kubernetes modules (known issue upstream).

Also bump dependencies.

Closes #4605 closes #4606

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
@smira
smira committed Nov 29, 2021
1 parent b824909 commit f314978
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 79 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ ARG TARGETARCH
RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /installer
RUN chmod +x /installer

FROM alpine:3.14.3 AS unicode-pf2
FROM alpine:3.15.0 AS unicode-pf2
RUN apk add --no-cache --update --no-scripts grub

FROM scratch AS install-artifacts-amd64
Expand All @@ -523,7 +523,7 @@ FROM install-artifacts-${INSTALLER_ARCH} AS install-artifacts
COPY --from=pkg-grub / /
COPY --from=unicode-pf2 /usr/share/grub/unicode.pf2 /usr/share/grub/unicode.pf2

FROM alpine:3.14.3 AS installer
FROM alpine:3.15.0 AS installer
RUN apk add --no-cache --update --no-scripts \
bash \
efibootmgr \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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.23.0-beta.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.23.0-rc.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
CLUSTERCTL_VERSION ?= 0.4.3
CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
TESTPKGS ?= github.com/talos-systems/talos/...
Expand Down
40 changes: 18 additions & 22 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ replace (
// Use nested module.
github.com/talos-systems/talos/pkg/machinery => ./pkg/machinery

// See https://github.com/vmware-tanzu/sonobuoy/issues/1520
// Remove when v0.55.1+ is released.
github.com/vmware-tanzu/sonobuoy v0.55.0 => github.com/vmware-tanzu/sonobuoy v1.11.5-prerelease.1.0.20211111171810-0e7f9c9059d6

// forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
// which are then encoded as a valid YAML blocks with proper indentiation
gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20210315173758-8fb30b8e5a5b
Expand All @@ -36,9 +32,9 @@ require (
github.com/AlekSi/pointer v1.2.0
github.com/BurntSushi/toml v0.4.1
github.com/beevik/ntp v0.3.0
github.com/cenkalti/backoff/v4 v4.1.1
github.com/cenkalti/backoff/v4 v4.1.2
github.com/containerd/cgroups v1.0.2
github.com/containerd/containerd v1.5.7
github.com/containerd/containerd v1.5.8
github.com/containerd/cri v1.19.0
github.com/containerd/go-cni v1.1.0
github.com/containerd/typeurl v1.0.2
Expand All @@ -48,11 +44,11 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/cosi-project/runtime v0.0.0-20210906201716-5cb7f5002d77
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.10+incompatible
github.com/docker/docker v20.10.11+incompatible
github.com/docker/go-connections v0.4.0
github.com/dustin/go-humanize v1.0.0
github.com/emicklei/dot v0.16.0
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/fatih/color v1.13.0
github.com/fsnotify/fsnotify v1.5.1
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
Expand Down Expand Up @@ -103,27 +99,28 @@ require (
github.com/talos-systems/talos/pkg/machinery v0.14.0-alpha.1.0.20211118180932-1ffa8e048008
github.com/u-root/u-root v7.0.0+incompatible
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
github.com/vmware-tanzu/sonobuoy v0.55.0
github.com/vmware/govmomi v0.27.1
github.com/vmware-tanzu/sonobuoy v0.55.1
github.com/vmware/govmomi v0.27.2
github.com/vmware/vmw-guestinfo v0.0.0-20211006225857-cc1fd90d572c
github.com/vultr/metadata v1.0.3
go.etcd.io/etcd/api/v3 v3.5.1
go.etcd.io/etcd/client/pkg/v3 v3.5.1
go.etcd.io/etcd/client/v3 v3.5.1
go.etcd.io/etcd/etcdutl/v3 v3.5.1
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.19.1
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211109202428-0073765f69ba
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211124212657-dd7407c86d22
google.golang.org/grpc v1.42.0
google.golang.org/protobuf v1.27.1
gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
kernel.org/pub/linux/libs/security/libcap/cap v1.2.60
kernel.org/pub/linux/libs/security/libcap/cap v1.2.61
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -139,7 +136,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/Microsoft/hcsshim v0.8.21 // indirect
github.com/Microsoft/hcsshim v0.8.23 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
Expand All @@ -155,7 +152,7 @@ require (
github.com/cilium/ebpf v0.7.0 // indirect
github.com/containerd/continuity v0.1.0 // indirect
github.com/containerd/fifo v1.0.0 // indirect
github.com/containerd/ttrpc v1.0.2 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down Expand Up @@ -271,21 +268,20 @@ require (
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/tools v0.1.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.zx2c4.com/wireguard v0.0.0-20211109020618-685490f568cf // indirect
golang.zx2c4.com/wireguard v0.0.0-20211123210315-387f7c461a16 // indirect
google.golang.org/api v0.44.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211112145013-271947fe86fd // indirect
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -295,7 +291,7 @@ require (
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.60 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.61 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/kustomize/api v0.8.11 // indirect
sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
Expand Down

0 comments on commit f314978

Please sign in to comment.