chore: remove wait meta init contianer and update examples (#2284)

(cherry picked from commit aba6875)

Author: shanshanying

addons/greptimedb/templates/NOTES.txt

@@ -7,11 +7,8 @@ Example routines to create and connect a GreptimeDB cluster using kbcli.
 
 1. Create a GreptimeDB cluster
 
-Minimal >
-kbcli cluster create my-cluster --cluster-definition greptimedb
-
 Replicas >
-helm install my-cluster ./addons/greptimedb-cluster
+helm install my-cluster ./addons-cluster/greptimedb-cluster
 
 2. Port-forward svc to localhost and connect to GreptimeDB cluster
 

addons/greptimedb/templates/cmpd-datanode.yaml

@@ -86,16 +86,6 @@ spec:
           - /etc/greptimedb/config.toml
     dnsPolicy: ClusterFirst
     initContainers:
-      - name: wait-meta
-        imagePullPolicy: {{default .Values.images.pullPolicy "IfNotPresent"}}
-        command:
-          - bin/sh
-          - -c
-          - |
-            until nslookup ${GREPTIMEDB_META_SVC}; do
-              # datanode requires at least one meta is ready
-              echo "waiting for meta"; sleep 2;
-            done;
       - name: initializer
         args:
           - --config-path

addons/greptimedb/templates/cmpd-meta.yaml

@@ -33,7 +33,7 @@ spec:
         clusterVarRef:
           namespace: Required
     - name: GREPTIMEDB_ETCD_SVC_DEFAULT
-      value: $(CLUSTER_NAME)-etcd-headless.$(CLUSTER_NAMESPACE).svc{{ .Values.clusterDomain}}
+      value: $(CLUSTER_NAME)-etcd-headless.$(CLUSTER_NAMESPACE).svc{{ .Values.clusterDomain}}:2379
     - name: GREPTIMEDB_ETCD_SVC
       valueFrom:
         serviceRefVarRef:
@@ -83,7 +83,7 @@ spec:
           - --server-addr
           - $(POD_IP):3002
           - --store-addr
-          - $(GREPTIMEDB_ETCD_SVC):2379
+          - $(GREPTIMEDB_ETCD_SVC)
           - --config-file
           - /etc/greptimedb/config.toml
         env:

addons/greptimedb/templates/cmpv.yaml

@@ -25,7 +25,6 @@ spec:
       serviceVersion: 0.3.2
       images:
         datanode: {{ .Values.images.greptimedb.registry | default .Values.images.registry }}/{{ .Values.images.greptimedb.repository }}:0.3.2
-        wait-meta: {{ .Values.images.busybox.registry | default (.Values.images.registry | default "docker.io") }}/{{ .Values.images.busybox.repository }}:{{ .Values.images.busybox.tag }}
         initializer: {{ .Values.images.initializer.registry | default (.Values.images.registry | default "docker.io") }}/{{ .Values.images.initializer.repository }}:{{ .Values.images.initializer.tag }}
     - name: frontend-0.3.2
       serviceVersion: 0.3.2

addons/greptimedb/values.yaml

@@ -21,10 +21,6 @@ images:
     registry: ""
     repository: greptime/greptimedb-initializer
     tag: 0.1.0-alpha.12
-  busybox:
-    registry: ""
-    repository: busybox
-    tag: 1.35
 
 ## @param metasrv config
 ##

examples/greptimedb/cluster-with-exteranl-etcd.yaml

@@ -0,0 +1,91 @@
+---
+# create etcd cluster once
+apiVersion: apps.kubeblocks.io/v1
+kind: Cluster
+metadata:
+  name: etcd-cluster
+  namespace: demo
+spec:
+  terminationPolicy: Delete
+  componentSpecs:
+    - name: etcd
+      componentDef: etcd
+      serviceVersion: 3.6.1
+      disableExporter: false
+      replicas: 3
+      resources:
+        limits:
+          cpu: "0.5"
+          memory: "0.5Gi"
+        requests:
+          cpu: "0.5"
+          memory: "0.5Gi"
+      volumeClaimTemplates:
+        - name: data
+          spec:
+            storageClassName: ""
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: 20Gi
+---
+# create a greptimedb cluster refering an alreay creating etcd cluster
+apiVersion: apps.kubeblocks.io/v1
+kind: Cluster
+metadata:
+  name: greptimedb-cluster-external-etcd
+  namespace: demo
+spec:
+  clusterDef: greptimedb
+  # Specifies the name of the ClusterTopology to be used when creating the Cluster.
+  # use external-etcd topology to reuse an existing etcd cluster
+  topology: external-etcd
+  terminationPolicy: Delete
+  componentSpecs:
+    - name: frontend
+      replicas: 1
+      resources:
+        limits:
+          cpu: "0.5"
+          memory: 0.5Gi
+        requests:
+          cpu: "0.5"
+          memory: 0.5Gi
+    - name: datanode
+      replicas: 3
+      resources:
+        limits:
+          cpu: "0.5"
+          memory: 0.5Gi
+        requests:
+          cpu: "0.5"
+          memory: 0.5Gi
+      volumeClaimTemplates:
+        - name: datanode
+          spec:
+            accessModes:
+              - ReadWriteOnce
+            storageClassName: ""
+            resources:
+              requests:
+                storage: 20Gi
+    - name: meta
+      serviceRefs:
+      - name: etcd
+        clusterServiceSelector:
+          cluster: etcd-cluster # set this to your ETCD Cluster Name
+          namesapce: demo
+          service:
+            component: etcd
+            service: headless
+            port: client
+      replicas: 1
+      resources:
+        limits:
+          cpu: "0.5"
+          memory: 0.5Gi
+        requests:
+          cpu: "0.5"
+          memory: 0.5Gi
+