Merge pull request #5229 from WillardHu/cloud-upgrade

Construction of cloudcore upgrading capability

4 files changed, 14 insertions, 9 deletions

diff --git a/manifests/charts/cloudcore/Chart.yaml b/manifests/charts/cloudcore/Chart.yaml
index a09cb9f7e..17d59ec14 100644
--- a/manifests/charts/cloudcore/Chart.yaml
+++ b/manifests/charts/cloudcore/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: cloudcore
-version: 0.1.0
-appVersion: 1.12.0
+version: 1.15.1
+appVersion: 1.15.1
 description: The KubeEdge cloudcore component.
 sources:
 - https://github.com/kubeedge/kubeedge
diff --git a/manifests/charts/cloudcore/templates/deployment_cloudcore.yaml b/manifests/charts/cloudcore/templates/deployment_cloudcore.yaml
index 09aa2adfc..57a0ff0f4 100644
--- a/manifests/charts/cloudcore/templates/deployment_cloudcore.yaml
+++ b/manifests/charts/cloudcore/templates/deployment_cloudcore.yaml
@@ -14,6 +14,9 @@ spec:
     {{- with .Values.cloudCore.labels }}
     matchLabels: {{- toYaml . | nindent 6 }}
     {{- end }}
+  {{- with .Values.cloudCore.strategy }}
+  strategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       {{- with .Values.cloudCore.labels }}
diff --git a/manifests/charts/cloudcore/values.yaml b/manifests/charts/cloudcore/values.yaml
index db61c8e14..883898aef 100644
--- a/manifests/charts/cloudcore/values.yaml
+++ b/manifests/charts/cloudcore/values.yaml
@@ -1,14 +1,14 @@
 # Default values for kubeedge.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-appVersion: "1.13.0"
+appVersion: "1.15.1"
 
 cloudCore:
   replicaCount: 1
   hostNetWork: true
   image:
     repository: "kubeedge/cloudcore"
-    tag: "v1.13.0"
+    tag: "v1.15.1"
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext:
@@ -33,6 +33,7 @@ cloudCore:
     requests:
       cpu: 100m
       memory: 512Mi
+  strategy: {}
   modules:
     cloudHub:
       # Caution!: Leave this entry to empty will cause CloudCore to exit abnormally once KubeEdge is enabled.
@@ -108,7 +109,7 @@ controllerManager:
   enable: false
   image:
     repository: "kubeedge/controller-manager"
-    tag: "v1.12.0"
+    tag: "v1.15.1"
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   labels:
diff --git a/manifests/profiles/version.yaml b/manifests/profiles/version.yaml
index d5a1bf5c2..72ba5466f 100644
--- a/manifests/profiles/version.yaml
+++ b/manifests/profiles/version.yaml
@@ -1,14 +1,14 @@
 # Default values for kubeedge.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-appVersion: "1.13.0"
+appVersion: "1.15.1"
 
 cloudCore:
   replicaCount: 1
   hostNetWork: true
   image:
     repository: "kubeedge/cloudcore"
-    tag: "v1.13.0"
+    tag: "v1.15.1"
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext:
@@ -33,6 +33,7 @@ cloudCore:
     requests:
       cpu: 100m
       memory: 512Mi
+  strategy: {}
   modules:
     cloudHub:
       advertiseAddress:   # Caution!: Leave this entry to empty will cause CloudCore to exit abnormally once KubeEdge is enabled.
@@ -68,7 +69,7 @@ iptablesManager:
   hostNetWork: true
   image:
     repository: "kubeedge/iptables-manager"
-    tag: "v1.12.0"
+    tag: "v1.15.1"
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext:
@@ -101,7 +102,7 @@ controllerManager:
   enable: false
   image:
     repository: "kubeedge/controller-manager"
-    tag: "v1.12.0"
+    tag: "v1.15.1"
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   labels: