fix cherry-pick conflicts

Signed-off-by: zhu733756 <talonzhu@yunify.com>
kubesphere · Jun 16, 2021 · 08eec60 · 08eec60
1 parent d32aa20
commit 08eec60
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -121,7 +121,7 @@ post_install_job_tag: "v1.19.0"
 
 # kubeedge
 cloudcore_repo: "{{ base_repo }}{{ namespace_override | default('kubeedge') }}/cloudcore"
-cloudcore_tag: "v1.6.1"
+cloudcore_tag: "v1.6.2"
 edge_watcher_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher"
 edge_watcher_tag: "v0.1.0"
 edge_watcher_agent_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edge-watcher-agent"

diff --git a/roles/kubeedge/files/kubeedge/kubeedge/values.yaml b/roles/kubeedge/files/kubeedge/kubeedge/values.yaml
@@ -4,8 +4,8 @@
 appVersion: "0.1.0"
 
 cloudCore:
-  repository: "kubeedge/cloudcore"
-  tag: "v1.6.1"
+  repository: "kubespheredev/cloudcore"
+  tag: "v1.6.2"
   pullPolicy: "IfNotPresent"
   affinity:
     nodeAffinity:

diff --git a/scripts/images-list.txt b/scripts/images-list.txt
@@ -131,7 +131,7 @@ kubesphere/openpitrix-jobs:v3.1.0
 ##weave-scope-images
 weaveworks/scope:1.13.0
 ##kubeedge-images
-kubeedge/cloudcore:v1.6.1
+kubespheredev/cloudcore:v1.6.2
 kubesphere/edge-watcher:v0.1.0
 kubesphere/kube-rbac-proxy:v0.5.0
 kubesphere/edge-watcher-agent:v0.1.0