Merge pull request #2023 from wenchajun/edge

upgrade default.yaml
kubesphere · Jun 23, 2022 · 4c3e83f · 4c3e83f
2 parents b1c414e + 8a65194
commit 4c3e83f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -92,11 +92,11 @@ post_install_job_image: kubectl
 
 # kubeedge
 cloudcore_repo: "{{ base_repo }}{{ namespace_override | default('kubeedge') }}/cloudcore"
-cloudcore_tag: "v1.7.2"
-edge_watcher_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/edge-watcher"
-edge_watcher_tag: "v0.1.1"
-edge_watcher_agent_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/edge-watcher-agent"
-edge_watcher_agent_tag: "v0.1.0"
+cloudcore_tag: "v1.9.2"
+iptables_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubeedge') }}/iptables-manager"
+iptables_manager_tag: "v1.9.2"
+edge_service_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/edgeservice"
+edge_service_tag: "v0.2.0"
 
 # gatekeeper
 gatekeeper_repo: "{{ base_repo }}{{ namespace_override | default('openpolicyagent') }}/gatekeeper"
@@ -356,16 +356,16 @@ images:
     sha256: "{{ cloudcore_checksum|default(None) }}"
     group: "kubeedge-images"
 
-  edge_watcher:
-    repo: "{{ edge_watcher_repo }}"
-    tag: "{{ edge_watcher_tag }}"
-    sha256: "{{ edge_watcher_checksum|default(None) }}"
+  iptables_managerr:
+    repo: "{{ iptables_manager_repo }}"
+    tag: "{{ iptables_manager_tag }}"
+    sha256: "{{ iptables_manager_checksum|default(None) }}"
     group: "kubeedge-images"
 
-  edge_watcher_agent:
-    repo: "{{ edge_watcher_agent_repo }}"
-    tag: "{{ edge_watcher_agent_tag }}"
-    sha256: "{{ edge_watcher_agent_checksum|default(None) }}"
+  edge_service:
+    repo: "{{ edge_service_repo }}"
+    tag: "{{ edge_service_tag }}"
+    sha256: "{{ edge_service_checksum|default(None) }}"
     group: "kubeedge-images"
 
   gatekeeper:

diff --git a/roles/edgeruntime/templates/custom-values-kubeedge.yaml.j2 b/roles/edgeruntime/templates/custom-values-kubeedge.yaml.j2
@@ -7,8 +7,8 @@ cloudCore:
   replicaCount: 1
   hostNetWork: "{{ edgeruntime.kubeedge.cloudCore.hostNetWork | default("false", true) }}"
   image:
-    repository: "kubeedge/cloudcore"
-    tag: "v1.9.2"
+    repository: {{ cloudcore_repo }}
+    tag: {{ cloudcore_tag }}
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext: {}
@@ -76,8 +76,8 @@ iptablesManager:
   mode: "{{ edgeruntime.kubeedge.iptablesManager.mode | default("external") }}"
   hostNetWork: true
   image:
-    repository: "kubeedge/iptables-manager"
-    tag: "v1.9.2"
+    repository: {{ iptables_manager_repo }}
+    tag: {{ iptables_manager_tag }}
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext: 
@@ -120,8 +120,8 @@ iptablesManager:
 edgeService:
   replicaCount: 1
   image:
-    repository: "kubesphere/edgeservice"
-    tag: "v0.2.0"
+    repository: {{ edge_service_repo }}
+    tag: {{ edge_service_tag }}
     pullPolicy: "IfNotPresent"
     pullSecrets: []
   securityContext: {}