diff --git a/config/samples/basic/cluster.yaml b/config/samples/basic/cluster.yaml index 8e5587ec..61648e65 100644 --- a/config/samples/basic/cluster.yaml +++ b/config/samples/basic/cluster.yaml @@ -6,7 +6,7 @@ metadata: spec: base: main: - image: greptime/greptimedb:integration-paas-test + image: greptime/greptimedb:0.1.0-alpha-20221116 frontend: replicas: 1 meta: diff --git a/controllers/greptimedbcluster/deployers/datanode.go b/controllers/greptimedbcluster/deployers/datanode.go index c3c97fb5..4a007684 100644 --- a/controllers/greptimedbcluster/deployers/datanode.go +++ b/controllers/greptimedbcluster/deployers/datanode.go @@ -430,9 +430,7 @@ func (d *DatanodeDeployer) buildDatanodeArgs(cluster *v1alpha1.GreptimeDBCluster return []string{ "datanode", "start", "--metasrv-addr", fmt.Sprintf("%s.%s:%d", d.ResourceName(cluster.Name, v1alpha1.MetaComponentKind), cluster.Namespace, cluster.Spec.Meta.ServicePort), - "--http-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.HTTPServicePort), "--mysql-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.MySQLServicePort), - "--postgres-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.PostgresServicePort), "--config-file", defaultConfigDir + defaultConfigName, } } diff --git a/docker/initializer/configs/datanode.defaults.toml b/docker/initializer/configs/datanode.defaults.toml index 32a4ca14..a4c51775 100644 --- a/docker/initializer/configs/datanode.defaults.toml +++ b/docker/initializer/configs/datanode.defaults.toml @@ -1,23 +1,18 @@ # The following default configs from https://github.com/GreptimeTeam/greptimedb/blob/develop/config/datanode.example.toml node_id = 42 -http_addr = '0.0.0.0:3000' -rpc_addr = '0.0.0.0:3001' +mode = 'distributed' +rpc_addr = '127.0.0.1:3001' wal_dir = '/tmp/greptimedb/wal' rpc_runtime_size = 8 -mode = "standalone" -mysql_addr = '0.0.0.0:3306' +mysql_addr = '127.0.0.1:3306' mysql_runtime_size = 4 -# applied when postgres feature enbaled -postgres_addr = '0.0.0.0:5432' -postgres_runtime_size = 4 - [storage] type = 'File' data_dir = '/tmp/greptimedb/data/' [meta_client_opts] -metasrv_addr = "1.1.1.1:3002" +metasrv_addr = '1.1.1.1:3002' timeout_millis = 3000 connect_timeout_millis = 5000 -tcp_nodelay = true +tcp_nodelay = false diff --git a/hack/e2e/setup-e2e-env.sh b/hack/e2e/setup-e2e-env.sh index 3cc1952a..31bec72a 100755 --- a/hack/e2e/setup-e2e-env.sh +++ b/hack/e2e/setup-e2e-env.sh @@ -8,7 +8,7 @@ CLUSTER=greptimedb-operator-e2e REGISTRY_NAME=kind-registry REGISTRY_PORT=5001 -TEST_GREPTIMEDB_IMAGE=greptime/greptimedb:integration-paas-test +TEST_GREPTIMEDB_IMAGE=greptime/greptimedb:0.1.0-alpha-20221116 TEST_ETCD_IMAGE=greptime/etcd:v3.5.5 function check_prerequisites() {