chore: fix incompatibe frontend cmd opts and upgrade go version (#117)

* fix: modify frontend cmd options(related PR: GreptimeTeam/greptimedb#2609) Signed-off-by: zyy17 <[email protected]> * ci: upgrade go version from 1.18 to 1.21 * test: bump golangci-lint version from 1.50.1 to 1.54.2 --------- Signed-off-by: zyy17 <[email protected]>
GreptimeTeam · Oct 19, 2023 · 8d083c4 · 8d083c4
1 parent 658be91
commit 8d083c4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,6 +16,9 @@ name: CI
 
 on: [push, pull_request]
 
+env:
+  GO_VERSION: "1.21"
+
 jobs:
   build:
     name: Build the project
@@ -27,7 +30,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18.4"
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Make lint
         run: |
@@ -51,7 +54,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18.4"
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Run the unit tests
         run: |
@@ -67,7 +70,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18.4"
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Run e2e
         id: e2e

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,6 +22,9 @@ on:
     tags:
       - "v*.*.*"
 
+env:
+  GO_VERSION: "1.21"
+
 jobs:
   docker:
     name: Build and push image

diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ MANIFESTS_DIR = ./manifests
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.24.1
 
-GOLANGCI_LINT_VERSION = v1.50.1
+GOLANGCI_LINT_VERSION = v1.54.2
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/controllers/greptimedbcluster/deployers/frontend.go b/controllers/greptimedbcluster/deployers/frontend.go
@@ -231,7 +231,7 @@ func (b *frontendBuilder) Generate() ([]client.Object, error) {
 func (b *frontendBuilder) generateMainContainerArgs() []string {
 	var args = []string{
 		"frontend", "start",
-		"--grpc-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.GRPCServicePort),
+		"--rpc-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.GRPCServicePort),
 		"--metasrv-addr", fmt.Sprintf("%s.%s:%d", ResourceName(b.Cluster.Name, v1alpha1.MetaComponentKind),
 			b.Cluster.Namespace, b.Cluster.Spec.Meta.ServicePort),
 		"--http-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.HTTPServicePort),

diff --git a/docker/initializer/Dockerfile b/docker/initializer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.21 as builder
 
 ENV LANG en_US.utf8
 WORKDIR /greptimedb-operator

diff --git a/docker/operator/Dockerfile b/docker/operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.21 as builder
 
 ENV LANG en_US.utf8
 WORKDIR /greptimedb-operator
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,9 @@ on: @@
         tags:
           - "v*.*.*"
+    env:
+      GO_VERSION: "1.21"
     jobs:
       docker:
         name: Build and push image
@@ Expand Down @@