Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.26] Backports for 2024-03 release cycle #9692

Merged
merged 22 commits into from
Mar 8, 2024
Merged

[release-1.26] Backports for 2024-03 release cycle #9692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9f048be
Rootless mode also bind service nodePort to host for LoadBalancer type
hinshun Feb 16, 2024
875eee9
Fix NodeHosts on dual-stack clusters
brandond Feb 27, 2024
ce5883c
Tweak netpol node wait logs
brandond Feb 27, 2024
1a568ed
Fix issue with etcd node name missing hostname
brandond Feb 16, 2024
3004d39
Bump helm-controller/klipper-helm versions
brandond Feb 29, 2024
73aa7f2
Fix additional corner cases in registries handling
brandond Feb 2, 2024
1a7297c
Clean up snapshotDir create/exists logic
brandond Feb 15, 2024
a41fc6a
Move snapshot-retention to EtcdSnapshotFlags in order to support load…
brandond Feb 15, 2024
53023d3
Use and version flannel/cni-plugin properly
brandond Mar 4, 2024
32d8d7f
Bump spegel to v0.0.18-k3s4
phillebaba Feb 6, 2024
e919faa
Add env var to allow spegel mirroring of `latest` tag
brandond Feb 29, 2024
e38ea22
Remove filtering of wildcard mirror entry
brandond Feb 29, 2024
aa6dced
Don't register embedded registry address as an upstream registry
brandond Mar 1, 2024
417f26f
fix: use correct wasm shims names
flavio Feb 16, 2024
fb655ee
e2e tests: cover WebAssembly integration
flavio Feb 20, 2024
ab7631e
Fix wildcard with embbeded registry test
vitorsavian Mar 5, 2024
996a477
Disable color outputs using RAW_OUTPUT env var
Feb 6, 2024
10f0dfd
Rename `RAW_OUTPUT` -> `NO_COLOR`
rishinair11 Feb 29, 2024
b363e6f
Update contrib/util/check-config.sh
rishinair11 Mar 2, 2024
462e50e
Include flannel version in flannel cni plugin version
brandond Mar 5, 2024
faff949
Bump metrics-server to v0.7.0
brandond Mar 7, 2024
8ba2aa1
Warn and suppress duplicate registry mirror endpoints
brandond Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions contrib/util/check-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ is_set_as_module() {
}

color() {
if [ -n "$NO_COLOR" ]; then
return
fi

codes=
if [ "$1" = 'bold' ]; then
codes=1
Expand Down
28 changes: 15 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ replace (
github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.12-k3s1
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78
github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.1
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
github.com/prometheus/common => github.com/prometheus/common v0.45.0
github.com/quic-go/qtls-go1-20 => github.com/quic-go/qtls-go1-20 v0.3.3
github.com/quic-go/quic-go => github.com/quic-go/quic-go v0.38.2
github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230807182002-35cb42e6a915
github.com/ugorji/go => github.com/ugorji/go v1.2.11
github.com/xenitab/spegel => github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330 // k3s-main
github.com/xenitab/spegel => github.com/k3s-io/spegel v0.0.18-k3s4 // k3s-main
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.9-k3s1
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.9-k3s1
go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.9-k3s1
Expand Down Expand Up @@ -98,7 +100,7 @@ require (
github.com/cloudnativelabs/kube-router/v2 v2.0.0-00010101000000-000000000000
github.com/containerd/aufs v1.0.0
github.com/containerd/cgroups/v3 v3.0.2
github.com/containerd/containerd v1.7.11
github.com/containerd/containerd v1.7.13
github.com/containerd/fuse-overlayfs-snapshotter v1.0.5
github.com/containerd/stargz-snapshotter v0.14.4-0.20230913082252-7275d45b185c
github.com/containerd/zfs v1.1.0
Expand All @@ -120,7 +122,7 @@ require (
github.com/ipfs/go-ds-leveldb v0.5.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/json-iterator/go v1.1.12
github.com/k3s-io/helm-controller v0.15.8
github.com/k3s-io/helm-controller v0.15.9
github.com/k3s-io/kine v0.11.4
github.com/klauspost/compress v1.17.2
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
Expand Down Expand Up @@ -156,8 +158,8 @@ require (
go.etcd.io/etcd/etcdutl/v3 v3.5.9
go.etcd.io/etcd/server/v3 v3.5.10
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.17.0
golang.org/x/net v0.19.0
golang.org/x/crypto v0.18.0
golang.org/x/net v0.20.0
golang.org/x/sync v0.6.0
golang.org/x/sys v0.16.0
google.golang.org/grpc v1.60.1
Expand Down Expand Up @@ -337,7 +339,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
Expand Down Expand Up @@ -394,7 +396,7 @@ require (
github.com/mrunalp/fileutils v0.5.1 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.12.0 // indirect
github.com/multiformats/go-multiaddr v0.12.2 // indirect
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
Expand Down Expand Up @@ -423,13 +425,13 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/polydawn/refmt v0.89.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
github.com/quic-go/quic-go v0.38.0 // indirect
github.com/quic-go/quic-go v0.38.2 // indirect
github.com/quic-go/webtransport-go v0.5.3 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rs/xid v1.5.0 // indirect
Expand Down Expand Up @@ -486,8 +488,8 @@ require (
golang.org/x/arch v0.3.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.14.0 // indirect
Expand All @@ -497,7 +499,7 @@ require (
google.golang.org/api v0.152.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/gcfg.v1 v1.2.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading
Loading