From 3acd10e9389fa930860896ca6ed925a15dff61a3 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 30 Aug 2024 08:30:15 -0700 Subject: [PATCH 1/7] Bump K8s to v1.31.0-k3s3 (#6665) Signed-off-by: Derek Nola --- go.mod | 64 ++++++++++++++++----------------- go.sum | 110 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/go.mod b/go.mod index 85421154d3..b2c59f43e7 100644 --- a/go.mod +++ b/go.mod @@ -36,40 +36,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.65.0 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s2 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s2 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s2 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s2 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s2 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s2 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s2 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s2 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s2 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s2 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s2 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s2 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s2 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s2 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s2 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s2 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s3 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.0-k3s1 k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s2 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s2 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s2 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s2 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s2 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s2 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s2 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s2 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s3 k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.4-k3s1 // upstream stopped producing tags - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s2 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s2 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s2 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s2 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.0-k3s2 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.0-k3s2 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.0-k3s2 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s3 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.0-k3s3 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.0-k3s3 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.0-k3s3 ) require ( @@ -80,7 +80,7 @@ require ( github.com/google/go-containerregistry v0.20.2 github.com/iamacarpet/go-win64api v0.0.0-20240507095429-873e84e85847 github.com/k3s-io/helm-controller v0.16.3 - github.com/k3s-io/k3s v1.30.3-0.20240822212334-c7468edbe71d // master + github.com/k3s-io/k3s v1.31.0-rc2.0.20240829224721-34be6d96d17d // release-1.31 github.com/k3s-io/kine v0.12.0 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible // indirect diff --git a/go.sum b/go.sum index fa979d9d77..ea2df1a41c 100644 --- a/go.sum +++ b/go.sum @@ -1154,8 +1154,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1 h1:Pqcxkg7V60c26ZpHoekP9QoUdLuduxF github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= github.com/k3s-io/helm-controller v0.16.3 h1:zjC0PsQF2Pf/LM1Cbfz/2dV6ee6XtCAWyG1PO96m7ow= github.com/k3s-io/helm-controller v0.16.3/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= -github.com/k3s-io/k3s v1.30.3-0.20240822212334-c7468edbe71d h1:lZPpl/TJFHWW3IOmSXcAsG/8glnmNyqML9c67O8MseE= -github.com/k3s-io/k3s v1.30.3-0.20240822212334-c7468edbe71d/go.mod h1:nSznVVnYuv8b7fF6fwe0Xhl3dUJSwlD/Hvouwc+5I0A= +github.com/k3s-io/k3s v1.31.0-rc2.0.20240829224721-34be6d96d17d h1:qwvMGYTiGXGb1FeTcfMYu2R0V2M+UH8/MpetVjgBDgE= +github.com/k3s-io/k3s v1.31.0-rc2.0.20240829224721-34be6d96d17d/go.mod h1:KcbHn0hG/8cekuRYa0vUQwjmaJPj2s6lN/kPZwEPoyI= github.com/k3s-io/kine v0.12.0 h1:OWUdEAjwbZivVCwOWaPbTNnnQTrEmSW32+13UWQjYz4= github.com/k3s-io/kine v0.12.0/go.mod h1:L4x3qotFebVh1ZVzYwFVL5PPfqw2sRJTjDTIeViO70Y= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -1163,59 +1163,59 @@ github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsao github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.1.2 h1:/eLfIsELLsqqRW1skIJ2qe7bWL6IZZ9Hg3IniIgObXo= github.com/k3s-io/kube-router/v2 v2.1.2/go.mod h1:a7QUTzCmDayYvqh6tXSKEB/ICSuGCs64qD4aCtaJqAU= -github.com/k3s-io/kubernetes v1.31.0-k3s2 h1:dTD6875Fs8zSyTRVsZwxW+BOxLE8G47AckhIz7zSV+g= -github.com/k3s-io/kubernetes v1.31.0-k3s2/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s2 h1:Q5svsmO4oZ4/AGtnnhI/0xWb6arBV3i4H/4ZkkfyMls= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s2/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s2 h1:1gxHx3/6vuZmHilZrlGzNQjv0sipJSO+Cgdptugj/EU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s2/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s2 h1:AB7xZfyKMGH5LNI2pos24yhqNVb1N86yPN0v16yL6pc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s2/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s2 h1:CAYtFbBM5FP7K5LA7srh1SjT43rDLU7goc/AKJfDNV0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s2/go.mod h1:HJ1b6VgXrf+cWYPUzAO6sIKfdcHFZsASDzAp2Z99hQk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s2 h1:la6AK5ctQAbqbXquoazbaKZJ/YwZMw1S01zvZAG/lT0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s2/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s2 h1:9KZuRFlL81+lCex/Uq04kINOn0FkRLuiF10wtB3+6bo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s2/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s2 h1:ucJeK6X60CGB0Lx8NesYm+DW/OFDlDojg6iumH0dWrk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s2/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s2 h1:3biSz0yZS9JmcvS/KBIgEH/AAw27IfJfsPmhGhHU0Cs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s2/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s2/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s2 h1:NjJ3gVitFKGk2lTP4iB2BzUIX//P0a2snmkyOEvmcsw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s2/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s2 h1:dPc1KW3PPp/Z6RRv3jnsS9R1N2fFfjkMOb0jQ4fp6Ww= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s2/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s2 h1:g7UddJr79bEqpmusO/YM3e6XNKBaTERDNxYTc65CPuA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s2/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s2 h1:O+R0t1p+fUVTcgByn/VfThPpgGaYtQzWpfJEFZzFDpw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s2/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s2 h1:+EmQ5hsp78RYQNtNow2pMo0rTSBIaGfudJVa+Rs0Hu0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s2/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s2 h1:dt8w3l83rFvZnidvyP2+tsH32AijSwPoTy1Y2oKPtoM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s2/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s2 h1:XLvZilkN2MMIwdNUUjmC+264lw/e0bnqnbfHqvSEbUY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s2/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s2 h1:8q9HWL38FnvAZvIbTEM5aRPVN3oicaiowg8aXg88m6M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s2/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s2 h1:OuI7My3CgTXI8HSVTmMlSJRQ5H52C23DtBgonWv+OiA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s2/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s2 h1:l5Z48bGRMYNjfo8FX3FzNa3rAr78qoAoFGdCTKAUG9Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s2/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s2 h1:BvulbizDo51rCVi62txHdYXMK6VFa7G4PfxUzoEceyU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s2/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s2 h1:o6RU3YOyW+qmKpee9ikl1BqCx0N0p1RnQqVV6imRUgo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s2/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s2 h1:Ch5AbMtSTitoK8U3zZgL/R718r3+z0YmOWMtNKn5a5g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s2/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s2 h1:vZWdlCvNmmUdhubf8Pu7lrSEG2XLOPmuSt0OofC3vq0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s2/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s2 h1:MIDEHxRaBS8gYPhV8hqS4oSkWYkH1gUuUP16ooQAZmM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s2/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s2 h1:frSYbTLsLL7FH2wr/P26JPY80JTGyZDKkKwfq+/Rhsg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s2/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s2 h1:wz8VyM/Cd6blscLWz641K6n7okQf70KqaEN4zMo2q84= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s2/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= +github.com/k3s-io/kubernetes v1.31.0-k3s3 h1:xGU1SH0h6Df1VSakJ4TNuYba6/SAfUb+pNAYx3ExmbM= +github.com/k3s-io/kubernetes v1.31.0-k3s3/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3 h1:kYImKPev0qtAVBjohUiamANiJyIzOXXQ/PR7zE1JSec= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3 h1:SCeEmwUwzvWkWs1cL+3lsZtiba3N8OCllSuK4cOa9uk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3 h1:t33AUp7mDkGATwWfptYXyy5HkN1GqCMBZfIgsxASFGk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3 h1:P51Yq4yymToHtakyD3CCaJzaF81+qXMEGQqcOX0ZYAc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3/go.mod h1:HJ1b6VgXrf+cWYPUzAO6sIKfdcHFZsASDzAp2Z99hQk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3 h1:Y1SVtmTaO5zy07EVXv/4j0j/NrwSsLn0VENZ0KBalcY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3 h1:4wgsgYfMdPpzfFUj7SNq1qoxTtHUJmFXMUFD/jPIWkg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3 h1:HOj//ctoLwFQjpHFFfTk4f4SS5vvORmEXJFMxq2mrX0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3 h1:T+ZWDYEc4d76PrZjFJWDo2pZN2qZhrLnytSB7Svn+7M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s3/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3 h1:KVjtvv8omTCndEEVt4+nd00AMmI8fSSll1/Mpl1CkNc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3 h1:dd5Nf+xjP5YVIZmot6OIKGbziYZhwnXmlV3sHARej24= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3 h1:wIEz+Omcnin2pNOajbQGVbfkEMYpMOnxGF44Tb76wEw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3 h1:MiDBz3gKlpWfsUu5LY2BKrBRilxLVWBX9M1w9Wa9Wqg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3 h1:Bv3e9Td45IwyRXmwIxVV1DxOgqgNSx2c2ruq8gph42M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3 h1:mwhFn1V3lEB3/wpUTFSpS/Ah816hoHd3f37K7u+Nh5M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3 h1:A80/H9MBTzJjsbyxEDw2gWq/fhpvGt8AbMja44dtLVk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3 h1:9CvQCvLUufe/b/Yww2AkV4PahxiMk2BYbMtEmkr58Ns= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3 h1:RkE/HBZPH29t8i+A+ho2pRxUximJLp3WltgdXHKYrto= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3 h1:iX0mZ5RZqfJJBJOVtAj3s3pXFDtPhSADFfQIlCC2qKw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3 h1:du6Pv8B688FzJkj4Byg28WLjRgAlidiUKi9zzMv5grU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3 h1:nX7H7xuED1tbkxTDB3hkall3cgoTixXjrCgWTxdaSyU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3 h1:I7TnG/wpnuMLsJLnV1bTOVvQssNq9DrQfqLhyl7U7gg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3 h1:R79CsXq5Cqpd/u3P5bVNiB0j5I4oZiaRG0+ZZQcf7KM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3 h1:/Q5f5aNNJMTXnWVedwqblUWrH8lSQ3BmdM8Hak6QG7w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3 h1:8ZpGfpKzHpyzFNGOH9MhbkEyezCy9MwMsP3mS1CRuZg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3 h1:LCZWmkBHHA3CZb5uEM7/ThQY2IKHHGFbV/rkAEK6m8s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= github.com/k3s-io/runc v1.1.13-k3s1 h1:ZOXDlEU3z/Fgc9SZB5uIcEeyNowBg8tmBcv8oTLCHpw= github.com/k3s-io/runc v1.1.13-k3s1/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= From 4bf1156f41631dc0e81d66a6834a53d14b48aaef Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Fri, 30 Aug 2024 09:55:22 +0800 Subject: [PATCH 2/7] feat: bump harvester-cloud-provider to v0.2.6 Signed-off-by: PoAn Yang --- charts/chart_versions.yaml | 2 +- scripts/build-images | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index ad5a7102e0..8f76de35cd 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -38,7 +38,7 @@ charts: - version: 3.3.1-rancher100 filename: /charts/rancher-vsphere-csi.yaml bootstrap: true - - version: 0.2.400 + - version: 0.2.600 filename: /charts/harvester-cloud-provider.yaml bootstrap: true - version: 0.1.1800 diff --git a/scripts/build-images b/scripts/build-images index a9d2a718e4..6497e96aec 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -96,7 +96,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt - ${REGISTRY}/rancher/harvester-cloud-provider:v0.2.1 + ${REGISTRY}/rancher/harvester-cloud-provider:v0.2.2 ${REGISTRY}/rancher/mirrored-kube-vip-kube-vip-iptables:v0.6.0 ${REGISTRY}/rancher/harvester-csi-driver:v0.1.7 ${REGISTRY}/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.3.0 From 288210a48dad28a7b016e72d142c2399a4814e5c Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Mon, 2 Sep 2024 15:53:56 +0200 Subject: [PATCH 3/7] Update chart with CNI plugins on Flannel and Cilium Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 4 ++-- charts/chart_versions.yaml | 4 ++-- scripts/build-images | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 43aced6e43..e55524b721 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -46,8 +46,8 @@ ARG KUBERNETES_VERSION=dev ENV CRICTL_VERSION="v1.30.1" ENV CALICO_VERSION="v3.28.1" ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.25.5" -ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1" +ENV FLANNEL_VERSION="v0.25.6" +ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2" RUN mkdir -p rancher diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 8f76de35cd..70453f7622 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -1,5 +1,5 @@ charts: - - version: 1.16.101 + - version: 1.16.102 filename: /charts/rke2-cilium.yaml bootstrap: true - version: v3.28.1-build2024082701 @@ -29,7 +29,7 @@ charts: - version: v4.0.206 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.501 + - version: v0.25.600 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.9.000 diff --git a/scripts/build-images b/scripts/build-images index 6497e96aec..6cfe778802 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -50,7 +50,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.1 ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.1 ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.1 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt @@ -106,8 +106,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt - ${REGISTRY}/rancher/hardened-flannel:v0.25.5-build20240801 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805 + ${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240828 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images From 29f8cc8c54d489c934c533b92752e8a3b0bdb8a6 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Thu, 5 Sep 2024 09:07:30 +0000 Subject: [PATCH 4/7] Bump multus chart to v4.1.000 --- charts/chart_versions.yaml | 2 +- scripts/build-images | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 70453f7622..670fb1646a 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -26,7 +26,7 @@ charts: - version: 3.12.002 filename: /charts/rke2-metrics-server.yaml bootstrap: false - - version: v4.0.206 + - version: v4.1.000 filename: /charts/rke2-multus.yaml bootstrap: true - version: v0.25.600 diff --git a/scripts/build-images b/scripts/build-images index 6cfe778802..d6e1d8f7c2 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -81,8 +81,8 @@ EOF fi xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt - ${REGISTRY}/rancher/hardened-multus-cni:v4.0.2-build20240612 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240430 + ${REGISTRY}/rancher/hardened-multus-cni:v4.1.0-build20240830 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 ${REGISTRY}/rancher/hardened-node-feature-discovery:v0.15.4-build20240513 ${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20240327 ${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.2.0-build20240327 @@ -91,7 +91,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt ${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.3-build20240327 ${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20240327 ${REGISTRY}/rancher/hardened-sriov-network-webhook:v1.2.0-build20240327 - ${REGISTRY}/rancher/hardened-whereabouts:v0.7.0-build20240429 + ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240830 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 EOF From 3304bd05a2896272c0e175ec41154f1ffc1bfd31 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Thu, 5 Sep 2024 16:59:17 +0000 Subject: [PATCH 5/7] Remove sriov images from airgap tarball As discussed, it doesn't make sense anymore to keep them in the airgap tarball since we don't synchronize the sriov chart with an rke2 release. --- scripts/build-images | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/build-images b/scripts/build-images index d6e1d8f7c2..aacced3423 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -83,14 +83,6 @@ fi xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt ${REGISTRY}/rancher/hardened-multus-cni:v4.1.0-build20240830 ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 - ${REGISTRY}/rancher/hardened-node-feature-discovery:v0.15.4-build20240513 - ${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20240327 - ${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.2.0-build20240327 - ${REGISTRY}/rancher/hardened-sriov-network-device-plugin:v3.6.2-build20240327 - ${REGISTRY}/rancher/hardened-sriov-cni:v2.7.0-build20240327 - ${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.3-build20240327 - ${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20240327 - ${REGISTRY}/rancher/hardened-sriov-network-webhook:v1.2.0-build20240327 ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240830 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 EOF From a2dd8251a88b14eed39af45e7ddc3ebe90d2bd94 Mon Sep 17 00:00:00 2001 From: Vitor Savian Date: Wed, 4 Sep 2024 05:15:28 -0300 Subject: [PATCH 6/7] Add ctr to shell completion Signed-off-by: Vitor Savian --- pkg/cli/cmds/completion.go | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkg/cli/cmds/completion.go b/pkg/cli/cmds/completion.go index ce5aca7169..83b327ac27 100644 --- a/pkg/cli/cmds/completion.go +++ b/pkg/cli/cmds/completion.go @@ -19,6 +19,10 @@ var ( Name: "crictl", Usage: "(crictl) export crictl config file", }, + &cli.BoolFlag{ + Name: "ctr", + Usage: "(ctr) export containerd sock file", + }, } k3sCompletionBase = mustCmdFromK3S(cmds.NewCompletionCommand(Run), K3SFlagSet{ @@ -46,23 +50,30 @@ func isCrictlSet(crictl bool) string { return "" } +func isCtrSet(ctr bool) string { + if ctr { + return " --ctr" + } + return "" +} + func Run(ctx *cli.Context) error { if ctx.NArg() < 1 { return fmt.Errorf("must provide a valid SHELL argument") } shell := ctx.Args()[0] - completetionScript, err := genCompletionScript(shell, ctx.Bool("kubectl"), ctx.Bool("crictl")) + completetionScript, err := genCompletionScript(shell, ctx.Bool("kubectl"), ctx.Bool("crictl"), ctx.Bool("ctr")) if err != nil { return err } if ctx.Bool("i") { - return writeToRC(shell, ctx.Bool("kubectl"), ctx.Bool("crictl")) + return writeToRC(shell, ctx.Bool("kubectl"), ctx.Bool("crictl"), ctx.Bool("ctr")) } fmt.Println(completetionScript) return nil } -func genCompletionScript(shell string, kubectl, crictl bool) (string, error) { +func genCompletionScript(shell string, kubectl, crictl, ctr bool) (string, error) { var completionScript string if shell == "bash" { completionScript = fmt.Sprintf(`#! /bin/bash @@ -120,13 +131,19 @@ export KUBECONFIG=/etc/rancher/rke2/rke2.yaml if crictl { completionScript = fmt.Sprintf(`%s export CRI_CONFIG_FILE=/var/lib/rancher/rke2/agent/etc/crictl.yaml + `, completionScript) + } + + if ctr { + completionScript = fmt.Sprintf(`%s +export CONTAINERD_ADDRESS=/run/k3s/containerd/containerd.sock `, completionScript) } return completionScript, nil } -func writeToRC(shell string, kubectl, crictl bool) error { +func writeToRC(shell string, kubectl, crictl, ctr bool) error { rcFileName := "" if shell == "bash" { rcFileName = "/.bashrc" @@ -144,7 +161,7 @@ func writeToRC(shell string, kubectl, crictl bool) error { return err } defer f.Close() - bashEntry := fmt.Sprintf("# >> %[1]s command completion (start)\n. <(%[1]s completion %[2]s%[3]s%[4]s)\n# >> %[1]s command completion (end)", version.Program, shell, isKubectlSet(kubectl), isCrictlSet(crictl)) + bashEntry := fmt.Sprintf("# >> %[1]s command completion (start)\n. <(%[1]s completion %[2]s%[3]s%[4]s%[5]s)\n# >> %[1]s command completion (end)", version.Program, shell, isKubectlSet(kubectl), isCrictlSet(crictl), isCtrSet(ctr)) if _, err := f.WriteString(bashEntry); err != nil { return err } From eabc09b97c2ad4ee31659136cd4254964c399f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20J=C3=A4kel?= Date: Mon, 9 Sep 2024 14:35:33 +0200 Subject: [PATCH 7/7] fix: added null check for cni plugin before setup func is called --- pkg/pebinaryexecutor/pebinary.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/pebinaryexecutor/pebinary.go b/pkg/pebinaryexecutor/pebinary.go index 110447cfdf..7f2000a258 100644 --- a/pkg/pebinaryexecutor/pebinary.go +++ b/pkg/pebinaryexecutor/pebinary.go @@ -129,8 +129,10 @@ func (p *PEBinaryConfig) Bootstrap(ctx context.Context, nodeConfig *config.Node, logrus.Fatal("Unsupported CNI: ", p.CNIName) } - if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil { - return err + if p.CNIPlugin != nil { + if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil { + return err + } } // required to initialize KubeProxy