bump Go to 1.18 (goharbor#926)

* bump Go to 1.18 Signed-off-by: yxxhero <aiopsclub@163.com>
thcdrt · Jul 18, 2022 · 8a09ac2 · 8a09ac2
1 parent 704cd7a
commit 8a09ac2
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 409 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - name: Build manager
       run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - name: Package charts
       run: make helm-generate

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       run: git fetch --prune --unshallow
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - name: prepare changelog
       run: |
         tag=${{ github.ref }}
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - uses: actions/checkout@v2
       - name: Build manager
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make docker-build
 
@@ -37,7 +37,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make go-lint
 
@@ -47,7 +47,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make go-dependencies-test
 
@@ -57,7 +57,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make generated-diff-test
 
@@ -73,7 +73,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Cache go mod
         uses: actions/cache@v2
@@ -156,7 +156,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
 
     - uses: azure/setup-kubectl@v1
       with:
@@ -363,7 +363,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - uses: azure/setup-kubectl@v1
         with:
@@ -572,7 +572,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - uses: azure/setup-kubectl@v1
         with:
@@ -736,7 +736,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1
@@ -751,7 +751,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1

diff --git a/.golangci.yml b/.golangci.yml
@@ -33,16 +33,16 @@ linters:
   - gofumpt
   - goheader
   - goimports
-  - golint
+  - revive
   - gomnd
   - gomodguard
   - goprintffuncname
   - gosec
   - gosimple
   - govet
   - ineffassign
-  - interfacer
-  - maligned
+  # - interfacer
+  # - maligned
   - misspell
   - nakedret
   - nestif
@@ -51,7 +51,7 @@ linters:
   - nolintlint
   - prealloc
   - rowserrcheck
-  - scopelint
+  - exportloopref
   - sqlclosecheck
   - staticcheck
   - structcheck

diff --git a/Makefile b/Makefile
@@ -550,7 +550,7 @@ $(MARKDOWNLINT):
 # find or download golangci-lint
 # download golangci-lint if necessary
 GOLANGCI_LINT := $(BIN)/golangci-lint
-GOLANGCI_LINT_VERSION := 1.45.2
+GOLANGCI_LINT_VERSION := 1.46.2
 
 .PHONY: golangci-lint
 golangci-lint:
@@ -638,7 +638,7 @@ $(GORELEASER):
 
 # find or download stringer
 # download stringer if necessary
-STRINGER_VERSION := v0.1.10
+STRINGER_VERSION := v0.1.11
 STRINGER := $(BIN)/stringer
 
 .PHONY: stringer

diff --git a/docs/development.md b/docs/development.md
@@ -15,7 +15,7 @@ Have a look in [CONTRIBUTING.md](https://github.com/goharbor/harbor-operator/blo
 
 ### Packages
 
-- [Go 1.17+](https://golang.org/)
+- [Go 1.18+](https://golang.org/)
 - [Helm](https://helm.sh/)
 - [Docker](https://docker.com) & [Docker Compose](https://docs.docker.com/compose/install/)
 - [OpenSSL](https://www.openssl.org/)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/goharbor/harbor-operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Masterminds/semver v1.5.0

diff --git a/go.sum b/go.sum
diff --git a/pkg/controller/resource.go b/pkg/controller/resource.go
@@ -227,7 +227,7 @@ func needsNodePort(svc *corev1.Service) bool {
 	return false
 }
 
-func (c *Controller) AddUnsctructuredToManage(ctx context.Context, resource *unstructured.Unstructured, dependencies ...graph.Resource) (graph.Resource, error) { // nolint:interfacer
+func (c *Controller) AddUnsctructuredToManage(ctx context.Context, resource *unstructured.Unstructured, dependencies ...graph.Resource) (graph.Resource, error) {
 	if resource == nil {
 		return nil, nil
 	}

diff --git a/pkg/utils/strings/name.go b/pkg/utils/strings/name.go
@@ -16,7 +16,7 @@ const (
 	baseBitSize            = 64
 )
 
-var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano())) // nolint:gosec
+var seededRand = rand.New(rand.NewSource(time.Now().UnixNano())) // nolint:gosec
 
 func NormalizeName(name string, suffixes ...string) string {
 	if len(suffixes) > 0 {