patch CRD and make sense imagePullScrets

Signed-off-by: zhu733756 <zhu733756@kubesphere.io>

5 files changed, 10 insertions, 7 deletions

diff --git a/build/helm/cloudcore/README.md b/build/helm/cloudcore/README.md
index f1d6c9fff..6461b8745 100644
--- a/build/helm/cloudcore/README.md
+++ b/build/helm/cloudcore/README.md
@@ -21,7 +21,7 @@ helm upgrade --install cloudcore ./cloudcore --namespace kubeedge --create-names
 - `cloudCore.image.repository`, default `kubeedge`, defines the image repo.
 - `cloudCore.image.tag`, default `v1.8.2`, defines the image tag.
 - `cloudCore.image.pullPolicy`, default `IfNotPresent`, defines the policies to pull images.
-- `cloudCore.image.imagePullSecrets`, defines the secrets to pull images.
+- `cloudCore.image.pullSecrets`, defines the secrets to pull images.
 - `cloudCore.labels`, defines the labels.
 - `cloudCore.annotions`, defines the annotions.
 - `cloudCore.affinity`, `cloudCore.nodeSelector`, `cloudCore.tolerations`, defines the node scheduling policies.
@@ -46,7 +46,7 @@ helm upgrade --install cloudcore ./cloudcore --namespace kubeedge --create-names
 - `iptablesManager.image.repository`, default `kubeedge`, defines the image repo.
 - `iptablesManager.image.tag`, default `v1.8.2`, defines the image tag.
 - `iptablesManager.image.pullPolicy`, default `IfNotPresent`, defines the policies to pull images.
-- `iptablesManager.image.imagePullSecrets`, defines the secrets to pull images.
+- `iptablesManager.image.pullSecrets`, defines the secrets to pull images.
 - `iptablesManager.labels`, defines the labels.
 - `iptablesManager.annotions`, defines the annotions.
 - `iptablesManager.affinity`, `iptablesManager.nodeSelector`, `iptablesManager.tolerations`, defines the node scheduling policies.
diff --git a/build/helm/cloudcore/templates/daemonset_iptablesmanager.yaml b/build/helm/cloudcore/templates/daemonset_iptablesmanager.yaml
index 99ad9eca1..1d28ef741 100644
--- a/build/helm/cloudcore/templates/daemonset_iptablesmanager.yaml
+++ b/build/helm/cloudcore/templates/daemonset_iptablesmanager.yaml
@@ -33,7 +33,7 @@ spec:
       nodeSelector: {{ toYaml . | nindent 8 }}
       {{- end }}
       restartPolicy: Always
-      {{- with .Values.iptablesManager.image.imagePullSecrets }} 
+      {{- with .Values.iptablesManager.image.pullSecrets }} 
       imagePullSecrets: {{ toYaml . | nindent 8 }} 
       {{- end }}  
       containers:
diff --git a/build/helm/cloudcore/templates/deployment_cloudcore.yaml b/build/helm/cloudcore/templates/deployment_cloudcore.yaml
index b30a076d5..3e407d0fa 100644
--- a/build/helm/cloudcore/templates/deployment_cloudcore.yaml
+++ b/build/helm/cloudcore/templates/deployment_cloudcore.yaml
@@ -35,7 +35,7 @@ spec:
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
       serviceAccount: cloudcore
-      {{- with .Values.cloudCore.image.imagePullSecrets }} 
+      {{- with .Values.cloudCore.image.pullSecrets }} 
       imagePullSecrets: {{ toYaml . | nindent 8 }} 
       {{- end }}  
       containers:
diff --git a/build/helm/cloudcore/templates/rbac_cloudcore.yaml b/build/helm/cloudcore/templates/rbac_cloudcore.yaml
index beb4f4859..a711159ce 100644
--- a/build/helm/cloudcore/templates/rbac_cloudcore.yaml
+++ b/build/helm/cloudcore/templates/rbac_cloudcore.yaml
@@ -14,7 +14,7 @@ rules:
   resources: ["namespaces"]
   verbs: ["get", "create"]
 - apiGroups: [""]
-  resources: ["pods/status"]
+  resources: ["nodes", "pods/status"]
   verbs: ["patch"]
 - apiGroups: [""]
   resources: ["pods"]
@@ -34,6 +34,9 @@ rules:
 - apiGroups: ["apiextensions.k8s.io"]
   resources: ["customresourcedefinitions"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+- apiGroups: ["networking.istio.io"]
+  resources: ["*"]
+  verbs: ["get", "list", "watch"]
 
 ---
 apiVersion: v1
diff --git a/build/helm/cloudcore/values.yaml b/build/helm/cloudcore/values.yaml
index 2d7a58ee8..b6aa82d21 100644
--- a/build/helm/cloudcore/values.yaml
+++ b/build/helm/cloudcore/values.yaml
@@ -10,7 +10,7 @@ cloudCore:
     repository: "kubeedge/cloudcore"
     tag: "v1.8.2"
     pullPolicy: "IfNotPresent"
-    imagePullSecrets: []
+    pullSecrets: []
   securityContext: 
     privileged: true
   labels:
@@ -68,7 +68,7 @@ iptablesManager:
     repository: "kubeedge/iptables-manager"
     tag: "v1.8.2"
     pullPolicy: "IfNotPresent"
-    imagePullSecrets: []
+    pullSecrets: []
   securityContext: 
     capabilities:
       add: