ben.carrasco/jambonz-infrastructure
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-infrastructure.git synced 2026-01-25 02:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up kubernetes manifests, remove need for JAMBONES_NETWORK_CIDR env var in kubernetes installs

Browse Source
This commit is contained in:
Dave Horton
2022-01-09 15:32:33 -05:00
parent 999c6ee6e5
commit 4ed611713a
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kubernetes/manifests/jambonz/configmap/jambonz-configmap.yaml
View File

@@ -9,18 +9,17 @@ data:
NODE_ENV: production NODE_ENV: production
CLOUD: gcp CLOUD: gcp
K8S: "1" K8S: "1"
K8S_FEATURE_SERVER_SERVICE_NAME: feature-server.jambonz.svc.cluster.local K8S_FEATURE_SERVER_SERVICE_NAME: feature-server
K8S_RTPENGINE_SERVICE_NAME: rtpengine-ng.jambonz.svc.cluster.local:22222 K8S_RTPENGINE_SERVICE_NAME: rtpengine-ng:22222
K8S_SBC_REGISTER_SERVICE_NAME: sbc-registrar.jambonz.svc.cluster.local:4000 K8S_SBC_REGISTER_SERVICE_NAME: sbc-registrar:4000
K8S_SBC_OPTIONS_SERVICE_NAME: sbc-options.jambonz.svc.cluster.local:4000 K8S_SBC_OPTIONS_SERVICE_NAME: sbc-options:4000
K8S_SBC_INBOUND_SERVICE_NAME: sbc-inbound.jambonz.svc.cluster.local:4000 K8S_SBC_INBOUND_SERVICE_NAME: sbc-inbound:4000
K8S_SBC_OUTBOUND_SERVICE_NAME: sbc-outbound.jambonz.svc.cluster.local:4000 K8S_SBC_OUTBOUND_SERVICE_NAME: sbc-outbound:4000
JAMBONES_TIME_SERIES_HOST: influxdb.jambonz-monitoring.svc.cluster.local JAMBONES_TIME_SERIES_HOST: influxdb.jambonz-monitoring
JAMBONES_NETWORK_CIDR: "10.128.0.0/9,10.72.0.0/14"
JAMBONES_CLUSTER_ID: jbeast2 JAMBONES_CLUSTER_ID: jbeast2
JAMBONES_LOGLEVEL: debug JAMBONES_LOGLEVEL: debug
ENABLE_METRICS: "1" ENABLE_METRICS: "1"
STATS_HOST: telegraf.jambonz-monitoring.svc.cluster.local STATS_HOST: telegraf.jambonz-monitoring
STATS_PORT: "8125" STATS_PORT: "8125"
STATS_PROTOCOL: tcp STATS_PROTOCOL: tcp
STATS_TELEGRAF: "1" STATS_TELEGRAF: "1"

2
kubernetes/manifests/jambonz/sbc-sip/sbc-call-router-deployment.yaml
View File

@@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: sbc-call-router - name: sbc-call-router
image: jambonz/sbc-call-router:k8s image: jambonz/sbc-call-router:latest
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
kubernetes/manifests/jambonz/sbc-sip/sbc-inbound-deployment.yaml
View File

@@ -24,7 +24,7 @@ spec:
name: db-create-wait name: db-create-wait
containers: containers:
- name: sbc-inbound - name: sbc-inbound
image: jambonz/sbc-inbound:k8s image: jambonz/sbc-inbound:latest
imagePullPolicy: Always imagePullPolicy: Always
lifecycle: lifecycle:
preStop: preStop:

2
kubernetes/manifests/jambonz/sbc-sip/sbc-outbound-deployment.yaml
View File

@@ -24,7 +24,7 @@ spec:
name: db-create-wait name: db-create-wait
containers: containers:
- name: sbc-outbound - name: sbc-outbound
image: jambonz/sbc-outbound:k8s image: jambonz/sbc-outbound:latest
imagePullPolicy: Always imagePullPolicy: Always
lifecycle: lifecycle:
preStop: preStop:

3
kubernetes/manifests/jambonz/sbc-sip/sbc-sip-configmap.yaml
View File

@@ -10,7 +10,8 @@ data:
<!-- udp port to listen on for client connections and shared secret used to authenticate clients --> <!-- udp port to listen on for client connections and shared secret used to authenticate clients -->
<admin port="9022" secret="cymru">0.0.0.0</admin> <admin port="9022" secret="cymru">0.0.0.0</admin>
<request-handlers> <request-handlers>
<request-handler sip-method="*">http://sbc-call-router.jambonz.svc.cluster.local:3000</request-handler> <request-handler sip-method="INVITE" http-method="POST">http://sbc-call-router:3000</request-handler>
<request-handler sip-method="REGISTER">http://sbc-call-router:3000</request-handler>
</request-handlers> </request-handlers>
<sip> <sip>
<udp-mtu>4096</udp-mtu> <udp-mtu>4096</udp-mtu>

8
kubernetes/manifests/jambonz/sbc-sip/sbc-sip-daemonset.yaml
View File

@@ -32,8 +32,8 @@ spec:
name: db-create-wait name: db-create-wait
containers: containers:
- name: drachtio - name: drachtio
image: drachtio/drachtio-server:k8s image: drachtio/drachtio-server:latest
args: ['drachtio', '--loglevel', 'info', '--cloud-deployment', '--sofia-loglevel', '3', '--homer', 'heplify-server.jambonz-monitoring.svc.cluster.local:9060', '--homer-id', '10'] args: ['drachtio', '--loglevel', 'info', '--cloud-deployment', '--sofia-loglevel', '3', '--homer', 'heplify-server.jambonz-monitoring:9060', '--homer-id', '10']
envFrom: envFrom:
- configMapRef: - configMapRef:
name: jambonz-env name: jambonz-env
@@ -43,6 +43,8 @@ spec:
secretKeyRef: secretKeyRef:
name: jambonz-secrets name: jambonz-secrets
key: DRACHTIO_SECRET key: DRACHTIO_SECRET
- name: SOFIA_SEARCH_DOMAINS
value: "1"
ports: ports:
- containerPort: 9022 - containerPort: 9022
protocol: TCP protocol: TCP
@@ -56,7 +58,7 @@ spec:
name: jambonz-sbc-sip-conf name: jambonz-sbc-sip-conf
subPath: drachtio.conf.xml subPath: drachtio.conf.xml
- name: sbc-options-handler - name: sbc-options-handler
image: jambonz/sbc-options-handler:k8s image: jambonz/sbc-options-handler:main
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef: