Merge pull request #1569 from ErikJiang/clean_cilium_kube_proxy_replacement

clean cilium_kube_proxy_replacement

Author: ErikJiang

hack/network_testcase.sh

@@ -88,7 +88,6 @@ function kubean_cilium_cluster_e2e() {
     yq -i '.kube_service_addresses = "10.88.0.0/16"'  $groupVarYml
     yq -i '.kube_pods_subnet = "192.88.128.0/20"'  $groupVarYml
     yq -i '.kube_network_node_prefix = 24'  $groupVarYml
-    yq -i '.cilium_kube_proxy_replacement = "partial"'  $groupVarYml
     #### End: write back group vars to VarsConfCM.yml
     yamlUtil::update_groupVars
     prepare_sonobuoy

hack/run-network-e2e.sh

@@ -105,8 +105,6 @@ sed -i "s/kube_network_plugin: calico/kube_network_plugin: cilium/" "${dest_conf
 ##set  kube_service_addresses: 10.88.0.0/16    kube_pods_subnet: 192.88.128.0/20
 sed -i "s/10.96.0.0\/12/10.88.0.0\/16/" "${dest_config_path}"/vars-conf-cm.yml
 sed -i "s/192.168.128.0/192.88.128.0/" "${dest_config_path}"/vars-conf-cm.yml
-##add this line to set cilium_kube_proxy_replacement: partial, if kubespray update the cilium_kube_proxy_replacement default value to partial, this line can be deleted
-sed -i "$ a\    cilium_kube_proxy_replacement: partial" "${dest_config_path}"/vars-conf-cm.yml
 ##Switch the namespace of configmap to new_kubean_namespace
 sed -i "s/namespace: kubean-system/namespace: ${new_kubean_namespace}/" "${dest_config_path}"/hosts-conf-cm.yml
 sed -i "s/namespace: kubean-system/namespace: ${new_kubean_namespace}/" "${dest_config_path}"/vars-conf-cm.yml