From b34b7ea1fee8641fe2ee36ad4786f84944de64d1 Mon Sep 17 00:00:00 2001 From: liujian <54946465+redscholar@users.noreply.github.com> Date: Sat, 8 Feb 2025 10:12:12 +0800 Subject: [PATCH] fix: fix cve for telemetry and kubesphere (#6352) fix: cve Signed-off-by: joyceliu Co-authored-by: joyceliu (cherry picked from commit b4069c6b3d811e08fe3c9aa34e25b85c840cd252) --- build/ks-controller-manager/Dockerfile | 2 +- go.mod | 4 +--- staging/src/kubesphere.io/api/go.mod | 4 +--- staging/src/kubesphere.io/client-go/go.mod | 4 +--- staging/src/kubesphere.io/utils/go.mod | 4 +--- vendor/modules.txt | 6 +++--- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index 582747d4b..161777cad 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache ca-certificates curl ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ -ARG TELEMETRY_VERSION=1.0.1 +ARG TELEMETRY_VERSION=1.0.2 ARG TARGETARCH RUN curl -LO https://github.com/kubesphere/telemetry/releases/download/v${TELEMETRY_VERSION}/telemetry_${TELEMETRY_VERSION}_linux_${TARGETARCH}.tar.gz && \ tar -zxvf telemetry_${TELEMETRY_VERSION}_linux_${TARGETARCH}.tar.gz -C ${OUTDIR}/usr/local/bin/ telemetry diff --git a/go.mod b/go.mod index 7ec64964d..e8f7b390c 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,7 @@ module kubesphere.io/kubesphere -go 1.22.4 - -toolchain go1.22.8 +go 1.22.11 require ( code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 diff --git a/staging/src/kubesphere.io/api/go.mod b/staging/src/kubesphere.io/api/go.mod index ec8a84c6c..89b2bae97 100644 --- a/staging/src/kubesphere.io/api/go.mod +++ b/staging/src/kubesphere.io/api/go.mod @@ -2,9 +2,7 @@ module kubesphere.io/api -go 1.22.4 - -toolchain go1.22.8 +go 1.22.11 require ( github.com/onsi/gomega v1.34.2 diff --git a/staging/src/kubesphere.io/client-go/go.mod b/staging/src/kubesphere.io/client-go/go.mod index 40e1cc0cf..44e3685d7 100644 --- a/staging/src/kubesphere.io/client-go/go.mod +++ b/staging/src/kubesphere.io/client-go/go.mod @@ -2,9 +2,7 @@ module kubesphere.io/client-go -go 1.22.4 - -toolchain go1.22.8 +go 1.22.11 require ( github.com/google/go-cmp v0.6.0 diff --git a/staging/src/kubesphere.io/utils/go.mod b/staging/src/kubesphere.io/utils/go.mod index 825f81b3c..7f801a75a 100644 --- a/staging/src/kubesphere.io/utils/go.mod +++ b/staging/src/kubesphere.io/utils/go.mod @@ -2,9 +2,7 @@ module kubesphere.io/utils -go 1.22.4 - -toolchain go1.22.8 +go 1.22.11 require ( github.com/aws/aws-sdk-go v1.55.5 diff --git a/vendor/modules.txt b/vendor/modules.txt index 2fac5c29b..360b44892 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2218,7 +2218,7 @@ k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace # kubesphere.io/api v0.0.0 => ./staging/src/kubesphere.io/api -## explicit; go 1.22.4 +## explicit; go 1.22.11 kubesphere.io/api/application/v2 kubesphere.io/api/cluster/v1alpha1 kubesphere.io/api/constants @@ -2232,11 +2232,11 @@ kubesphere.io/api/tenant/v1alpha1 kubesphere.io/api/tenant/v1alpha2 kubesphere.io/api/tenant/v1beta1 # kubesphere.io/client-go v0.0.0 => ./staging/src/kubesphere.io/client-go -## explicit; go 1.22.4 +## explicit; go 1.22.11 kubesphere.io/client-go/kubesphere/scheme kubesphere.io/client-go/rest # kubesphere.io/utils v0.0.0 => ./staging/src/kubesphere.io/utils -## explicit; go 1.22.4 +## explicit; go 1.22.11 kubesphere.io/utils/helm kubesphere.io/utils/s3 # oras.land/oras-go v1.2.6 => oras.land/oras-go v1.2.6