move helm base dir

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

23 files changed, 12 insertions, 9 deletions

diff --git a/hack/generate-crds.sh b/hack/generate-crds.sh
index 7bf119f82..0743f0608 100755
--- a/hack/generate-crds.sh
+++ b/hack/generate-crds.sh
@@ -22,7 +22,7 @@ CRD_VERSIONS=v1
 CRD_OUTPUTS=build/crds
 DEVICES_VERSION=v1alpha2
 RELIABLESYNCS_VERSION=v1alpha1
-HELM_CRDS_DIR=build/helm/charts/cloudcore/crds
+HELM_CRDS_DIR=helm/charts/cloudcore/crds
 ROUTER_DIR=build/crds/router
 
 _crdOptions="crd:crdVersions=${CRD_VERSIONS},generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
diff --git a/build/helm/charts/addons/.gitkeep b/helm/charts/addons/.gitkeep
index e69de29bb..e69de29bb 100644
--- a/build/helm/charts/addons/.gitkeep
+++ b/helm/charts/addons/.gitkeep
diff --git a/build/helm/charts/charts.go b/helm/charts/charts.go
index 63b7a8732..63b7a8732 100644
--- a/build/helm/charts/charts.go
+++ b/helm/charts/charts.go
diff --git a/build/helm/charts/cloudcore/Chart.yaml b/helm/charts/cloudcore/Chart.yaml
index 036a3d043..036a3d043 100644
--- a/build/helm/charts/cloudcore/Chart.yaml
+++ b/helm/charts/cloudcore/Chart.yaml
diff --git a/build/helm/charts/cloudcore/README.md b/helm/charts/cloudcore/README.md
index e68d8179f..e68d8179f 100644
--- a/build/helm/charts/cloudcore/README.md
+++ b/helm/charts/cloudcore/README.md
diff --git a/build/helm/charts/cloudcore/crds/cluster_objectsync_v1alpha1.yaml b/helm/charts/cloudcore/crds/cluster_objectsync_v1alpha1.yaml
index 3b34ba233..3b34ba233 100644
--- a/build/helm/charts/cloudcore/crds/cluster_objectsync_v1alpha1.yaml
+++ b/helm/charts/cloudcore/crds/cluster_objectsync_v1alpha1.yaml
diff --git a/build/helm/charts/cloudcore/crds/devices_v1alpha2_device.yaml b/helm/charts/cloudcore/crds/devices_v1alpha2_device.yaml
index 313df0991..313df0991 100644
--- a/build/helm/charts/cloudcore/crds/devices_v1alpha2_device.yaml
+++ b/helm/charts/cloudcore/crds/devices_v1alpha2_device.yaml
diff --git a/build/helm/charts/cloudcore/crds/devices_v1alpha2_devicemodel.yaml b/helm/charts/cloudcore/crds/devices_v1alpha2_devicemodel.yaml
index eb10c666f..eb10c666f 100644
--- a/build/helm/charts/cloudcore/crds/devices_v1alpha2_devicemodel.yaml
+++ b/helm/charts/cloudcore/crds/devices_v1alpha2_devicemodel.yaml
diff --git a/build/helm/charts/cloudcore/crds/objectsync_v1alpha1.yaml b/helm/charts/cloudcore/crds/objectsync_v1alpha1.yaml
index 851336c53..851336c53 100644
--- a/build/helm/charts/cloudcore/crds/objectsync_v1alpha1.yaml
+++ b/helm/charts/cloudcore/crds/objectsync_v1alpha1.yaml
diff --git a/build/helm/charts/cloudcore/crds/router_v1_rule.yaml b/helm/charts/cloudcore/crds/router_v1_rule.yaml
index e93930c3a..e93930c3a 100644
--- a/build/helm/charts/cloudcore/crds/router_v1_rule.yaml
+++ b/helm/charts/cloudcore/crds/router_v1_rule.yaml
diff --git a/build/helm/charts/cloudcore/crds/router_v1_ruleEndpoint.yaml b/helm/charts/cloudcore/crds/router_v1_ruleEndpoint.yaml
index cb5a1d6ae..cb5a1d6ae 100644
--- a/build/helm/charts/cloudcore/crds/router_v1_ruleEndpoint.yaml
+++ b/helm/charts/cloudcore/crds/router_v1_ruleEndpoint.yaml
diff --git a/build/helm/charts/cloudcore/templates/_helpers.tpl b/helm/charts/cloudcore/templates/_helpers.tpl
index fd94bcc2e..fd94bcc2e 100644
--- a/build/helm/charts/cloudcore/templates/_helpers.tpl
+++ b/helm/charts/cloudcore/templates/_helpers.tpl
diff --git a/build/helm/charts/cloudcore/templates/configmap_cloudcore.yaml b/helm/charts/cloudcore/templates/configmap_cloudcore.yaml
index 31a291db0..6305538ef 100644
--- a/build/helm/charts/cloudcore/templates/configmap_cloudcore.yaml
+++ b/helm/charts/cloudcore/templates/configmap_cloudcore.yaml
@@ -46,3 +46,6 @@ data:
         enable: {{ .Values.cloudCore.modules.dynamicController.enable }}
       router:
         enable: {{ .Values.cloudCore.modules.router.enable }}
