chore: bump up a bunch of dependencies

apache · Jan 20, 2025 · 5996f50 · 5996f50
1 parent fc662aa
commit 5996f50
Show file tree

Hide file tree

Showing 272 changed files with 515 additions and 26,703 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -32,12 +32,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-          id: go
+          go-version: '1.23'
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check License
         uses: apache/skywalking-eyes/header@501a28d2fb4a9b962661987e50cf0219631b32ff
       - name: Check
@@ -47,11 +46,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build
         run: make build
       - name: Build docker image
@@ -61,12 +60,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "install kubebuilder"
         run: ./hack/install-kubebuilder.sh
       - name: tests
@@ -76,12 +75,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test(oap+ui+agent)
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205      # always prefer to use a revision instead of `main`.
         with:
@@ -91,12 +90,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test(oap+ui+agent)
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -106,12 +105,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test(oap+ui+agent+configmap)
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -121,12 +120,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205     
         with:
@@ -142,12 +141,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -157,12 +156,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -172,12 +171,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -187,12 +186,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -202,12 +201,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -217,12 +216,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:
@@ -232,12 +231,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run E2E Test
         uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
         with:

diff --git a/adapter/Dockerfile b/adapter/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/adapter/go.mod b/adapter/go.mod
@@ -1,8 +1,6 @@
 module github.com/apache/skywalking-swck/adapter
 
-go 1.22
-
-toolchain go1.22.1
+go 1.23
 
 require (
 	github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f

diff --git a/hack/build/module.mk b/hack/build/module.mk
@@ -23,9 +23,9 @@ tool_bin := $(root_dir)/bin
 
 include $(root_dir)/hack/build/base.mk
 
-CONTROLLER_GEN_VERSION := v0.14.0
+CONTROLLER_GEN_VERSION := v0.17.0
 KUSTOMIZE_VERSION := v4.5.6
-GOLANGCI_LINT_VERSION := v1.53.3
+GOLANGCI_LINT_VERSION := v1.63.4
 
 ##@ Code quality and integrity
 
@@ -52,7 +52,7 @@ check: ## Check that the status
 
 .PHONY: lint
 lint: golangci-lint ## Lint codes
-	$(GOLANGCILINT) -v run --config $(root_dir)/golangci.yml 
+	$(GOLANGCILINT) -v run --config $(root_dir)/golangci.yml --timeout 10m
 
 CONTROLLER_GEN = $(tool_bin)/controller-gen
 .PHONY: controller-gen

diff --git a/operator/Dockerfile b/operator/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/operator/apis/operator/v1alpha1/oapserver_types.go b/operator/apis/operator/v1alpha1/oapserver_types.go
@@ -40,7 +40,7 @@ type OAPServerSpec struct {
 	Service Service `json:"service,omitempty"`
 	// StorageConfig relevant settings
 	// +kubebuilder:validation:Optional
-	StorageConfig RelevantStorage `json:"storage,omitempty"`
+	StorageConfig *RelevantStorage `json:"storage,omitempty"`
 }
 
 // OAPServerStatus defines the observed state of OAPServer
@@ -61,7 +61,7 @@ type RelevantStorage struct {
 	// +kubebuilder:validation:Required
 	Name string `json:"name,omitempty"`
 	// Storage relevant settings
-	Storage Storage `json:"injectstorage,omitempty"`
+	Storage *Storage `json:"injectstorage,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/operator/apis/operator/v1alpha1/zz_generated.deepcopy.go b/operator/apis/operator/v1alpha1/zz_generated.deepcopy.go