Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[release-1.32] Backports for 2025-03 #11919

Merged
merged 14 commits into from
Mar 7, 2025
Merged

[release-1.32] Backports for 2025-03 #11919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e16c93
Add static bin dir support to k3s docker image
brandond Feb 13, 2025
665ff1c
Add etcd snapshot metrics
brandond Feb 14, 2025
b386b12
fix: move CONFIG_SECCOMP to generally necessary category in check-con…
someshbhalsing Feb 17, 2025
35b58aa
Move CR APIs to k3s-io/api
brandond Feb 21, 2025
0ece100
Serve HTTP bootstrap data from datastore before disk
brandond Feb 25, 2025
467d0da
Use existing server-CA and hash if available
brandond Feb 25, 2025
cbee0a6
Use etcd proxy to bootstrap control-plane-only nodes, if possible
brandond Feb 26, 2025
e15446e
Fix panic when secret-encrypt status is checked before runtime core i…
brandond Feb 26, 2025
b5254a9
Add netfilter statistic module to check-config
anders-larsson Feb 28, 2025
80bbb3c
Bump to containerd v2.0.3/runc v1.2.5
brandond Feb 28, 2025
31f2b5e
Avoid use of github.com/pkg/errors functions that capture stack
brandond Mar 4, 2025
34865aa
Add periodic background snapshot reconcile
brandond Mar 4, 2025
4d679e3
Bump etcd to v3.5.19
brandond Mar 6, 2025
4407202
Fix flaky rootless E2E test
dereknola Mar 6, 2025
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
5 changes: 3 additions & 2 deletions cmd/k3s/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"bytes"
"context"
"errors"
"io"
"io/fs"
"os"
Expand All @@ -20,7 +21,7 @@ import (
"github.com/k3s-io/k3s/pkg/flock"
"github.com/k3s-io/k3s/pkg/untar"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors"
pkgerrors "github.com/pkg/errors"
"github.com/rancher/wrangler/v3/pkg/resolvehome"
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"
Expand Down Expand Up @@ -207,7 +208,7 @@ func stageAndRunCLI(cli *cli.Context, cmd string, dataDir string, args []string)
func stageAndRun(dataDir, cmd string, args []string, calledAsInternal bool) error {
dir, err := extract(dataDir)
if err != nil {
return errors.Wrap(err, "extracting data")
return pkgerrors.WithMessage(err, "extracting data")
}
logrus.Debugf("Asset dir %s", dir)

Expand Down
4 changes: 2 additions & 2 deletions cmd/k3s/main_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"os"
"syscall"

"github.com/pkg/errors"
pkgerrors "github.com/pkg/errors"
)

const programPostfix = ""

func runExec(cmd string, args []string, calledAsInternal bool) (err error) {
if err := syscall.Exec(cmd, args, os.Environ()); err != nil {
return errors.Wrapf(err, "exec %s failed", cmd)
return pkgerrors.WithMessagef(err, "exec %s failed", cmd)
}
return nil
}
7 changes: 2 additions & 5 deletions contrib/util/check-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,10 @@ fi
flags="
NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
CGROUPS CGROUP_PIDS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
KEYS
SECCOMP KEYS
VETH BRIDGE BRIDGE_NETFILTER
IP_NF_FILTER IP_NF_TARGET_MASQUERADE IP_NF_TARGET_REJECT
NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NETFILTER_XT_MATCH_IPVS NETFILTER_XT_MATCH_COMMENT NETFILTER_XT_MATCH_MULTIPORT
NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NETFILTER_XT_MATCH_IPVS NETFILTER_XT_MATCH_COMMENT NETFILTER_XT_MATCH_MULTIPORT NETFILTER_XT_MATCH_STATISTIC
IP_NF_NAT NF_NAT
POSIX_MQUEUE
"
Expand All @@ -406,9 +406,6 @@ echo 'Optional Features:'
check_flags USER_NS
check_distro_userns
}
{
check_flags SECCOMP
}
# {
# check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED
# if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then
Expand Down
60 changes: 28 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ replace (
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.15-k3s1.32-1 // v1.32.0-k3s1
github.com/cilium/ebpf => github.com/cilium/ebpf v0.12.3
github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.2.1
github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.23-k3s2
github.com/containerd/containerd/api => github.com/containerd/containerd/api v1.8.0
github.com/containerd/containerd/v2 => github.com/k3s-io/containerd/v2 v2.0.2-k3s2
github.com/containerd/containerd/v2 => github.com/k3s-io/containerd/v2 v2.0.3-k3s1
github.com/containerd/imgcrypt => github.com/containerd/imgcrypt v1.1.11
github.com/distribution/reference => github.com/distribution/reference v0.5.0
github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible
Expand All @@ -19,20 +18,19 @@ replace (
github.com/google/cadvisor => github.com/k3s-io/cadvisor v0.51.0-k3s1
github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0
github.com/open-policy-agent/opa => github.com/open-policy-agent/opa v0.59.0 // github.com/Microsoft/hcsshim using bad version v0.42.2
github.com/opencontainers/runc => github.com/k3s-io/runc v1.2.4-k3s1
github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.11.0
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.19.1
github.com/prometheus/common => github.com/prometheus/common v0.55.0
github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.0.30-k3s1
github.com/ugorji/go => github.com/ugorji/go v1.2.11
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.18-k3s1
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.18-k3s1
go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.18-k3s1
go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.18-k3s1
go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.18-k3s1
go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.5.18-k3s1
go.etcd.io/etcd/raft/v3 => github.com/k3s-io/etcd/raft/v3 v3.5.18-k3s1
go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.18-k3s1
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.19-k3s1
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.19-k3s1
go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.19-k3s1
go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.19-k3s1
go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.19-k3s1
go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.5.19-k3s1
go.etcd.io/etcd/raft/v3 => github.com/k3s-io/etcd/raft/v3 v3.5.19-k3s1
go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.19-k3s1
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0
golang.org/x/crypto => golang.org/x/crypto v0.24.0
golang.org/x/net => golang.org/x/net v0.26.0
Expand Down Expand Up @@ -112,6 +110,7 @@ require (
github.com/ipfs/go-log/v2 v2.5.1
github.com/joho/godotenv v1.5.1
github.com/json-iterator/go v1.1.12
github.com/k3s-io/api v0.1.0
github.com/k3s-io/helm-controller v0.16.6
github.com/k3s-io/kine v0.13.9
github.com/klauspost/compress v1.17.11
Expand All @@ -122,7 +121,7 @@ require (
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/opencontainers/runc v1.2.1
github.com/opencontainers/runc v1.2.5
github.com/opencontainers/selinux v1.11.1
github.com/otiai10/copy v1.7.0
github.com/pkg/errors v0.9.1
Expand All @@ -144,18 +143,18 @@ require (
github.com/urfave/cli/v2 v2.27.5
github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be
github.com/yl2chen/cidranger v1.0.2
go.etcd.io/etcd/api/v3 v3.5.18
go.etcd.io/etcd/client/pkg/v3 v3.5.18
go.etcd.io/etcd/client/v3 v3.5.18
go.etcd.io/etcd/api/v3 v3.5.19
go.etcd.io/etcd/client/pkg/v3 v3.5.19
go.etcd.io/etcd/client/v3 v3.5.19
go.etcd.io/etcd/etcdutl/v3 v3.5.18
go.etcd.io/etcd/server/v3 v3.5.18
go.etcd.io/etcd/server/v3 v3.5.19
go.uber.org/mock v0.5.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.32.0
golang.org/x/crypto v0.35.0
golang.org/x/mod v0.22.0
golang.org/x/net v0.34.0
golang.org/x/sync v0.10.0
golang.org/x/sys v0.29.0
golang.org/x/net v0.36.0
golang.org/x/sync v0.11.0
golang.org/x/sys v0.30.0
google.golang.org/grpc v1.70.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.32.2
Expand Down Expand Up @@ -228,7 +227,7 @@ require (
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/go-cni v1.1.12 // indirect
github.com/containerd/go-runc v1.1.0 // indirect
github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 // indirect
github.com/containerd/imgcrypt/v2 v2.0.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/nri v0.8.0 // indirect
github.com/containerd/otelttrpc v0.1.0 // indirect
Expand All @@ -239,11 +238,11 @@ require (
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/containernetworking/cni v1.2.3 // indirect
github.com/containernetworking/plugins v1.5.1 // indirect
github.com/containers/ocicrypt v1.2.0 // indirect
github.com/containers/ocicrypt v1.2.1 // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand Down Expand Up @@ -432,6 +431,7 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/shengdoushi/base58 v1.0.0 // indirect
github.com/smallstep/pkcs7 v0.1.1 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.12.0 // indirect
Expand All @@ -451,10 +451,9 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go.etcd.io/bbolt v1.3.11 // indirect
go.etcd.io/etcd/client/v2 v2.305.18 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.18 // indirect
go.etcd.io/etcd/raft/v3 v3.5.18 // indirect
go.mozilla.org/pkcs7 v0.9.0 // indirect
go.etcd.io/etcd/client/v2 v2.305.19 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.19 // indirect
go.etcd.io/etcd/raft/v3 v3.5.19 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
Expand All @@ -472,7 +471,7 @@ require (
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
Expand All @@ -487,14 +486,11 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.32.2 // indirect
k8s.io/code-generator v0.32.2 // indirect
k8s.io/controller-manager v0.25.4 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/endpointslice v0.0.0 // indirect
k8s.io/externaljwt v1.32.0 // indirect
k8s.io/gengo v0.0.0-20240911193312-2b36238f13e9 // indirect
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
k8s.io/kms v0.0.0 // indirect
k8s.io/kube-aggregator v0.32.2 // indirect
k8s.io/kube-controller-manager v0.0.0 // indirect
Expand All @@ -511,6 +507,6 @@ require (
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
tags.cncf.io/container-device-interface v0.8.0 // indirect
tags.cncf.io/container-device-interface v0.8.1 // indirect
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
)
Loading
Loading