refactor: refine naming and correct helm annotation

GreptimeTeam · Oct 23, 2023 · cbaeefe · cbaeefe
1 parent ced080d
commit cbaeefe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cmd/gtctl/cluster/create/create.go b/pkg/cmd/gtctl/cluster/create/create.go
@@ -315,7 +315,7 @@ func deployGreptimeDBCluster(ctx context.Context, l logger.Logger, options *Clus
 		DatanodeStorageClassName:    options.StorageClassName,
 		DatanodeStorageSize:         options.StorageSize,
 		DatanodeStorageRetainPolicy: options.StorageRetainPolicy,
-		EtcdEndPoint:                fmt.Sprintf("%s.%s:2379", common.EtcdClusterName(clusterName), options.EtcdNamespace),
+		EtcdEndPoints:               fmt.Sprintf("%s.%s:2379", common.EtcdClusterName(clusterName), options.EtcdNamespace),
 		ConfigValues:                options.Set.clusterConfig,
 		UseGreptimeCNArtifacts:      options.UseGreptimeCNArtifacts,
 		ValuesFile:                  options.GreptimeDBClusterValuesFile,

diff --git a/pkg/deployer/types.go b/pkg/deployer/types.go
@@ -77,7 +77,7 @@ type CreateGreptimeDBClusterOptions struct {
 	DatanodeStorageClassName    string `helm:"datanode.storage.storageClassName"`
 	DatanodeStorageSize         string `helm:"datanode.storage.storageSize"`
 	DatanodeStorageRetainPolicy string `helm:"datanode.storage.storageRetainPolicy"`
-	EtcdEndPoint                string `helm:"etcdEndpoints"`
+	EtcdEndPoints               string `helm:"meta.etcdEndpoints"`
 	ConfigValues                string `helm:"*"`
 }
 

diff --git a/pkg/helm/loader_test.go b/pkg/helm/loader_test.go
@@ -48,7 +48,7 @@ func TestLoadAndRenderChart(t *testing.T) {
 			DatanodeStorageClassName:    "ebs-sc",
 			DatanodeStorageSize:         "11Gi",
 			DatanodeStorageRetainPolicy: "Delete",
-			EtcdEndPoint:                "127.0.0.1:2379",
+			EtcdEndPoints:               "mycluster-etcd.default:2379",
 			InitializerImageRegistry:    "registry.cn-hangzhou.aliyuncs.com",
 			ConfigValues:                "meta.replicas=3",
 		},

diff --git a/pkg/helm/testdata/db-manifests.yaml b/pkg/helm/testdata/db-manifests.yaml
@@ -21,7 +21,7 @@ spec:
   meta:
     replicas: 3
     etcdEndpoints:
-      - etcd.default.svc.cluster.local:2379
+      - mycluster-etcd.default:2379
   datanode:
     replicas: 3
     storage: