COMAC-162 Remove unnecessary STATIC_ARP
Change-Id: Icc4915f41cb74f0a428dd428e18c7532a213f1f0
diff --git a/mcord-release/mcord-services/Chart.yaml b/mcord-release/mcord-services/Chart.yaml
index fa5ae40..fd5a808 100644
--- a/mcord-release/mcord-services/Chart.yaml
+++ b/mcord-release/mcord-services/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: M-CORD services with OMEC inside
name: mcord-services
-version: 0.1.7
+version: 0.1.8
diff --git a/mcord-release/mcord-services/templates/bin/_spgwu-launch.sh.tpl b/mcord-release/mcord-services/templates/bin/_spgwu-launch.sh.tpl
index 99ff9ea..abbbed3 100644
--- a/mcord-release/mcord-services/templates/bin/_spgwu-launch.sh.tpl
+++ b/mcord-release/mcord-services/templates/bin/_spgwu-launch.sh.tpl
@@ -21,9 +21,6 @@
mkdir -p $RUN_DIR/config
cd $RUN_DIR/config
cp /etc/dp/config/{cdr.cfg,dp_config.cfg,interface.cfg} .
-{{- if not .Values.network.sriov.enabled }}
-cp /etc/dp/config/static_arp.cfg .
-{{- end }}
sed -i "s/CP_ADDR/$CP_ADDR/g" interface.cfg
sed -i "s/DP_ADDR/$DP_ADDR/g" interface.cfg
diff --git a/mcord-release/mcord-services/templates/configmap-spgwu.yaml b/mcord-release/mcord-services/templates/configmap-spgwu.yaml
index a984e23..895bf6c 100644
--- a/mcord-release/mcord-services/templates/configmap-spgwu.yaml
+++ b/mcord-release/mcord-services/templates/configmap-spgwu.yaml
@@ -46,15 +46,6 @@
cp_comm_ip = CP_ADDR
cp_comm_port = 21
{{- if not .Values.network.sriov.enabled }}
- static_arp.cfg: |
- [sgi]
-{{- range .Values.network.sgi.static_arp }}
- {{ .ip }} = {{ .mac }}
-{{- end }}
- [s1u]
-{{- range .Values.network.s1u.static_arp }}
- {{ .ip }} = {{ .mac }}
-{{- end }}
setup-af-iface.sh: |
{{ tuple "bin/_spgwu-setup-af-iface.sh.tpl" . | include "mcord-services.template" | indent 4 }}
{{- end }}
diff --git a/mcord-release/mcord-services/values.yaml b/mcord-release/mcord-services/values.yaml
index d0970e0..3293d9e 100644
--- a/mcord-release/mcord-services/values.yaml
+++ b/mcord-release/mcord-services/values.yaml
@@ -129,14 +129,6 @@
# subnet: provide subnet range to be assigned to the pod
# gateway: provide default gateway of the network
# valid only when centralip is used
-# static_arp: provide static arp entries for each network port
-# valid only when sriov is disabled
-# example usage)
-# - ip: <ip_addr_start> <ip_addr_end>
-# mac: <ethernet_mac_addr>
-# - ip: <ip_addr>
-# mac: <ethernet_mac_addr>
-
network:
sriov:
enabled: true
@@ -145,12 +137,8 @@
ipam: centralip
subnet: 119.0.0.0/24
gateway: 119.0.0.254
- static_arp: null
sgi:
cni_plugin: vfioveth
ipam: centralip
subnet: 13.1.1.0/24
gateway: 13.1.1.254
- static_arp:
- - ip: 13.1.1.254
- mac: 0e:00:00:00:00:01