diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 2f056f5f5a..4465affd18 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -13,10 +13,10 @@ jobs: GO111MODULE: on steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml index 875b24e753..64160d5efc 100644 --- a/.github/workflows/nightly-builds.yml +++ b/.github/workflows/nightly-builds.yml @@ -15,10 +15,10 @@ jobs: GO111MODULE: on steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index 873e16a2de..edc0925c7f 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -3,7 +3,7 @@ # that can be found in the LICENSE file. # Build -FROM golang:1.18.4 as build_context +FROM golang:1.19.4 as build_context ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index 5e0e3d8bfb..eb77e51b8a 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -22,7 +22,7 @@ RUN mv /tmp/ingress-nginx ${OUTDIR}/var/helm-charts/ # Build -FROM golang:1.18.4 as build_context +FROM golang:1.19.4 as build_context ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ diff --git a/go.mod b/go.mod index 8dcd35d35c..fbcb58fea0 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ module kubesphere.io/kubesphere -go 1.18 +go 1.19 require ( code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 3b8c9206a6..25dec22752 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -9,6 +9,7 @@ rules: branch: master dir: staging/src/kubesphere.io/client-go name: master + go: 1.19.4 - source: branch: release-3.1 dir: staging/src/kubesphere.io/client-go @@ -22,7 +23,7 @@ rules: branch: master dir: staging/src/kubesphere.io/api name: master - go: 1.18.9 + go: 1.19.4 smoke-test: | # assumes GO111MODULE=on @@ -36,4 +37,4 @@ rules: branch: master dir: staging/src/kubesphere.io/utils name: master - go: 1.18.9 \ No newline at end of file + go: 1.19.4 \ No newline at end of file diff --git a/staging/src/kubesphere.io/api/go.mod b/staging/src/kubesphere.io/api/go.mod index f36c795de2..0591e89681 100644 --- a/staging/src/kubesphere.io/api/go.mod +++ b/staging/src/kubesphere.io/api/go.mod @@ -2,7 +2,7 @@ module kubesphere.io/api -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 diff --git a/staging/src/kubesphere.io/client-go/go.mod b/staging/src/kubesphere.io/client-go/go.mod index b5099f84e9..26353d7eb7 100644 --- a/staging/src/kubesphere.io/client-go/go.mod +++ b/staging/src/kubesphere.io/client-go/go.mod @@ -2,7 +2,7 @@ module kubesphere.io/client-go -go 1.18 +go 1.19 require ( github.com/go-resty/resty/v2 v2.5.0 diff --git a/staging/src/kubesphere.io/utils/go.mod b/staging/src/kubesphere.io/utils/go.mod index 5d23b18919..8420f7caa7 100644 --- a/staging/src/kubesphere.io/utils/go.mod +++ b/staging/src/kubesphere.io/utils/go.mod @@ -2,7 +2,7 @@ module kubesphere.io/utils -go 1.18 +go 1.19 require ( gopkg.in/yaml.v3 v3.0.1 diff --git a/vendor/modules.txt b/vendor/modules.txt index 981ba4c58c..c481c5a794 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2300,7 +2300,7 @@ k8s.io/utils/strings k8s.io/utils/strings/slices k8s.io/utils/trace # kubesphere.io/api v0.0.0 => ./staging/src/kubesphere.io/api -## explicit; go 1.18 +## explicit; go 1.19 kubesphere.io/api/alerting/v2beta1 kubesphere.io/api/application/crdinstall kubesphere.io/api/application/v1alpha1 @@ -2327,7 +2327,7 @@ kubesphere.io/api/tenant/v1alpha2 kubesphere.io/api/types/v1beta1 kubesphere.io/api/types/v1beta2 # kubesphere.io/client-go v0.0.0 => ./staging/src/kubesphere.io/client-go -## explicit; go 1.18 +## explicit; go 1.19 kubesphere.io/client-go/client kubesphere.io/client-go/client/generic kubesphere.io/client-go/restclient