fix multicluster member jwtSecret lost after upgraded to 3.1

Signed-off-by: Jeff <[email protected]>

ansible/group_vars/all.yml

@@ -8,7 +8,7 @@ coredns_version: 1.6.9
 calico_version: 3.16.3
 hostnic_version: 1.0.0-alpha.5
 qingcloud_csi_version: 1.2.7
-qingcloud_ccm_version: 1.4.6
+qingcloud_ccm_version: 1.4.7
 ks_version: 3.1.0
 ks_installer_image_tag: v3.1.0
 helm_version: 3.2.1
@@ -32,7 +32,6 @@ binaries:
 - /opt/k8s
 
 docker_images_k8s:
-- kubesphere/cloud-controller-manager:v1.4.4
 - coredns/coredns:1.6.9
 - csiplugin/csi-attacher:v2.1.1
 - csiplugin/csi-node-driver-registrar:v1.2.0
@@ -43,7 +42,7 @@ docker_images_k8s:
 - csiplugin/snapshot-controller:v2.0.1
 - nvidia/k8s-device-plugin:1.0.0-beta4
 - kubesphere/flannel:v0.12.0
-- kubesphere/pause:3.2
+- kubesphere/pause:3.1
 
 docker_images_ks:
 - jaegertracing/jaeger-agent:1.17
@@ -64,13 +63,14 @@ docker_images_ks:
 - kubesphere/node-exporter:ks-v0.18.1
 - mirrorgooglecontainers/defaultbackend-amd64:1.4
 - prom/alertmanager:v0.21.0
+- docker:19.03
 
 docker_images_k8s_new:
 - kubesphere/kube-apiserver:v1.19.8
 - kubesphere/kube-scheduler:v1.19.8
 - kubesphere/kube-proxy:v1.19.8
 - kubesphere/kube-controller-manager:v1.19.8
-- kubesphere/pause:3.1
+- kubesphere/pause:3.2
 - kubesphere/etcd:v3.4.13
 - calico/cni:v3.16.3
 - calico/kube-controllers:v3.16.3
@@ -145,7 +145,6 @@ docker_images_ks_new:
 - minio/minio:RELEASE.2019-08-07T01-59-21Z
 - minio/mc:RELEASE.2019-08-07T23-14-43Z
 - kubesphere/elasticsearch-oss:6.7.0-1
-- docker:19.03
 - kubesphere/s2irun:v2.1.1
 - kubesphere/builder-base:v3.1.0
 - kubesphere/builder-nodejs:v3.1.0

ansible/make.yml

@@ -4,7 +4,7 @@
   vars:
     target_env: "{{ lookup('env', 'target') }}"
   roles:
-  - docker-1.0.8
+  - docker-1.0.10
   - docker-images
 
 - hosts: k8s-client,k8s-node,gpu-node
@@ -34,7 +34,7 @@
     target_env: "{{ lookup('env', 'target') }}"
   roles:
   - qingcloud-cli-1.0.7
-  - docker-1.0.8
+  - docker-1.0.10
   - etcd-1.1.0
   - k8s-node
   # put extra modules above

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.8.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/docker-1.0.10.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

ansible/roles/app-role-k8s/files/opt/app/current/bin/node/k8s-ctl.sh

@@ -645,7 +645,12 @@ launchKs() {
 
 buildKsDynamicConf() {
   local -r ksCfgDynamicFile=/opt/app/current/conf/k8s/ks-config.dynamic.yml
-  yq p $ksCfgDynamicFile spec
+  if $IS_UPGRADING; then
+    # components could be manually enabled
+    runKubectl -n kubesphere-system get cc ks-installer -o yaml | yq r - 'spec' | yq p - spec
+  else
+    yq p $ksCfgDynamicFile spec
+  fi
 }
 
 buildKsConf() {