Skip to content

Commit

Permalink
Upgrade go version to 1.19 (kubesphere#5446)
Browse files Browse the repository at this point in the history
Signed-off-by: hongzhouzi <[email protected]>
  • Loading branch information
hongzhouzi authored Jan 12, 2023
1 parent 3a03b4a commit ade0d32
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/ks-apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion build/ks-controller-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

module kubesphere.io/kubesphere

go 1.18
go 1.19

require (
code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6
Expand Down
5 changes: 3 additions & 2 deletions staging/publishing/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -36,4 +37,4 @@ rules:
branch: master
dir: staging/src/kubesphere.io/utils
name: master
go: 1.18.9
go: 1.19.4
2 changes: 1 addition & 1 deletion staging/src/kubesphere.io/api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module kubesphere.io/api

go 1.18
go 1.19

require (
github.com/go-logr/logr v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion staging/src/kubesphere.io/client-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion staging/src/kubesphere.io/utils/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module kubesphere.io/utils

go 1.18
go 1.19

require (
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit ade0d32

Please sign in to comment.