bump Go version to 1.22

Signed-off-by: yxxhero <[email protected]>
goharbor · Sep 5, 2024 · f98bf19 · f98bf19
1 parent 9d23a0a
commit f98bf19
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 19 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.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
@@ -55,7 +55,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - name: Package charts
       run: make helm-generate

diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml
@@ -41,7 +41,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.22
 
       - uses: azure/setup-kubectl@v3
         with:

diff --git a/.github/workflows/contour-tests.yml b/.github/workflows/contour-tests.yml
@@ -43,7 +43,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.22
 
       - uses: azure/setup-kubectl@v3
         with:

diff --git a/.github/workflows/harbor-e2e-tests.yml b/.github/workflows/harbor-e2e-tests.yml
@@ -46,7 +46,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
 
     - uses: azure/setup-kubectl@v3
       with:

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.18
+        go-version: 1.22
     - name: prepare changelog
       run: |
         tag=${{ github.ref }}
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.22
       - uses: actions/checkout@v2
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

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.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: |
         docker buildx create --use
@@ -39,7 +39,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: make go-lint
 
@@ -49,7 +49,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: make go-dependencies-test
 
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: make generated-diff-test
 
@@ -75,7 +75,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.22
 
       - name: Cache go mod
         uses: actions/cache@v2
@@ -129,7 +129,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1
@@ -144,7 +144,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - uses: actions/checkout@v2
     - run: make manifests
     - uses: azure/k8s-bake@v1

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18.3 as build
+FROM golang:1.22.6 as build
 WORKDIR /workspace
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build -o manager main.go

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.18+](https://golang.org/)
+- [Go 1.22+](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/docs/installation/enable_minio_console.md b/docs/installation/enable_minio_console.md
@@ -6,7 +6,7 @@
 
 ## Prerequisites
 
-1. `kubectl` with a proper version(v1.18.6+) is [installed](https://kubernetes.io/docs/tasks/tools/).
+1. `kubectl` with a proper version(v1.22.6+) is [installed](https://kubernetes.io/docs/tasks/tools/).
 1. `kustomize` (optional)with a proper version(v3.8.7+) is [installed](https://kubectl.docs.kubernetes.io/installation/kustomize/).
 1. `git` (optional) is [installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
 

diff --git a/docs/perf/simple-perf-comprasion.md b/docs/perf/simple-perf-comprasion.md
@@ -24,7 +24,7 @@ Here are the network benchmark for CNI using [knb](https://github.com/InfraBuild
 =========================================================
   Discovered CPU         : Intel(R) Xeon(R) Gold 5218 CPU @ 2.30GHz
   Discovered Kernel      : 5.4.0-66-generic
-  Discovered k8s version : v1.18.16+vmware.1
+  Discovered k8s version : v1.22.6+vmware.1
   Discovered MTU         : 1450
   Idle :
     bandwidth = 0 Mbit/s

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

diff --git a/go.sum b/go.sum
@@ -130,6 +130,7 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -394,6 +395,7 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
@@ -1369,6 +1371,7 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=