Skip to content

Commit efa2f7d

Browse files
confoc庄润梓
andauthored
chore: remove opentsdb addr (#203)
* fix:issue201 * fix2 * fix3 * fix4 * fix5 --------- Co-authored-by: 庄润梓 <zhuangrunzi@zhuangrunzideMacBook-Pro.local>
1 parent 9c7c9fa commit efa2f7d

File tree

5 files changed

+30
-16
lines changed

5 files changed

+30
-16
lines changed

pkg/components/frontend.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func (f *frontend) BuildArgs(params ...interface{}) []string {
105105
args = GenerateAddrArg("--rpc-addr", f.config.GRPCAddr, nodeId, args)
106106
args = GenerateAddrArg("--mysql-addr", f.config.MysqlAddr, nodeId, args)
107107
args = GenerateAddrArg("--postgres-addr", f.config.PostgresAddr, nodeId, args)
108-
args = GenerateAddrArg("--opentsdb-addr", f.config.OpentsdbAddr, nodeId, args)
109108

110109
if len(f.config.Config) > 0 {
111110
args = append(args, fmt.Sprintf("-c=%s", f.config.Config))

pkg/config/baremetal.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ type Frontend struct {
7676
PostgresAddr string `yaml:"postgresAddr" validate:"omitempty,hostname_port"`
7777
MetaAddr string `yaml:"metaAddr" validate:"omitempty,hostname_port"`
7878
MysqlAddr string `yaml:"mysqlAddr" validate:"omitempty,hostname_port"`
79-
OpentsdbAddr string `yaml:"opentsdbAddr" validate:"omitempty,hostname_port"`
8079

8180
Replicas int `yaml:"replicas" validate:"gt=0"`
8281
Config string `yaml:"config" validate:"omitempty,filepath"`
@@ -111,7 +110,6 @@ func DefaultBareMetalConfig() *BareMetalClusterConfig {
111110
GRPCAddr: "0.0.0.0:4001",
112111
MysqlAddr: "0.0.0.0:4002",
113112
PostgresAddr: "0.0.0.0:4003",
114-
OpentsdbAddr: "0.0.0.0:4242",
115113
},
116114
MetaSrv: &MetaSrv{
117115
Replicas: 1,

pkg/helm/loader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestLoadAndRenderChart(t *testing.T) {
4343
ReleaseName: "gtctl-ut",
4444
Namespace: "default",
4545
ChartName: artifacts.GreptimeDBClusterChartName,
46-
ChartVersion: "0.1.2",
46+
ChartVersion: "0.1.29",
4747
FromCNRegion: false,
4848
ValuesOptions: opt.CreateClusterOptions{
4949
ImageRegistry: "registry.cn-hangzhou.aliyuncs.com",

pkg/helm/testdata/db-manifests.yaml

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,50 @@ metadata:
88
spec:
99
base:
1010
main:
11-
image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb:v0.4.1'
11+
image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb:v0.8.0'
1212
resources:
13-
limits:
14-
cpu: 500m
15-
memory: 512Mi
16-
requests:
17-
cpu: 500m
18-
memory: 512Mi
13+
limits: {}
14+
requests: {}
1915
frontend:
2016
replicas: 3
17+
template:
18+
main:
19+
resources:
20+
requests:
21+
{}
22+
limits:
23+
{}
2124
meta:
2225
replicas: 3
2326
etcdEndpoints:
2427
- mycluster-etcd.default:2379
28+
template:
29+
main:
30+
resources:
31+
requests:
32+
{}
33+
limits:
34+
{}
2535
datanode:
2636
replicas: 3
37+
template:
38+
main:
39+
resources:
40+
requests:
41+
{}
42+
limits:
43+
{}
2744
storage:
2845
storageClassName: ebs-sc
2946
storageSize: 11Gi
3047
storageRetainPolicy: Delete
31-
walDir: /tmp/greptimedb/wal
48+
dataHome: /data/greptimedb
49+
walDir: /data/greptimedb/wal
3250
httpServicePort: 4000
3351
grpcServicePort: 4001
3452
mysqlServicePort: 4002
3553
postgresServicePort: 4003
36-
openTSDBServicePort: 4242
3754
initializer:
38-
image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.17'
39-
storage:
55+
image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.25'
56+
objectStorage:
4057
{}

tests/e2e/greptimedbcluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const (
4141
)
4242
PARTITION ON COLUMNS (n) (
4343
n < 5,
44-
n < 9,
44+
n >= 5 AND n < 9,
4545
n >= 9
4646
)`
4747

0 commit comments

Comments
 (0)