Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Oct 19, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73308e1
fix: modify frontend cmd options(related PR: https://github.com/Grept…
zyy17 Oct 19, 2023
1197395
ci: upgrade go version from 1.18 to 1.21
zyy17 Oct 19, 2023
6175045
test: bump golangci-lint version from 1.50.1 to 1.54.2
zyy17 Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ name: CI

on: [push, pull_request]

env:
GO_VERSION: "1.21"

jobs:
build:
name: Build the project
Expand All @@ -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: |
Expand All @@ -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: |
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion controllers/greptimedbcluster/deployers/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion docker/initializer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 as builder
FROM golang:1.21 as builder

ENV LANG en_US.utf8
WORKDIR /greptimedb-operator
Expand Down
2 changes: 1 addition & 1 deletion docker/operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 as builder
FROM golang:1.21 as builder

ENV LANG en_US.utf8
WORKDIR /greptimedb-operator
Expand Down