From dcf52981d40c207b821745b2f6ea74889ee7213a Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 9 Jan 2025 00:52:44 +0000 Subject: [PATCH 1/6] Update snapshot controller and remove snapshot validation webhook Signed-off-by: Brad Davidson (cherry picked from commit cf94b66c02bfbb5a5f635b7f1991ff8c82ec0b1c) Signed-off-by: Brad Davidson --- charts/build-chart.sh | 7 ++- charts/build-charts.sh | 5 +- charts/chart_versions.yaml | 6 +-- scripts/build-images | 3 +- scripts/test-run-basics | 3 +- scripts/validate-charts | 97 +++++++++++++++++++------------------- 6 files changed, 63 insertions(+), 58 deletions(-) diff --git a/charts/build-chart.sh b/charts/build-chart.sh index 2c5f1c032a..c9b41066fa 100755 --- a/charts/build-chart.sh +++ b/charts/build-chart.sh @@ -7,7 +7,7 @@ set -eux -o pipefail : "${CHART_NAME:="$(basename "${CHART_FILE%%.yaml}")"}" : "${CHART_PACKAGE:="${CHART_NAME%%-crd}"}" : "${TAR_OPTS:=--owner=0 --group=0 --mode=gou-s+r --numeric-owner --no-acls --no-selinux --no-xattrs}" -: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_PACKAGE}/${CHART_NAME}-${CHART_VERSION:="v0.0.0"}.tgz"}" +: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_PACKAGE}/${CHART_NAME}-${CHART_VERSION:="0.0.0"}.tgz"}" : "${CHART_TMP:=$(mktemp --suffix .tar.gz)}" : "${YAML_TMP:=$(mktemp --suffix .yaml)}" @@ -19,6 +19,11 @@ cleanup() { } trap cleanup EXIT INT +if [ "$CHART_VERSION" == "0.0.0" ]; then + echo "# ${CHART_NAME} has been removed" > "${CHART_FILE}" + exit +fi + curl -fsSL "${CHART_URL}" -o "${CHART_TMP}" gunzip ${CHART_TMP} diff --git a/charts/build-charts.sh b/charts/build-charts.sh index 38dd2e62f5..16dc7aa8ff 100755 --- a/charts/build-charts.sh +++ b/charts/build-charts.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash set -eux -o pipefail +CHARTS_DIR=$(dirname $0) while read version filename bootstrap; do - CHART_VERSION=$version CHART_FILE=$filename CHART_BOOTSTRAP=$bootstrap /charts/build-chart.sh -done <<< $(yq e '.charts[] | [.version, .filename, .bootstrap] | join(" ")' /charts/chart_versions.yaml) + CHART_VERSION=$version CHART_FILE=$CHARTS_DIR/$(basename $filename) CHART_BOOTSTRAP=$bootstrap $CHARTS_DIR/build-chart.sh +done <<< $(yq e '.charts[] | [.version, .filename, .bootstrap] | join(" ")' $CHARTS_DIR/chart_versions.yaml) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 06b33feeff..4e559c88bd 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -44,13 +44,13 @@ charts: - version: 0.1.2200 filename: /charts/harvester-csi-driver.yaml bootstrap: true - - version: 3.0.601 + - version: 4.0.002 filename: /charts/rke2-snapshot-controller.yaml bootstrap: false - - version: 3.0.601 + - version: 4.0.002 filename: /charts/rke2-snapshot-controller-crd.yaml bootstrap: false - - version: 1.9.001 + - version: 0.0.0 # this empty chart addon can be removed in v1.34, after we have shipped two minor versions that have never included it. filename: /charts/rke2-snapshot-validation-webhook.yaml bootstrap: false - version: 0.1.000 diff --git a/scripts/build-images b/scripts/build-images index 8de96f8253..6878566025 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -25,8 +25,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.4 ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened6 ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} - ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v8.1.0 - ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-validation-webhook:v8.1.0 + ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt diff --git a/scripts/test-run-basics b/scripts/test-run-basics index f5c8c1a3e8..7503db2a1c 100755 --- a/scripts/test-run-basics +++ b/scripts/test-run-basics @@ -12,7 +12,6 @@ all_services=( metrics-server rke2-ingress-nginx-controller rke2-snapshot-controller - rke2-snapshot-validation-webhook ) export NUM_SERVERS=1 @@ -72,7 +71,7 @@ use-servicelb() { } export -f use-servicelb -# -- Verify that the snapshot controller and validation webhook work, +# -- Verify that the snapshot controller works # by installing the host-path CSI driver and waiting for a snapshot to be taken. verify-snapshot-controller() { for MANIFEST in $(cat tests/e2e/resource_files/csi-driver-host-path.txt); do diff --git a/scripts/validate-charts b/scripts/validate-charts index ca2405fa02..760b2d2c66 100755 --- a/scripts/validate-charts +++ b/scripts/validate-charts @@ -4,7 +4,7 @@ source ./scripts/version.sh set +x info() { - echo '[INFO] ' "$@" + echo '[INFO] ' "$@" >&2 } warn() { @@ -36,7 +36,7 @@ download_chart() { chart_package=${chart_name%%-crd} - chart_url=${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${chart_package}/${chart_name}-${chart_version:="v0.0.0"}.tgz + chart_url=${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${chart_package}/${chart_name}-${chart_version:="0.0.0"}.tgz chart_tmp=$(mktemp --suffix .tar.gz) @@ -66,45 +66,47 @@ check_system_registry() { } is_supported() { -kube_version="$1" -lower_bound="$2" -upper_bound="$3" - -kube_version="${kube_version#[vV]}" -kube_version_major="${kube_version%%\.*}" -kube_version_minor="${kube_version#*.}" -kube_version_minor="${kube_version_minor%.*}" -kube_version_patch="${kube_version##*.}" -kube_version_dash="${kube_version_patch##*-}" -kube_version_patch="${kube_version_patch%-*}" - -lower_bound="${lower_bound#[vV]}" -lower_bound_major="${lower_bound%%\.*}" -lower_bound_minor="${lower_bound#*.}" -lower_bound_minor="${lower_bound_minor%.*}" -lower_bound_patch="${lower_bound##*.}" -lower_bound_dash="${lower_bound_patch##*-}" -lower_bound_patch="${lower_bound_patch%-*}" - - -upper_bound="${upper_bound#[vV]}" -upper_bound_major="${upper_bound%%\.*}" -upper_bound_minor="${upper_bound#*.}" -upper_bound_minor="${upper_bound_minor%.*}" -upper_bound_patch="${upper_bound##*.}" -upper_bound_dash="${upper_bound_patch##*-}" -upper_bound_patch="${upper_bound_patch%-*}" - -if [ "$lower_bound_major" -le "$kube_version_major" ] && \ - [ "$kube_version_major" -le "$upper_bound_major" ] && \ - [ "$lower_bound_minor" -le "$kube_version_minor" ] && \ - [ "$kube_version_minor" -le "$upper_bound_minor" ] && \ - [ "$lower_bound_patch" -le "$kube_version_patch" ] && \ - [ "$kube_version_patch" -le "$upper_bound_patch" ]; then - echo 0 -else - echo 1 -fi + kube_version="$1" + lower_bound="${2:-0.0.0-0}" + upper_bound="${3:-999.999.999-999}" + + info "Checking if Kubernetes '$kube_version' is between '$lower_bound' and '$upper_bound'" + + kube_version="${kube_version#[vV]}" + kube_version_major="${kube_version%%\.*}" + kube_version_minor="${kube_version#*.}" + kube_version_minor="${kube_version_minor%.*}" + kube_version_patch="${kube_version##*.}" + kube_version_dash="${kube_version_patch##*-}" + kube_version_patch="${kube_version_patch%-*}" + + lower_bound="${lower_bound#[vV]}" + lower_bound_major="${lower_bound%%\.*}" + lower_bound_minor="${lower_bound#*.}" + lower_bound_minor="${lower_bound_minor%.*}" + lower_bound_patch="${lower_bound##*.}" + lower_bound_dash="${lower_bound_patch##*-}" + lower_bound_patch="${lower_bound_patch%-*}" + + + upper_bound="${upper_bound#[vV]}" + upper_bound_major="${upper_bound%%\.*}" + upper_bound_minor="${upper_bound#*.}" + upper_bound_minor="${upper_bound_minor%.*}" + upper_bound_patch="${upper_bound##*.}" + upper_bound_dash="${upper_bound_patch##*-}" + upper_bound_patch="${upper_bound_patch%-*}" + + if [ "$lower_bound_major" -le "$kube_version_major" ] && \ + [ "$kube_version_major" -le "$upper_bound_major" ] && \ + [ "$lower_bound_minor" -le "$kube_version_minor" ] && \ + [ "$kube_version_minor" -le "$upper_bound_minor" ] && \ + [ "$lower_bound_patch" -le "$kube_version_patch" ] && \ + [ "$kube_version_patch" -le "$upper_bound_patch" ]; then + echo 0 + else + echo 1 + fi } check_airgap() { @@ -119,14 +121,9 @@ check_airgap() { chart_folder=$(mktemp -d) tar xfz $chart_tmp -C $chart_folder - version_annotation=`awk '$1 ~ /catalog.cattle.io\/kube-version:/ { - print $3 " " $5 - } - ' $chart_folder/$chart_name/Chart.yaml ` - if ! [[ -z ${version_annotation} ]]; then - version_annotation=${version_annotation:0:-1} + version_annotation=$(yq e '.annotations."catalog.cattle.io/kube-version" // ""' $chart_folder/$chart_name/Chart.yaml | awk '{print $2 " " $4}') + if [[ ${version_annotation} != " " ]]; then read lower_bound upper_bound <<< $version_annotation - supported=$(is_supported ${KUBERNETES_VERSION} $lower_bound $upper_bound) if [ $supported = 1 ] ; then warn "Chart $chart_name:$chart_version does not support k8s ${KUBERNETES_VERSION}. Skipping airgap check" @@ -154,6 +151,10 @@ declare -A NO_SYSTEM_REGISTRY declare -A NOT_FOUND while read version filename bootstrap; do + if [ "$version" == "0.0.0" ]; then + continue + fi + chart_name=$(basename "${filename%%.yaml}") chart_tmp=$(download_chart $version $chart_name $bootstrap) From fd209d2f81358ce12e9fa04cb63f5acb2be57a93 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 9 Jan 2025 18:40:32 +0000 Subject: [PATCH 2/6] Bump runc to v1.2.4 Signed-off-by: Brad Davidson (cherry picked from commit dc7623b9bf29129b2c5a3deadd39eea5e39de224) Signed-off-by: Brad Davidson --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b5733dc12..f1bfa52747 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,7 +120,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml FROM rancher/hardened-kubernetes:v1.31.4-rke2r1-build20241212 AS kubernetes FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd FROM rancher/hardened-crictl:v1.31.1-build20241011 AS crictl -FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc +FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc FROM scratch AS runtime-collect COPY --from=runc \ From c1f8412fc52973b9c0d01461ad0a4189190eb792 Mon Sep 17 00:00:00 2001 From: Siva Kanakala Date: Sat, 11 Jan 2025 04:58:50 +0530 Subject: [PATCH 3/6] fix-extramount-type (#7423) * fix-extramount-type (cherry picked from commit 2bc648d866554be0482bf2e1ed5b706101ec2c60) Signed-off-by: Brad Davidson --- pkg/staticpod/staticpod.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/staticpod/staticpod.go b/pkg/staticpod/staticpod.go index ec687f91e5..ec5cca3ed5 100644 --- a/pkg/staticpod/staticpod.go +++ b/pkg/staticpod/staticpod.go @@ -336,9 +336,9 @@ func addVolumes(p *v1.Pod, src []string, volume typeVolume) { } func addExtraMounts(p *v1.Pod, extraMounts []string) { - var sourceType v1.HostPathType for i, rawMount := range extraMounts { + var sourceType v1.HostPathType mount := strings.Split(rawMount, ":") var ro bool switch len(mount) { From 6462e7ce547b0461a046fd6dc4754cea72afce23 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 13 Jan 2025 23:28:45 +0000 Subject: [PATCH 4/6] Bump K3s version for release-1.31 Updates k3s: https://github.com/k3s-io/k3s/compare/1ac966b46a50...ed9df164c208e196c2b356991607dc17fb70f973 Signed-off-by: Brad Davidson --- go.mod | 96 ++++++++++++++++++++++----------------------- go.sum | 122 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/go.mod b/go.mod index ec92ac1162..e428a15803 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 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/opencontainers/runc => github.com/k3s-io/runc v1.2.1-k3s1 + 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 @@ -35,39 +35,39 @@ 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.3-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.3-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.3-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.3-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.3-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.3-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.3-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.3-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.3-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.3-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.3-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.3-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.3-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.3-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.3-k3s1 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.3-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.4-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.4-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.4-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.4-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.4-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.4-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.4-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.4-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.4-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.4-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.4-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.4-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.4-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.4-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.4-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.4-k3s1 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.3-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.3-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.3-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.3-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.3-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.3-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.3-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.3-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.3-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.3-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.3-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.3-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.3-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.3-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.3-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.4-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.4-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.4-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.4-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.4-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.4-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.4-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.4-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.4-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.4-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.4-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.4-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.4-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.4-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.4-k3s1 ) require ( @@ -78,7 +78,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.5 - github.com/k3s-io/k3s v1.31.4-0.20241211010154-1ac966b46a50 // release-1.31 + github.com/k3s-io/k3s v1.31.5-0.20250113221610-ed9df164c208 // release-1.31 github.com/k3s-io/kine v0.13.5 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible // indirect @@ -95,13 +95,13 @@ require ( github.com/tigera/operator v1.28.1 github.com/urfave/cli v1.22.15 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.25.0 + golang.org/x/sys v0.28.0 google.golang.org/grpc v1.68.0 - k8s.io/api v0.31.3 - k8s.io/apimachinery v0.31.3 - k8s.io/apiserver v0.31.3 + k8s.io/api v0.31.4 + k8s.io/apimachinery v0.31.4 + k8s.io/apiserver v0.31.4 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/component-base v0.31.3 + k8s.io/component-base v0.31.4 k8s.io/cri-api v0.32.0-alpha.0 k8s.io/klog/v2 v2.130.1 k8s.io/kubernetes v1.31.2 @@ -155,7 +155,7 @@ require ( github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect - github.com/cyphar/filepath-securejoin v0.3.4 // indirect + github.com/cyphar/filepath-securejoin v0.3.5 // 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.2.0 // indirect @@ -416,26 +416,26 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.31.3 // indirect - k8s.io/cli-runtime v0.31.3 // indirect - k8s.io/cloud-provider v0.31.3 // indirect + k8s.io/apiextensions-apiserver v0.31.4 // indirect + k8s.io/cli-runtime v0.31.4 // indirect + k8s.io/cloud-provider v0.31.4 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.31.3 // indirect + k8s.io/component-helpers v0.31.4 // indirect k8s.io/controller-manager v0.27.10 // indirect - k8s.io/cri-client v0.31.3 // indirect + k8s.io/cri-client v0.31.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/kms v0.27.10 // indirect - k8s.io/kube-aggregator v0.31.3 // indirect + k8s.io/kube-aggregator v0.31.4 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect k8s.io/kube-proxy v0.0.0 // indirect k8s.io/kube-scheduler v0.0.0 // indirect - k8s.io/kubectl v0.31.3 // indirect - k8s.io/kubelet v0.31.3 // indirect + k8s.io/kubectl v0.31.4 // indirect + k8s.io/kubelet v0.31.4 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.31.3 // indirect + k8s.io/mount-utils v0.31.4 // indirect k8s.io/pod-security-admission v0.0.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect diff --git a/go.sum b/go.sum index ce92bdb8af..224e7d0aea 100644 --- a/go.sum +++ b/go.sum @@ -492,8 +492,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= -github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= +github.com/cyphar/filepath-securejoin v0.3.5 h1:L81NHjquoQmcPgXcttUS9qTSR/+bXry6pbSINQGpjj4= +github.com/cyphar/filepath-securejoin v0.3.5/go.mod h1:edhVd3c6OXKjUmSrVa/tGJRS9joFTxlslFCAyaxigkE= github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -1108,8 +1108,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1 h1:9c0DChFw6WRz6r+eCuVLBltZcRwT6h1 github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= github.com/k3s-io/helm-controller v0.16.5 h1:SsUHfksQXNwePkswv4a970EGD2h0Exsf6t3IdXhpXRo= github.com/k3s-io/helm-controller v0.16.5/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= -github.com/k3s-io/k3s v1.31.4-0.20241211010154-1ac966b46a50 h1:XhKKU9OARqpMyqLyBpMsOyut9IdWz8asQJ7g0rd0tTs= -github.com/k3s-io/k3s v1.31.4-0.20241211010154-1ac966b46a50/go.mod h1:OuOyYxpnZD0q2zJ5dwrRzLfT/0Y3seKUN8gYd7Z+fLI= +github.com/k3s-io/k3s v1.31.5-0.20250113221610-ed9df164c208 h1:Jb4cquTXHeThkTQHE2un7clYfeLXzhNUggtPsmu43Zc= +github.com/k3s-io/k3s v1.31.5-0.20250113221610-ed9df164c208/go.mod h1:eu/x1eGEC9JbY0TsNH7XmlobUxpCoIbLx62bMRs3P2Q= github.com/k3s-io/kine v0.13.5 h1:bVTcxCHJVUqeyz0mJenO+WFHkxtgD2aRwLt1JcJ0pq8= github.com/k3s-io/kine v0.13.5/go.mod h1:OIG+kPc9cU+NDHnVm+aR0PyZYExdZWU+vlJynhH4haU= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -1117,61 +1117,61 @@ 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.2.1 h1:LrU6l4khFt67+QCIvgok9B/C9JY/U2/TaF9TCVUw0vw= github.com/k3s-io/kube-router/v2 v2.2.1/go.mod h1:OWqBKftzZRXF79mDv1MLiYbvD7RP/kzrk5X5NupAawM= -github.com/k3s-io/kubernetes v1.31.3-k3s1 h1:qW83ol3AXG0QSdxrHX9fprLluoKLfLYqwy/G8Jij0y0= -github.com/k3s-io/kubernetes v1.31.3-k3s1/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.3-k3s1 h1:BTevQXoKdoAr9R9NiKVEXsyyZ9694QOhSfYvSJUxjYg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.3-k3s1/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.3-k3s1 h1:Jkrq8rj/6TWazJVrznrIVDKGyCrgHK5Enj1nvYN1DQY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.3-k3s1/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.3-k3s1 h1:A3ZZEhTGvEfITKaElhstAVJEe+kPMS9GBkVDYayGXFU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.3-k3s1/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.3-k3s1 h1:2HzIbg76FrPGPjZlJwfZvaePplSztr6uo2sojbM0mgQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.3-k3s1/go.mod h1:mJ5S6E5i9O+hBQXJ8T8dEZn36vN6k29PpaFUsrpgKwg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.3-k3s1 h1:hN6YJU8ApwguuSTrzFamXd7plbFmqf3/dxz7BYVwTVM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.3-k3s1/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.3-k3s1 h1:AlI41NFILNWxSmnF81KYvsLibeZhJIyJvFxCJdEf070= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.3-k3s1/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.3-k3s1 h1:V8epI+m5+S16PSZ/tGMjPjY0r+2jHc7XRswlM7j5tyk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.3-k3s1/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.3-k3s1 h1:kzmraSptovQR1MCgIqflytkCnWts2VGFAhC51ro27g4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.3-k3s1/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.3-k3s1/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.3-k3s1 h1:Mb4sV3f5Q8w9CnKwt7V9sf9OZHmvAldJSCSQNzBGOf8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.3-k3s1/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.3-k3s1 h1:aI7JqFexL+Z1dW99Etr/Kdvw/nU6pmnqfdPamXK+Q4Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.3-k3s1/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.3-k3s1 h1:Runse3c6hcm6NX2OIIDQ7sLcGJshJi6ZhMaRwlEw8wQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.3-k3s1/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.3-k3s1 h1:YbXlLO0rqxvenDM32+VmYrHFDOFblaCdcI2Vabw7wzM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.3-k3s1/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.3-k3s1 h1:VZ6qG3VXSNg52tpsl84Hq08UiHH58St9XpLa4mKutfw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.3-k3s1/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.3-k3s1 h1:HUBEhywX5cAcTEpmCxM1yPaBBAMMRurF9xTxjIHXgok= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.3-k3s1/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.3-k3s1 h1:Elqg67ssSLbLv38smstBnqPCfHd2K7J8NoZ58cbpm+0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.3-k3s1/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.3-k3s1 h1:4wKOFwxFtrKrLUlmF8qLulxHJOIEQ2I6trXErYgSr/Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.3-k3s1/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.3-k3s1 h1:/4QJ0mz7q7qmbCMhUY2kIHBbGivW54DzdInl8/HNrN4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.3-k3s1/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.3-k3s1 h1:PFQ54puHPA1XfnPwRzQZoC6Xt1TIsuMts+AmaJlyoRA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.3-k3s1/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.3-k3s1 h1:4qEAWK5IdCDXQ7Yb9u2xTQkMhZrl/lBzC0y9anBH5Kw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.3-k3s1/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.3-k3s1 h1:QDF6UKxx51LolTwiaHccFB0CQzi9G0OlUklHxWB6D7w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.3-k3s1/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.3-k3s1 h1:04qom5d5DCAbgnReLgxi93pGM4HuKB/M9ABnVsZeiPI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.3-k3s1/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.3-k3s1 h1:Jevd/A1sIggIuGMlBfZDV16TUBjDsVFeMqgmvKxVO18= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.3-k3s1/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.3-k3s1 h1:p+HvVl0E/tidgr/9h0xGGC6PfHg0t84AeFQ/sTxQVAI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.3-k3s1/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.3-k3s1 h1:Pg/FTGCbJKi+O+hWt18z3ReZ5yiEezP9+5p0FbBHvvk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.3-k3s1/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.3-k3s1 h1:XmxkBGd67P/hvkY0HZErFpmpZMqsZk9udWt3QmMVzuY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.3-k3s1/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= -github.com/k3s-io/runc v1.2.1-k3s1 h1:74ZffmoNVdX+jO+XYLv0iU/A9Yse1DZ2slZog7gNDgE= -github.com/k3s-io/runc v1.2.1-k3s1/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= +github.com/k3s-io/kubernetes v1.31.4-k3s1 h1:ZlWmjPvEq1j2ROH4jLMa0QLtodIAmE66WsHLToz/Cqo= +github.com/k3s-io/kubernetes v1.31.4-k3s1/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.4-k3s1 h1:8wk+56nwI8HTHpN/QGpIUGEUz1ZgXOPczXK/lKI3JlA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.4-k3s1/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.4-k3s1 h1:GkF7hYjj7JNv9Dna2LLKswP+SrfMb0HvbqpQkZ/h9mk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.4-k3s1/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.4-k3s1 h1:AKVYltxgeUZ+9gc9uEElW8pwoRy74DsxnjNAofJo24k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.4-k3s1/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.4-k3s1 h1:I7wtZg9++0xkjY9JsihxjypGAJu2cUcET3ScMnDjyCc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.4-k3s1/go.mod h1:mJ5S6E5i9O+hBQXJ8T8dEZn36vN6k29PpaFUsrpgKwg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.4-k3s1 h1:Q6INWtq+iQCWzwIh9hyL2o8BebwUBWRLFDV67uiLGkQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.4-k3s1/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.4-k3s1 h1:My9VDJfR4OVpzv9LQTtTEmRQq363Aca1Plfiriv0pnk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.4-k3s1/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.4-k3s1 h1:w2v0kHjtA2tpRLUGOZZh89mA3CGUL49u2gx47KFmPVM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.4-k3s1/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.4-k3s1 h1:ZjZmAGdaVV5K61F0GmabBgpSAn+uD3Svv+al2F5ayAU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.4-k3s1/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.4-k3s1/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.4-k3s1 h1:8IbYSuwE13VoO8Btc5KVMjwOWu8QCEdpjjN5CJ7aFVY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.4-k3s1/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.4-k3s1 h1:dBpDhJ7sorGKf73Z4jbJGn9bVIRUAeAuI8Qq8Gq8Tjo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.4-k3s1/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.4-k3s1 h1:9mI6dVk7g4llfJSpc9LsAv2fCTltGo9mKBUtxgymJc0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.4-k3s1/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.4-k3s1 h1:N6HlYSW7njWTuIQ0c2qwgLdgQveS4PoCAirx7Mye1IE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.4-k3s1/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.4-k3s1 h1:LV67S4+bjuK+njUyDfglKkbgMictvLPYblYeAPblWRE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.4-k3s1/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.4-k3s1 h1:PTLLZckhXFFE9RTwxBqMbAQBp/lsHrM76qRAtbasSXk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.4-k3s1/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.4-k3s1 h1:DLhvBM3SNpf7xhskqgVeChDYCh8pM49jbeMPg5BL4uo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.4-k3s1/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.4-k3s1 h1:A3olfYl6bReyXBhUIw1FUxrN8ZehxHOGoFfB2QaEy5c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.4-k3s1/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.4-k3s1 h1:2i2WSuYBntIVJQhS4ca7sf78O1UD5kpYg51VM63Qocw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.4-k3s1/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.4-k3s1 h1:FnwYvJGeOqN/JmV0wI5sLCLEbSBiljMFJWD1OhmD6gU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.4-k3s1/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.4-k3s1 h1:oa0SLcJZHaw9y+JxwyXLPaFJK72n6BoNWPHmBIDpOSc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.4-k3s1/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.4-k3s1 h1:PzJVXCjyr/gWuFdkoTtDQWfzjJhSmi8UJismcT97mCQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.4-k3s1/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.4-k3s1 h1:9vWBNzn9BF8Ky9rOfPHa5/jr7zQcOoXnqs1B8a/tWj0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.4-k3s1/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.4-k3s1 h1:2XvmczJuDELAI26PzdEzzxJBRObf7ZU+KUXUscI3pCk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.4-k3s1/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.4-k3s1 h1:lZtFAKTYFwP0Lv0dDNHdoeAsEgEjiVGjxPX0ZQeQyKE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.4-k3s1/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.4-k3s1 h1:VEoJKkYSQSmZOA6mlCVJscfm60ggBrcOb29WbGmHRVE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.4-k3s1/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.4-k3s1 h1:flkkjp80xndx9lesG3KUuD4y3MyZrVZnRaiRSAS26Wc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.4-k3s1/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= +github.com/k3s-io/runc v1.2.4-k3s1 h1:wCqlmxJiVUsZvdNsSUUm7Ng0kCK2wAgyBt4lcp2lLP8= +github.com/k3s-io/runc v1.2.4-k3s1/go.mod h1:nSxcWUydXrsBZVYNSkTjoQ/N6rcyTtn+1SD5D4+kRIM= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314/go.mod h1:bMHfSjj1+Zf5VITCZe/wLjuni6rYAj/DjPU/kIVnhfA= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -2449,8 +2449,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -k8s.io/cri-client v0.31.3 h1:9ZwddaNJomqkTBYQqSmB+Ccns3beY4HyYDwmRtWTCJM= -k8s.io/cri-client v0.31.3/go.mod h1:klbWiYkOatOQOkXOYZMZMGSTM8q9eC/efsYGuXcgPes= +k8s.io/cri-client v0.31.4 h1:mA70Ff3GnFedZX0ObF38kPHes8Iv7tiQirh961wKaCA= +k8s.io/cri-client v0.31.4/go.mod h1:s4GmpQvR2X061p7TESE8xju7Au4WTbNYDz1+BySxzgI= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= From abeaf7718615143e0d9535900f7953658d91b755 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 6 Sep 2024 22:41:15 +0000 Subject: [PATCH 5/6] Sync CLI with k3s Signed-off-by: Brad Davidson (cherry picked from commit 0f92a9e1bc46bf3a219e9a2ad344517936d15b3c) Signed-off-by: Brad Davidson --- pkg/cli/cmds/agent.go | 2 ++ pkg/cli/cmds/server.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go index 7d97fb98a3..be6ebb85f6 100644 --- a/pkg/cli/cmds/agent.go +++ b/pkg/cli/cmds/agent.go @@ -39,6 +39,8 @@ var ( "private-registry": copyFlag, "node-ip": copyFlag, "node-external-ip": copyFlag, + "node-internal-dns": copyFlag, + "node-external-dns": copyFlag, "resolv-conf": copyFlag, "flannel-iface": dropFlag, "flannel-conf": dropFlag, diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index ce67d278b9..369145e82f 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -110,6 +110,8 @@ var ( "system-default-registry": copyFlag, "node-ip": copyFlag, "node-external-ip": copyFlag, + "node-internal-dns": copyFlag, + "node-external-dns": copyFlag, "resolv-conf": copyFlag, "flannel-iface": dropFlag, "flannel-conf": dropFlag, From c6f5bea348555a8bd8913f230017390d9a7faeed Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 13 Jan 2025 23:16:29 +0000 Subject: [PATCH 6/6] Sync CLI with k3s Signed-off-by: Brad Davidson --- pkg/cli/cmds/cert.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/cli/cmds/cert.go b/pkg/cli/cmds/cert.go index 7b24a34cf9..e08d2f7dd8 100644 --- a/pkg/cli/cmds/cert.go +++ b/pkg/cli/cmds/cert.go @@ -41,6 +41,7 @@ func NewCertCommand() cli.Command { "debug": copyFlag, "log": copyFlag, "service": copyFlag, + "output": copyFlag, "data-dir": { Usage: "(data) Folder to hold state", Default: rke2Path,