EDGEPOD-399 Remove bess config files from the chart
Change-Id: Idd14d9165a6265d6e3aa24af707820fae1d0c7f6
diff --git a/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl b/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl
index 42db9b1..8c6b37a 100644
--- a/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl
+++ b/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl
@@ -16,7 +16,7 @@
set -ex
-until bessctl run spgwu; do
+until bessctl run /opt/bess/bessctl/conf/spgwu; do
sleep 2;
done;
diff --git a/omec/omec-user-plane/templates/config/_spgwu.json.tpl b/omec/omec-user-plane/templates/config/_spgwu.json.tpl
index 3fec6b1..ba36cc7 100644
--- a/omec/omec-user-plane/templates/config/_spgwu.json.tpl
+++ b/omec/omec-user-plane/templates/config/_spgwu.json.tpl
@@ -8,6 +8,5 @@
"ifname": {{ .Values.config.spgwu.sgi.device | quote }}
},
"workers": {{ .Values.config.spgwu.workers }},
- "max_sessions": {{ .Values.config.spgwu.maxSessions }},
- "max_ip_defrag_flows": {{ .Values.config.spgwu.maxIpDefragFlows }}
+ "max_sessions": {{ .Values.config.spgwu.maxSessions }}
}
diff --git a/omec/omec-user-plane/templates/configmap-spgwu.yaml b/omec/omec-user-plane/templates/configmap-spgwu.yaml
index d002175..488cf64 100644
--- a/omec/omec-user-plane/templates/configmap-spgwu.yaml
+++ b/omec/omec-user-plane/templates/configmap-spgwu.yaml
@@ -24,13 +24,5 @@
data:
spgwu.json: |
{{ tuple "config/_spgwu.json.tpl" . | include "omec-user-plane.template" | indent 4 }}
- spgwu.bess: |
-{{ .Files.Get "files/spgwu.bess" | indent 4 }}
- __init__.py: |
-{{ .Files.Get "files/__init__.py" | indent 4 }}
- route_control.py: |
-{{ .Files.Get "files/route_control.py" | indent 4 }}
- utils.py: |
-{{ .Files.Get "files/utils.py" | indent 4 }}
bessd-poststart.sh: |
{{ tuple "bin/_bessd-poststart.sh.tpl" . | include "omec-user-plane.template" | indent 4 }}
diff --git a/omec/omec-user-plane/templates/statefulset-spgwu.yaml b/omec/omec-user-plane/templates/statefulset-spgwu.yaml
index 64e123d..376b3d9 100644
--- a/omec/omec-user-plane/templates/statefulset-spgwu.yaml
+++ b/omec/omec-user-plane/templates/statefulset-spgwu.yaml
@@ -60,7 +60,7 @@
env:
- name: PYTHONUNBUFFERED
value: "1"
- command: ["/bin/conf/route_control.py"]
+ command: ["/opt/bess/bessctl/conf/route_control.py"]
args:
- -i
- {{ .Values.config.spgwu.s1u.device }}
@@ -69,9 +69,6 @@
resources:
{{ toYaml .Values.resources.routectl | indent 10 }}
{{- end }}
- volumeMounts:
- - name: scripts
- mountPath: /bin/conf
- name: bessd
image: {{ .Values.images.tags.bess | quote }}
imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
@@ -87,7 +84,7 @@
lifecycle:
postStart:
exec:
- command: ["/bin/conf/bessd-poststart.sh"]
+ command: ["/etc/bess/conf/bessd-poststart.sh"]
livenessProbe:
tcpSocket:
port: 10514
@@ -110,13 +107,14 @@
intel.com/sriov_vfio_s1u_net: 1
intel.com/sriov_vfio_sgi_net: 1
{{- end }}
+ env:
+ - name: CONF_FILE
+ value: /etc/bess/conf/spgwu.json
volumeMounts:
- name: hugepages
mountPath: /dev/hugepages
- name: configs
- mountPath: /opt/bess/bessctl/conf
- - name: scripts
- mountPath: /bin/conf
+ mountPath: /etc/bess/conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -129,11 +127,6 @@
resources:
{{ toYaml .Values.resources.web | indent 10 }}
{{- end }}
- volumeMounts:
- - name: configs
- mountPath: /opt/bess/bessctl/conf
- - name: scripts
- mountPath: /bin/conf
- name: cpiface
image: {{ .Values.images.tags.cpiface | quote }}
imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
@@ -166,10 +159,6 @@
- name: configs
configMap:
name: spgwu
- defaultMode: 420
- - name: scripts
- configMap:
- name: spgwu
defaultMode: 493
- name: hugepages
emptyDir: