minor tweaks to adapt latest cloud environment & versions

Author: bindiego

bin/demo.sh

@@ -11,7 +11,7 @@ default_pool=default-pool
 nodes_per_zone=5 # per zone
 machine_type=e2-standard-2
 release_channel=None # None -> static, e.g. rapid, regular, stable
-gke_version=1.24.3-gke.2100
+gke_version=1.24.5-gke.600
 eck_version=2.4.0
 es_cluster_name=dingo-demo
 
@@ -35,13 +35,14 @@ __create_gke() {
         --scopes "https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/monitoring","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/trace.append" \
         --num-nodes "$nodes_per_zone" \
         --logging=SYSTEM,WORKLOAD \
-        --monitoring=SYSTEM,WORKLOAD \
+        --monitoring=SYSTEM \
+        --enable-managed-prometheus \
         --enable-ip-alias \
         --network "projects/${project_id}/global/networks/default" \
         --subnetwork "projects/${project_id}/regions/$region/subnetworks/default" \
         --default-max-pods-per-node "110" \
         --no-enable-master-authorized-networks \
-        --addons HorizontalPodAutoscaling,HttpLoadBalancing \
+        --addons HorizontalPodAutoscaling,HttpLoadBalancing,GcePersistentDiskCsiDriver \
         --no-enable-autoupgrade \
         --max-surge-upgrade 1 \
         --max-unavailable-upgrade 0 \
@@ -148,6 +149,7 @@ __main() {
     if [ $# -eq 0 ]
     then
         __deploy_demo
+        sleep 120
         __status
     else
         case $1 in
@@ -165,6 +167,7 @@ __main() {
                 ;;
             *)
                 __deploy_demo
+                sleep 120
                 __status
                 ;;
         esac

bin/gke.sh

@@ -11,7 +11,7 @@ default_pool=default-pool
 nodes_per_zone=6 # per zone
 machine_type=n2-standard-8
 release_channel=None # None -> static, e.g. rapid, regular, stable
-gke_version=1.24.3-gke.2100
+gke_version=1.24.5-gke.600
 eck_version=2.4.0
 __usage() {
     echo "Usage: ./bin/gke.sh {create|(delete,del,d)|scale|fix}"
@@ -37,13 +37,14 @@ __create() {
         --scopes "https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/monitoring","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/trace.append" \
         --num-nodes "$nodes_per_zone" \
         --logging=SYSTEM,WORKLOAD \
-        --monitoring=SYSTEM,WORKLOAD \
+        --monitoring=SYSTEM \
+        --enable-managed-prometheus \
         --enable-ip-alias \
         --network "projects/${project_id}/global/networks/default" \
         --subnetwork "projects/${project_id}/regions/$region/subnetworks/default" \
         --default-max-pods-per-node "110" \
         --no-enable-master-authorized-networks \
-        --addons HorizontalPodAutoscaling,HttpLoadBalancing \
+        --addons HorizontalPodAutoscaling,HttpLoadBalancing,GcePersistentDiskCsiDriver \
         --no-enable-autoupgrade \
         --max-surge-upgrade 1 \
         --max-unavailable-upgrade 0 \

readme.md

@@ -59,6 +59,8 @@ Password:  cI805x9s21Rg83cm46hRlUhV
 
 and you could always retrieve above information by running `./bin/demo.sh status`
 
+如果最后的outpu里没有正确输出连接信息，可以等待几分钟时间再次尝试手动查询集群链接状态 `./bin/demo.sh status`
+
 ### clean up
 
 To tidy things up and release all the created cloud resources, simply run `./bin/demo.sh clean` 

templates/apm.yml

@@ -3,7 +3,7 @@ kind: ApmServer
 metadata:
       name: dingo-apm
 spec:
-    version: 8.4.1
+    version: 8.4.3
     count: 1
     elasticsearchRef:
         name: dingo

templates/es.all_role.yml

@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.4.1
+    version: 8.4.3
     #http:
         #service:
             #spec:

templates/es.demo.yml

@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo-demo
 spec:
-    version: 8.4.1
+    version: 8.4.3
     http:
         service:
             spec:
@@ -42,14 +42,14 @@ spec:
               - name: elasticsearch
                 resources:
                     requests:
-                        memory: 5Gi
-                        cpu: 1200m
+                        memory: 4Gi
+                        cpu: 1100m
                     limits:
-                        memory: 5Gi
-                        cpu: 1200m
+                        memory: 4Gi
+                        cpu: 1100m
                 env:
                 - name: ES_JAVA_OPTS
-                  value: "-Xms3g -Xmx3g"
+                  value: "-Xms2g -Xmx2g"
                 - name: PRE_STOP_MAX_WAIT_SECONDS
                   value: "20"
                 - name: PRE_STOP_ADDITIONAL_WAIT_SECONDS

templates/es.prod.yml

@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.4.1
+    version: 8.4.3
     #http:
         #service:
             #spec:

templates/es.single_node.yml

@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.4.1
+    version: 8.4.3
     #http:
         #service:
             #spec:

templates/kbn.demo.yml

@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
     name: dingo-demo-kbn 
 spec:
-    version: 8.4.1
+    version: 8.4.3
     count: 1
     http:
         service:
@@ -24,11 +24,11 @@ spec:
             - name: kibana
               resources:
                   requests:
-                      memory: 5Gi
-                      cpu: 1200m
+                      memory: 4Gi
+                      cpu: 1100m
                   limits:
-                      memory: 5Gi
-                      cpu: 1200m
+                      memory: 4Gi
+                      cpu: 1100m
               readinessProbe:
                   exec:
                       command:

templates/kbn.yml

@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
     name: dingo-kbn 
 spec:
-    version: 8.4.1
+    version: 8.4.3
     count: 1
     #http:
         #service: