update app.zip

ansible/requirements.yml

@@ -3,7 +3,7 @@
 - src: https://qingcloudappcenter.github.io/ansible-roles/arping-1.0.5.tar.gz
 - src: https://qingcloudappcenter.github.io/ansible-roles/confd-files-1.1.0.tar.gz
 - src: https://qingcloudappcenter.github.io/ansible-roles/create-service-user-1.0.0.tar.gz
-- src: https://qingcloudappcenter.github.io/ansible-roles/docker-1.0.10.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/docker-1.0.11.tar.gz
 - src: https://qingcloudappcenter.github.io/ansible-roles/golang-1.0.3.tar.gz
 - src: https://qingcloudappcenter.github.io/ansible-roles/etcd-1.1.0.tar.gz
 - src: https://qingcloudappcenter.github.io/ansible-roles/install-1.0.6.tar.gz

app/cluster.json.mustache

@@ -10,17 +10,15 @@
   "need_intranet_api_server": true,
   "exclude_node_columns": ["instance_class"],
   "advanced_actions": ["scale_horizontal"],
-  "custom_tags": ["del_node_force_level_ignore_error"],
   "unsupported_actions": ["rollback"],
   "upgrade_policy": [
-    "appv-doh2u06i",
-    "appv-egh21tjg",
-    "appv-0exsrgnh"
+    "appv-p07y3ld8",
+    "appv-doh2u06i"
   ],
   "upgrading_policy": "in-place-parallel",
   "in-place-upgrade-nodes": [{
     "container":{
-      "snapshot": "ss-yoyvs52o",
+      "snapshot": "ss-ial72b2d",
       "zone": "pek3"
     },
     "copy":[{
@@ -46,7 +44,7 @@
     }]
   }, {
     "container":{
-      "snapshot": "ss-j6lj3m67",
+      "snapshot": "ss-fvzpy0t8",
       "zone": "pek3"
     },
     "copy":[{
@@ -60,7 +58,7 @@
     "role": "master",
     "container": {
       "type": "kvm",
-      "image": "img-5zuf22r7",
+      "image": "img-9cdypymv",
       "zone": "pek3"
     },
     "instance_class": {{cluster.master.instance_class}},
@@ -147,7 +145,7 @@
     "role": "node_perf",
     "container": {
       "type": "kvm",
-      "image": "img-5zuf22r7",
+      "image": "img-9cdypymv",
       "zone": "pek3"
     },
     "instance_class": {{cluster.node_perf.instance_class}},
@@ -181,9 +179,8 @@
       },
       "destroy": {
         "post_stop_service": true,
-        "allow_force": true,
-        "cmd": "true",
-        "timeout": 1200
+        "allow_force": false,
+        "cmd": "true"
       },
       "restart": {
         "cmd": "appctl restart"
@@ -210,7 +207,7 @@
     "role": "node_super_perf",
     "container": {
       "type": "kvm",
-      "image": "img-5zuf22r7",
+      "image": "img-9cdypymv",
       "zone": "pek3"
     },
     "instance_class": {{cluster.node_super_perf.instance_class}},
@@ -244,9 +241,8 @@
       },
       "destroy": {
         "post_stop_service": true,
-        "allow_force": true,
-        "cmd": "true",
-        "timeout": 1200
+        "allow_force": false,
+        "cmd": "true"
       },
       "restart": {
         "cmd": "appctl restart"
@@ -273,7 +269,7 @@
     "role": "node_gpu",
     "container": {
       "type": "kvm",
-      "image": "img-b1mwsrtk",
+      "image": "img-lv1ts5gs",
       "zone": "pek3"
     },
     "instance_class": {{cluster.node_gpu.instance_class}},
@@ -309,9 +305,8 @@
       },
       "destroy": {
         "post_stop_service": true,
-        "allow_force": true,
-        "cmd": "true",
-        "timeout": 1200
+        "allow_force": false,
+        "cmd": "true"
       },
       "restart": {
         "cmd": "appctl restart"
@@ -335,7 +330,7 @@
     "role": "client",
     "container": {
       "type": "kvm",
-      "image": "img-6u9kpu76",
+      "image": "img-u7twid3l",
       "zone": "pek3"
     },
     "instance_class": {{cluster.client.instance_class}},
@@ -382,7 +377,7 @@
     "action_timeout_sec": 30,
     "healthy_threshold": 3,
     "unhealthy_threshold": 3,
-    "check_cmd": "appctl check",
+    "check_cmd": "appctl check && appctl reloadKsEip",
     "action_cmd": "appctl revive"
   },
   "monitor": {
@@ -472,3 +467,4 @@
     }
   }
 }
+

app/locale/en.json

@@ -1,8 +1,8 @@
 {
-  "Get KubeSphere Console": "KubeSphere Console URL (default username：[email protected] password：P@88w0rd); please change the password after the first login.",
-  "KS is not installed.": "KubeSphere is not installed.\nTo install KubeSphere, you can refer to [docs](https://docs.qingcloud.com/product/container/qke/), or [submit a ticket](https://console.qingcloud.com/tickets/) for support.",
-  "Using master node IP. Please try again later when external IP is ready.": "The LB with EIP is being created, please refresh this tab later; currently the IP of the first control plane is displayed; if this message appears for a long time, please check the ks-console service under kubesphere-system namespace",
-  "API access key id": "QingCloud IaaS [API Access Key](https://console.qingcloud.com/access_keys/), which will be used to create QingCloud resources, such as load balancers, volumes, etc.",
-  "Whether to install kubesphere": "Whether to install KubeSphere, KubeSphere and monitoring components will be installed by default;To install KubeSphere, you can refer to [docs](https://docs.qingcloud.com/product/container/qke/), or [submit a ticket](https://console.qingcloud.com/tickets/) for support.",
-  "Resource Group Description": "The resource configuration of the service. Single master cluster cannot upgrade to HA mster cluster."
+    "Get KubeSphere Console": "KubeSphere Console URL (default username：[email protected] password：P@88w0rd); please change the password after the first login.",
+    "KS is not installed.": "KubeSphere is not installed.\nTo install KubeSphere, you can refer to [docs](https://docs.qingcloud.com/product/container/qke/), or [submit a ticket](https://console.qingcloud.com/tickets/) for support.",
+    "Using master node IP. Please try again later when external IP is ready.": "The LB with EIP is being created, please refresh this tab later; currently the IP of the first control plane is displayed; if this message appears for a long time, please check the ks-console service under kubesphere-system namespace",
+    "API access key id": "QingCloud IaaS [API Access Key](https://console.qingcloud.com/access_keys/), which will be used to create QingCloud resources, such as load balancers, volumes, etc.",
+    "Whether to install kubesphere": "Whether to install KubeSphere, KubeSphere and monitoring components will be installed by default;To install KubeSphere, you can refer to [docs](https://docs.qingcloud.com/product/container/qke/), or [submit a ticket](https://console.qingcloud.com/tickets/) for support.",
+    "Resource Group Description": "The resource configuration of the service. Single master cluster cannot upgrade to HA mster cluster."
 }