From c635818956f321d6d8a34a57c5a9fc98ad2d6607 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 1 Feb 2024 17:14:38 +0000 Subject: [PATCH] Bump runc and helm-controller versions Signed-off-by: Brad Davidson --- go.mod | 6 +++--- go.sum | 8 ++++---- pkg/server/server.go | 1 + scripts/download | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 13676aaf25..a19eea5810 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ replace ( github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.29.0-k3s1 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/opencontainers/runc v1.1.10 + 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/quic-go/qtls-go1-20 => github.com/quic-go/qtls-go1-20 v0.3.3 @@ -120,7 +120,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.4 + github.com/k3s-io/helm-controller v0.15.7 github.com/k3s-io/kine v0.11.0 github.com/klauspost/compress v1.17.2 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 @@ -132,7 +132,7 @@ require ( github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.13.2 github.com/onsi/gomega v1.30.0 - github.com/opencontainers/runc v1.1.10 + github.com/opencontainers/runc v1.1.12 github.com/opencontainers/selinux v1.11.0 github.com/otiai10/copy v1.7.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index c5d62b1c80..4955910c88 100644 --- a/go.sum +++ b/go.sum @@ -967,8 +967,8 @@ github.com/k3s-io/etcd/raft/v3 v3.5.9-k3s1 h1:nlix2+EM1UDofoHgp/X2VHzMvJW7oYbZbE github.com/k3s-io/etcd/raft/v3 v3.5.9-k3s1/go.mod h1:WnFkqzFdZua4LVlVXQEGhmooLeyS7mqzS4Pf4BCVqXg= github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1 h1:B3039IkTPnwQEt4tIMjC6yd6b1Q3Z9ZZe8rfaBPfbXo= github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g= -github.com/k3s-io/helm-controller v0.15.4 h1:l4DWmUWpphbtwmuXGtpr5Rql/2NaCLSv4ZD8HlND9uY= -github.com/k3s-io/helm-controller v0.15.4/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= +github.com/k3s-io/helm-controller v0.15.7 h1:LSmT0vb8f+X6IH9IydPjU9dPvJOwILlk4L5S+oeHr5o= +github.com/k3s-io/helm-controller v0.15.7/go.mod h1:AYitg40howLjKloL/zdjDDOPL1jg/K5R4af0tQcyPR8= github.com/k3s-io/kine v0.11.0 h1:7tS0H9yBDxXiy1BgEEkBWLswwG/q4sARPTHdxOMz1qw= github.com/k3s-io/kine v0.11.0/go.mod h1:tjSsWrCetgaGMTfnJW6vzqdT/qOPhF/+nUEaE+eixBA= github.com/k3s-io/klog/v2 v2.100.1-k3s1 h1:xb/Ta8dpQuIZueQEw2YTZUYrKoILdBmPiITVkNmYPa0= @@ -1031,6 +1031,8 @@ github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.1-k3s1 h1:maIQ github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.1-k3s1/go.mod h1:6PUWfpRhx/A8aRuFIntAVJjxcnLWyqircvt5UQpbbWg= github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.1-k3s1 h1:BGWkmjGvOpUXnEpHmOYvnZJbRbPle2p4hrInkuRO3GY= github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.1-k3s1/go.mod h1:+i0KHF7uvjXRUVsTwepg6652j9mzsnS7YHrbldQ5pZ0= +github.com/k3s-io/runc v1.1.12-k3s1 h1:p2x48K2BbRdF8crLEB4xoJ1pdjSprlvNNGpYBBULHL4= +github.com/k3s-io/runc v1.1.12-k3s1/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330 h1:Tn9qxllPEzcyJqhqbYywUz0y0bFnZG3eMDLCb9UXeVM= github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330/go.mod h1:VwX+8hz21pU7YjrvMmLCv7G4ww2Ds3HPEw3oDalMkGM= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -1358,8 +1360,6 @@ github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6 github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40= -github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.9.0/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= diff --git a/pkg/server/server.go b/pkg/server/server.go index 222056d25f..b1a96afc85 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -228,6 +228,7 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error { helmchart.Register(ctx, metav1.NamespaceAll, helmcommon.Name, + "cluster-admin", strconv.Itoa(config.ControlConfig.APIServerPort), k8s, apply, diff --git a/scripts/download b/scripts/download index 0557eca715..f75d9f925c 100755 --- a/scripts/download +++ b/scripts/download @@ -24,7 +24,7 @@ mkdir -p ${DATA_DIR} case ${OS} in linux) - git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} + git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/k3s-io/runc ${RUNC_DIR} curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - cp scripts/wg-add.sh bin/aux ;;