fix: use jambonz.env as single source of truth

This commit is contained in:
Kalin Krustev
2021-11-05 15:46:31 +02:00
parent acd96b438f
commit 477242ef53
8 changed files with 54 additions and 122 deletions
@@ -17,31 +17,14 @@ spec:
nodeSelector:
kubernetes.io/arch: amd64
containers:
- env:
- name: ENABLE_METRICS
value: "0"
- envFrom:
- secretRef:
name: jambonz
env:
- name: HTTP_PORT
value: "3000"
- name: JAMBONES_CLUSTER_ID
value: jb
- name: JAMBONES_LOGLEVEL
value: info
- name: JAMBONES_MYSQL_DATABASE
value: jambones
- name: JAMBONES_MYSQL_HOST
value: mysql
- name: JAMBONES_MYSQL_PASSWORD
value: jambones
- name: JAMBONES_MYSQL_USER
value: jambones
- name: JAMBONES_REDIS_HOST
value: redis
- name: JAMBONES_REDIS_PORT
value: "6379"
- name: JAMBONE_API_VERSION
value: v1
- name: NODE_ENV
value: production
image: jambonz/jambonz-api-server:latest
name: api-server
ports:
@@ -17,23 +17,12 @@ spec:
nodeSelector:
kubernetes.io/arch: amd64
containers:
- env:
- name: ENABLE_METRICS
value: "0"
- envFrom:
- secretRef:
name: jambonz
env:
- name: HTTP_PORT
value: "4000"
- name: JAMBONES_INBOUND_ROUTE
value: 127.0.0.1:4002
- name: JAMBONES_LOGLEVEL
value: info
- name: JAMBONES_NETWORK_CIDR
value: 100.0.0.0/8
- name: JAMBONES_OUTBOUND_ROUTE
value: 127.0.0.1:4003
- name: JAMBONZ_TAGGED_INBOUND
value: "1"
- name: NODE_ENV
value: production
image: jambonz/sbc-call-router:latest
name: call-router
resources: {}
+21
View File
@@ -0,0 +1,21 @@
NODE_ENV=production
ENABLE_METRICS=0
JAMBONES_CLUSTER_ID=jb
JAMBONES_LOGLEVEL=info
JAMBONES_TIME_SERIES_HOST=127.0.0.1
JAMBONES_NETWORK_CIDR=10.42.0.0/16
JAMBONES_MYSQL_DATABASE=jambones
JAMBONES_MYSQL_HOST=mysql
JAMBONES_MYSQL_PASSWORD=jambones
JAMBONES_MYSQL_USER=jambones
JAMBONES_REDIS_HOST=redis
JAMBONES_REDIS_PORT=6379
JAMBONES_INBOUND_ROUTE=127.0.0.1:4002
JAMBONES_OUTBOUND_ROUTE=127.0.0.1:4003
JAMBONZ_TAGGED_INBOUND=1
JAMBONES_RTPENGINES=rtpengine:22222
DRACHTIO_SECRET=cymru
DRACHTIO_HOST=drachtio-sbc
DRACHTIO_PORT=9022
+4
View File
@@ -25,3 +25,7 @@ resources:
- sbc-inbound/sbc-inbound-deployment.yaml
- sbc-outbound/sbc-outbound-deployment.yaml
- registrar/registrar-deployment.yaml
secretGenerator:
- envs:
- jambonz.env
name: jambonz
+12 -3
View File
@@ -23,11 +23,20 @@ spec:
- name: MYSQL_ALLOW_EMPTY_PASSWORD
value: "yes"
- name: MYSQL_DATABASE
value: jambones
valueFrom:
secretKeyRef:
name: jambonz
key: JAMBONES_MYSQL_DATABASE
- name: MYSQL_PASSWORD
value: jambones
valueFrom:
secretKeyRef:
name: jambonz
key: JAMBONES_MYSQL_PASSWORD
- name: MYSQL_USER
value: jambones
valueFrom:
secretKeyRef:
name: jambonz
key: JAMBONES_MYSQL_USER
image: mysql
livenessProbe:
exec:
+3 -25
View File
@@ -17,31 +17,9 @@ spec:
nodeSelector:
kubernetes.io/arch: amd64
containers:
- env:
- name: DRACHTIO_HOST
value: drachtio-sbc
- name: DRACHTIO_PORT
value: "9022"
- name: DRACHTIO_SECRET
value: cymru
- name: ENABLE_METRICS
value: "0"
- name: JAMBONES_LOGLEVEL
value: info
- name: JAMBONES_MYSQL_DATABASE
value: jambones
- name: JAMBONES_MYSQL_HOST
value: mysql
- name: JAMBONES_MYSQL_PASSWORD
value: jambones
- name: JAMBONES_MYSQL_USER
value: jambones
- name: JAMBONES_REDIS_HOST
value: redis
- name: JAMBONES_REDIS_PORT
value: "6379"
- name: NODE_ENV
value: production
- envFrom:
- secretRef:
name: jambonz
image: jambonz/sbc-registrar:latest
name: registrar
resources: {}
@@ -17,35 +17,9 @@ spec:
nodeSelector:
kubernetes.io/arch: amd64
containers:
- env:
- name: DRACHTIO_HOST
value: drachtio-sbc
- name: DRACHTIO_PORT
value: "9022"
- name: DRACHTIO_SECRET
value: cymru
- name: ENABLE_METRICS
value: "0"
- name: JAMBONES_CLUSTER_ID
value: jb
- name: JAMBONES_LOGLEVEL
value: info
- name: JAMBONES_MYSQL_DATABASE
value: jambones
- name: JAMBONES_MYSQL_HOST
value: mysql
- name: JAMBONES_MYSQL_PASSWORD
value: jambones
- name: JAMBONES_MYSQL_USER
value: jambones
- name: JAMBONES_REDIS_HOST
value: redis
- name: JAMBONES_REDIS_PORT
value: "6379"
- name: JAMBONES_RTPENGINES
value: rtpengine:22222
- name: NODE_ENV
value: production
- envFrom:
- secretRef:
name: jambonz
image: jambonz/sbc-inbound:latest
name: sbc-inbound
resources: {}
@@ -17,35 +17,9 @@ spec:
nodeSelector:
kubernetes.io/arch: amd64
containers:
- env:
- name: DRACHTIO_HOST
value: drachtio-sbc
- name: DRACHTIO_PORT
value: "9022"
- name: DRACHTIO_SECRET
value: cymru
- name: ENABLE_METRICS
value: "0"
- name: JAMBONES_CLUSTER_ID
value: jb
- name: JAMBONES_LOGLEVEL
value: info
- name: JAMBONES_MYSQL_DATABASE
value: jambones
- name: JAMBONES_MYSQL_HOST
value: mysql
- name: JAMBONES_MYSQL_PASSWORD
value: jambones
- name: JAMBONES_MYSQL_USER
value: jambones
- name: JAMBONES_REDIS_HOST
value: redis
- name: JAMBONES_REDIS_PORT
value: "6379"
- name: JAMBONES_RTPENGINES
value: rtpengine:22222
- name: NODE_ENV
value: production
- envFrom:
- secretRef:
name: jambonz
image: jambonz/sbc-outbound:latest
name: sbc-outbound
resources: {}