+      iptablesManager:
+        enable: {{ .Values.iptablesManager.enable }}
+        mode: {{ .Values.iptablesManager.mode }}
diff --git a/build/helm/charts/cloudcore/templates/daemonset_iptablesmanager.yaml b/helm/charts/cloudcore/templates/daemonset_iptablesmanager.yaml
index 1d28ef741..1d28ef741 100644
--- a/build/helm/charts/cloudcore/templates/daemonset_iptablesmanager.yaml
+++ b/helm/charts/cloudcore/templates/daemonset_iptablesmanager.yaml
diff --git a/build/helm/charts/cloudcore/templates/deployment_cloudcore.yaml b/helm/charts/cloudcore/templates/deployment_cloudcore.yaml
index 3e407d0fa..09aa2adfc 100644
--- a/build/helm/charts/cloudcore/templates/deployment_cloudcore.yaml
+++ b/helm/charts/cloudcore/templates/deployment_cloudcore.yaml
@@ -20,7 +20,7 @@ spec:
       labels: {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      {{- if eq .Values.cloudCore.hostNetWork "true" }}
+      {{- if .Values.cloudCore.hostNetWork }}
       hostNetwork: {{ .Values.cloudCore.hostNetWork }}
       dnsPolicy: ClusterFirstWithHostNet
       {{- end }}
diff --git a/build/helm/charts/cloudcore/templates/rbac_cloudcore.yaml b/helm/charts/cloudcore/templates/rbac_cloudcore.yaml
index d105e3d87..d105e3d87 100644
--- a/build/helm/charts/cloudcore/templates/rbac_cloudcore.yaml
+++ b/helm/charts/cloudcore/templates/rbac_cloudcore.yaml
diff --git a/build/helm/charts/cloudcore/templates/rbac_iptablesmanager.yaml b/helm/charts/cloudcore/templates/rbac_iptablesmanager.yaml
index 73c626e0a..73c626e0a 100644
--- a/build/helm/charts/cloudcore/templates/rbac_iptablesmanager.yaml
+++ b/helm/charts/cloudcore/templates/rbac_iptablesmanager.yaml
diff --git a/build/helm/charts/cloudcore/templates/secret_cloudcore.yaml b/helm/charts/cloudcore/templates/secret_cloudcore.yaml
index e61c65243..e61c65243 100644
--- a/build/helm/charts/cloudcore/templates/secret_cloudcore.yaml
+++ b/helm/charts/cloudcore/templates/secret_cloudcore.yaml
diff --git a/build/helm/charts/cloudcore/templates/service_cloudcore.yaml b/helm/charts/cloudcore/templates/service_cloudcore.yaml
index 4e0e743ae..b16d91166 100644
--- a/build/helm/charts/cloudcore/templates/service_cloudcore.yaml
+++ b/helm/charts/cloudcore/templates/service_cloudcore.yaml
@@ -7,7 +7,7 @@ metadata:
   {{- end }}
   name: cloudcore
 spec:
-  {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+  {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
   type: {{ .Values.cloudCore.service.type }}
   {{- else }}
   type: ClusterIP
@@ -15,31 +15,31 @@ spec:
   ports:
   - port: 10000
     targetPort: 10000
-    {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+    {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
     nodePort: {{ .Values.cloudCore.service.cloudhubNodePort }}
     {{- end }}
     name: cloudhub
   - port: 10001
     targetPort: 10001
-    {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+    {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
     nodePort: {{ .Values.cloudCore.service.cloudhubQuicNodePort }}
     {{- end }}
     name: cloudhub-quic
   - port: 10002
     targetPort: 10002
-    {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+    {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
     nodePort: {{ .Values.cloudCore.service.cloudhubHttpsNodePort }}
     {{- end }}
     name: cloudhub-https
   - port: 10003
     targetPort: 10003
-    {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+    {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
     nodePort: {{ .Values.cloudCore.service.cloudstreamNodePort }}
     {{- end }}
     name: cloudstream
   - port: 10004
     targetPort: 10004
-    {{- if and (eq .Values.cloudCore.service.type "NodePort") (eq .Values.cloudCore.hostNetWork "false") }}
+    {{- if and (eq .Values.cloudCore.service.type "NodePort") ( not .Values.cloudCore.hostNetWork) }}
     nodePort: {{ .Values.cloudCore.service.tunnelNodePort }}
     {{- end }}
     name: tunnelport
diff --git a/build/helm/charts/cloudcore/values.yaml b/helm/charts/cloudcore/values.yaml
index 251eb5695..251eb5695 100644
--- a/build/helm/charts/cloudcore/values.yaml
+++ b/helm/charts/cloudcore/values.yaml
diff --git a/build/helm/charts/edgemesh/README.md b/helm/charts/edgemesh/README.md
index d1336acc7..d1336acc7 100644
--- a/build/helm/charts/edgemesh/README.md
+++ b/helm/charts/edgemesh/README.md
diff --git a/build/helm/charts/profiles/version.yaml b/helm/charts/profiles/version.yaml
index 859f99a9c..859f99a9c 100644
--- a/build/helm/charts/profiles/version.yaml
+++ b/helm/charts/profiles/version.yaml
diff --git a/tests/e2e/scripts/helm_keadm_e2e.sh b/tests/e2e/scripts/helm_keadm_e2e.sh
index d3bcb1747..2234c25a7 100755
--- a/tests/e2e/scripts/helm_keadm_e2e.sh
+++ b/tests/e2e/scripts/helm_keadm_e2e.sh
@@ -16,7 +16,7 @@
 
 KUBEEDGE_ROOT=$PWD
 WORKDIR=$(dirname $0)
-HELM_DIR=$KUBEEDGE_ROOT/build/helm/charts
+HELM_DIR=$KUBEEDGE_ROOT/helm/charts
 E2E_DIR=$(realpath $(dirname $0)/..)
 IMAGE_TAG=$(git describe --tags)