f

edgecomllc · Sep 20, 2023 · df0513b · df0513b
2 parents 8c19893 + 37156e0
commit df0513b
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 1,136 deletions.
diff --git a/.deploy/helm/eupf/templates/job.yaml b/.deploy/helm/eupf/templates/job.yaml
@@ -25,5 +25,7 @@ spec:
             {{- toYaml .Values.xdpProgrammInstall.securityContext | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          env:
+            {{- toYaml .Values.xdpProgrammInstall.env | nindent 12 }}
           command: {{- include "helpers.common.tplvalues.render" (dict "value" .Values.xdpProgrammInstall.command "context" $) | nindent 12 }}
 {{- end }}
diff --git a/.deploy/helm/eupf/values.yaml b/.deploy/helm/eupf/values.yaml
@@ -79,6 +79,7 @@ xdpProgrammInstall:
     capabilities:
       add:
         - NET_ADMIN
+        - BPF
     privileged: true
     runAsNonRoot: false
   env:
@@ -88,6 +89,7 @@ xdpProgrammInstall:
     - /bin/sh
     - -c
     - |
+      apk add iproute2; \
       echo "starting"; \
       i=0; IFACE_NAME=""; \
       while [ -z "$IFACE_NAME" ]; \
@@ -99,7 +101,7 @@ xdpProgrammInstall:
       echo "done: current interface name is ${IFACE_NAME}" ;\
       set -x ;\
       ls -alh /app ;\
-      ip link set dev ${IFACE_NAME} xdpdrv obj /app/zero_entrypoint_bpf.o sec xdp/upf_zero_entrypoint
+      ip link set dev ${IFACE_NAME} xdpdrv obj /app/zeroentrypoint_bpf.o sec xdp/upf_zero_entrypoint
 
 bird:
   enabled: false

diff --git a/docs/deployments/open5gs-with-bgp/values/eupf.yaml b/docs/deployments/open5gs-with-bgp/values/eupf.yaml
@@ -48,12 +48,13 @@ volumeMounts:
 
 bird:
   enabled: true
+  image: docker.io/edgecom/bird:0.0.4b
   env:
     BIRD_LOCAL_AS: 65001
     BIRD_LOCAL_PREFIX: 10.11.0.0/16
 
 metrics:
-  enabled: true
+  enabled: false
   serviceMonitor:
     enabled: true
     additionalLabels:

diff --git a/docs/examples/free5gc/eupf-container-nat.yaml b/docs/examples/free5gc/eupf-container-nat.yaml