From 0d9721cc875514be79da4378bf9da7d674aa7865 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Sun, 7 Nov 2021 13:23:39 -0500
Subject: [PATCH] sbc-rtp updates

---
 kubernetes/sbc-rtp/sbc-rtp-configmap.yaml | 22 ----------
 kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml | 50 ++++++++---------------
 2 files changed, 17 insertions(+), 55 deletions(-)
 delete mode 100644 kubernetes/sbc-rtp/sbc-rtp-configmap.yaml

diff --git a/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml b/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml
deleted file mode 100644
index 917fddb..0000000
--- a/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: drachtio-sbc-sip-conf
-data:
-  drachtio.conf.xml: |
-    <drachtio>
-
-        <!-- udp port to listen on for client connections and shared secret used to authenticate clients -->
-        <admin port="9023" secret="cymru">0.0.0.0</admin>
-        <sip>
-          <contact>sip:*:5064;transport=udp</contact>
-          <udp-mtu>4096</udp-mtu>
-        </sip>
-        <cdrs>false</cdrs>
-
-        <logging>
-            <sofia-loglevel>3</sofia-loglevel>
-            <loglevel>info</loglevel>
-        </logging>
-
-    </drachtio>
\ No newline at end of file
diff --git a/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml b/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml
index 44906d4..cb3fe30 100644
--- a/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml
+++ b/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml
@@ -14,41 +14,25 @@ spec:
         app: drachtio-sbc-rtp
     spec:
       nodeSelector:
-        eks.amazonaws.com/nodegroup: sbc-node-group
+        voip-environment: edge
       hostNetwork: true
+      tolerations:
+        - key: "voip-edge"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: drachtio
           image: drachtio/drachtio-server:0.8.12
-          ports:
-            - containerPort: 9023
-              protocol: TCP
-            - containerPort: 5064
-              protocol: UDP
-          resources: {}
-          volumeMounts:
-            - mountPath: /etc/drachtio.conf.xml
-              name: drachtio-sbc-rtp-conf
-              subPath: drachtio.conf.xml
-        - name: sbc-rtpengine-sidecar
-          image: jambonz/sbc-rtpengine-sidecar:latest
-          env:
-            - name: NODE_ENV
-              value: production
-            - name: RTPENGINE_DTMF_LOG_PORT
-              value: 22223
-            - name: JAMBONES_CLUSTER_ID
-              value: jb
-            - name: JAMBONES_REDIS_HOST
-              value: redis
-            - name: JAMBONES_REDIS_PORT
-              value: "6379"
-            - name: ENABLE_METRICS
-              value: "0"
+          args: ['drachtio', '--contact', 'sip:*:5064;transport=udp,tcp', '--port', '9023']
+        - name: rtpengine-sidecar
+          image: jambonz/rtpengine-sidecar:latest
+          envFrom:
+            - secretRef:
+                name: jambonz
+        - name: rtpengine 
+          image: jambonz/rtpengine:latest 
+          args: ['rtpengine']
+          envFrom:
+            - secretRef:
+                name: jambonz
       restartPolicy: Always
-      volumes:
-      - name: drachtio-sbc-rtp-conf
-        configMap:
-          name: drachtio-sbc-rtp-conf
-          items:
-          - key: drachtio.conf.xml
-            path: drachtio.conf.xml
\ No newline at end of file