Update Aether production pod configs
Change-Id: Ifec91b19b7a7512885b5e63b9129499b8f539f59
diff --git a/deployment-configs/aether/apps/common-cord-platform.yaml b/deployment-configs/aether/apps/common-cord-platform.yaml
deleted file mode 100644
index 5a7b97e..0000000
--- a/deployment-configs/aether/apps/common-cord-platform.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-etcd-operator:
- enabled: false
-# NOTE: set central=true, edge=false for central cluster
-tags:
- central: false
- edge: true
-
-onos:
- fullnameOverride: "cord-platform-onos"
- images:
- onos:
- pullPolicy: 'IfNotPresent'
-kafka:
- fullnameOverride: "cord-platform-kafka"
-
-logging:
- enabled: false
-
-nem-monitoring:
- images:
- kpi_exporter:
- pullPolicy: 'IfNotPresent'
- kpi_exporter:
- # NOTE: set enabled=false for central cluster
- enabled: true
- fullnameOverride: "cord-platform-kpi-exporter"
- kpi_broker: "cord-platform-kafka:9092"
- topics:
- - "onos.kpis"
-
- prometheus:
- alertmanager:
- enabled: false
- kubeStateMetrics:
- enabled: true
- fullnameOverride: "cord-platform-prometheus-kube-state-metrics"
- nodeExporter:
- enabled: true
- fullnameOverride: "cord-platform-prometheus-node-exporter"
- pushgateway:
- enabled: false
- server:
- enabled: true
- fullnameOverride: "cord-platform-prometheus-server"
- # NOTE: set unique datacenter name for each clusters
- global:
- external_labels:
- datacenter: "edge-onf-menlo"
- extraScrapeConfigs: |
- - job_name: 'cord-platform-kpi-exporter'
- metrics_path: /metrics
- scrape_interval: 15s
- static_configs:
- - targets:
- - cord-platform-kpi-exporter:8080
-
- grafana:
- fullnameOverride: "cord-platform-grafana"
-
- # NOTE: set xos=true, aehterCentralPods=true for central cluster.
- dashboards:
- k8s: false
- nodeExporter: false
- xos: false
- onos: true
- aaa: false
- voltha: false
- omec: false
- aether: true
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml
deleted file mode 100644
index 079740b..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-images:
- tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
- redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
- redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
- ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
- ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
- depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
- pullPolicy: IfNotPresent
-
-config:
- nats:
- ip: "10.212.74.65"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
deleted file mode 100644
index 50ed6f8..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-images:
- tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
- redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
- redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
- ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
- ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
- depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
- pullPolicy: IfNotPresent
-
-nodeSelectors:
- enabled: true
- accelleranCBRSCommon:
- label: omec-dp-cbrs
- value: enabled
-
-config:
- nats:
- ip: "192.168.251.20"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-onf-menlo.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-onf-menlo.yaml
deleted file mode 100644
index b606798..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-onf-menlo.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-nodeSelectors:
- enabled: true
- accelleranCBRSCommon:
- label: accelleran
- value: enabled
-
-config:
- nats:
- ip: "192.168.251.30"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml
deleted file mode 100644
index 87f2d45..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-config:
- mme:
- ip: "10.168.0.204"
- vranL3:
- plmnId: "130501"
- instanceId: "intelcell101"
- tac: 101
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
deleted file mode 100644
index 655221b..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-images:
- tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-tdd:v1.0.2
- depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
- pullPolicy: IfNotPresent
-
-nodeSelectors:
- enabled: true
- accelleranCBRSCU:
- label: omec-dp-cbrs
- value: enabled
-
-config:
- mme:
- ip: "10.168.0.204"
- vranL3:
- plmnId: "130501"
- instanceId: "onfcell203"
- tac: 203
- ports:
- s1ap:
- nodePort: 31412
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
deleted file mode 100644
index 1b88c90..0000000
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-nodeSelectors:
- enabled: true
- accelleranCBRSCU:
- label: accelleran
- value: enabled
-
-config:
- mme:
- ip: "10.168.0.204"
- vranL3:
- plmnId: "130501"
- instanceId: "onfcell202"
- tac: 202
diff --git a/deployment-configs/aether/apps/production-apps-cdn-local-edge-mwc.yaml b/deployment-configs/aether/apps/production-apps-cdn-local-edge-mwc.yaml
deleted file mode 100644
index b4217f1..0000000
--- a/deployment-configs/aether/apps/production-apps-cdn-local-edge-mwc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-images:
- tags:
- nginx: registry.aether.opennetworking.org/cdn-nginx:1.0.0
- pullPolicy: IfNotPresent
-
-nodeSelectors:
- enabled: true
- nginx:
- label: aether-apps
- value: enabled
-
-config:
- sriov:
- enabled: false
- nginx:
- sgiInterface:
- name: eth2
- mtu: 1200
- cdnRemotes:
- - name: remote-gcp
- ip: 10.168.0.200
- port: 30935
- streams:
- - name: 480p
- value: 480
-
-networks:
- ipam: static
- sgi:
- subnet: 192.168.250.0/24
- mask: 255.255.255.0
- gateway: 192.168.250.250
diff --git a/deployment-configs/aether/apps/production-mcord-services-azure.yaml b/deployment-configs/aether/apps/production-mcord-services-azure.yaml
deleted file mode 100644
index 2c01b9c..0000000
--- a/deployment-configs/aether/apps/production-mcord-services-azure.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-progran:
- enabled: false
-
-mcord-subscriber:
- image:
- repository: "omecproject/mcord-synchronizer"
- tag: "comac-1.0.0"
- pullPolicy: "IfNotPresent"
-
-onos-service:
- kafkaService: "cord-platform-kafka"
-
-fabric:
- enabled: true
- kafkaService: "cord-platform-kafka"
-
-onosFabricRestHost: "cord-platform-onos-ui.cord-platform-p-vqzqg.svc.mwc.edge"
-onosFabricRestPort: 8181
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
deleted file mode 100644
index 29440ff..0000000
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-images:
- tags:
- hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.4"
- mme: "registry.aether.opennetworking.org/openmme:1.4.4"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
- spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
- pullPolicy: "Always"
-
-cassandra:
- deploy: false
-
-resources:
- enabled: true
-
-config:
- coreDump:
- enabled: true
- path: /tmp/coredump
- clusterDomain: "azure.central"
- spgwc:
- apn: internet
- multiUpfs: true
- s1uAddr: "192.168.251.4"
- ueIpPool:
- ip: 10.251.0.0
- mask: 255.255.0.0
- cfgFiles:
- app_config.cfg: |
- [GLOBAL]
- NUM_DP_SELECTION_RULES = 2
- [DP_SELECTION_RULE_1]
- DPID = 1
- DPNAME = dp1
- MCC = 315
- MNC = 100
- TAC = 17
- [DP_SELECTION_RULE_2]
- DPID = 1
- DPNAME = dp1
- MCC = 315
- MNC = 100
- TAC = 18
- mme:
- cfgFiles:
- config.json:
- mme:
- mcc:
- dig1: 3
- dig2: 1
- dig3: 5
- mnc:
- dig1: 0
- dig2: 1
- dig3: 0
- hss:
- acl:
- oldTls: "*.azure.central"
- bootstrap:
- enabled: true
- users:
- - imsi: "315010999912343"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912344"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912345"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912346"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912347"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912348"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912349"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "732111000000420"
- msisdn: "1122334455"
- apn: apn1
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "732111000000421"
- msisdn: "1122334455"
- apn: apn1
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- mmes:
- - id: 1
- isdn: "19136246000"
- unreachability: 1
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
deleted file mode 100644
index 8c66b30..0000000
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
- tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
-
-nodeSelectors:
- enabled: true
- spgwu:
- label: omec-dp-cbrs
- value: enabled
-
-config:
- spgwu:
- multiUpfs: true
- cpComm:
- addr: "spgwc-headless.omec.svc.production.central"
- s1u:
- device: "s1u-net"
- # NOTE: set different IP for each edge
- ip: "192.168.251.3/24"
- sgi:
- device: "sgi-net"
- # NOTE: set different IP for each edge
- ip: "192.168.250.3/24"
- dpName: "dp2"
-networks:
- sgi:
- # NOTE: set correct gateway for each edge
- gateway: "192.168.250.250"
diff --git a/deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml
deleted file mode 100644
index a052732..0000000
--- a/deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
- tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
-
-nodeSelectors:
- enabled: true
- spgwu:
- label: omec-dp-b7
- value: enabled
-
-config:
- spgwu:
- multiUpfs: true
- cpComm:
- addr: "spgwc-headless.omec.svc.azure.central"
- s1u:
- device: "s1u-net"
- # NOTE: set different IP for each edge
- ip: "192.168.251.4/24"
- sgi:
- device: "sgi-net"
- # NOTE: set different IP for each edge
- ip: "192.168.250.4/24"
- dpName: "dp1"
-networks:
- sgi:
- # NOTE: set correct gateway for each edge
- gateway: "192.168.250.31"
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml b/deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml
new file mode 100644
index 0000000..77ac130
--- /dev/null
+++ b/deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml
@@ -0,0 +1,14 @@
+images:
+ tags:
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
+ redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
+ redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
+ ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
+ ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+
+config:
+ nats:
+ ip: "10.212.74.65"
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml b/deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml
new file mode 100644
index 0000000..e779924
--- /dev/null
+++ b/deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml
@@ -0,0 +1,20 @@
+images:
+ tags:
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
+ redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
+ redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
+ ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
+ ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+
+nodeSelectors:
+ enabled: true
+ accelleranCBRSCommon:
+ label: accelleran
+ value: enabled
+
+config:
+ nats:
+ ip: "10.92.1.30"
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml b/deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml
new file mode 100644
index 0000000..e01b6ed
--- /dev/null
+++ b/deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml
@@ -0,0 +1,14 @@
+images:
+ tags:
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+
+config:
+ mme:
+ ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "intelcell101"
+ tac: 101
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo-b42.yaml b/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo-b42.yaml
rename to deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml b/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
new file mode 100644
index 0000000..85786ab
--- /dev/null
+++ b/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
@@ -0,0 +1,20 @@
+images:
+ tags:
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+
+nodeSelectors:
+ enabled: true
+ accelleranCBRSCU:
+ label: accelleran
+ value: enabled
+
+config:
+ mme:
+ ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "onfcell202"
+ tac: 202
diff --git a/deployment-configs/aether/apps/production-cassandra-gcp.yaml b/deployment-configs/aether/apps/production/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-cassandra-gcp.yaml
rename to deployment-configs/aether/apps/production/cassandra.yaml
diff --git a/deployment-configs/aether/apps/production-apps-cdn-local-edge-onf-menlo.yaml b/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
similarity index 87%
rename from deployment-configs/aether/apps/production-apps-cdn-local-edge-onf-menlo.yaml
rename to deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
index e57ddff..722ebb9 100644
--- a/deployment-configs/aether/apps/production-apps-cdn-local-edge-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
@@ -1,6 +1,6 @@
images:
tags:
- nginx: registry.aether.opennetworking.org/cdn-nginx:1.0.0
+ nginx: registry.central.aetherproject.net/cdn-nginx:1.0.0
pullPolicy: IfNotPresent
nodeSelectors:
diff --git a/deployment-configs/aether/apps/production-apps-cdn-remote.yaml b/deployment-configs/aether/apps/production/cdn-remote.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-apps-cdn-remote.yaml
rename to deployment-configs/aether/apps/production/cdn-remote.yaml
diff --git a/deployment-configs/aether/apps/global-docker-registry.yaml b/deployment-configs/aether/apps/production/global-docker-registry.yaml
similarity index 78%
rename from deployment-configs/aether/apps/global-docker-registry.yaml
rename to deployment-configs/aether/apps/production/global-docker-registry.yaml
index 5d4d99d..f7c4b1e 100644
--- a/deployment-configs/aether/apps/global-docker-registry.yaml
+++ b/deployment-configs/aether/apps/production/global-docker-registry.yaml
@@ -5,6 +5,6 @@
ingress:
enabled: true
hosts:
- - "registry.aether.opennetworking.org"
+ - "registry.central.aetherproject.net"
annotations:
"nginx.ingress.kubernetes.io/proxy-body-size": "0"
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/production/global-nem-monitoring.yaml
similarity index 100%
rename from deployment-configs/aether/apps/global-nem-monitoring.yaml
rename to deployment-configs/aether/apps/production/global-nem-monitoring.yaml
diff --git a/deployment-configs/aether/apps/production-nem-monitoring.yaml b/deployment-configs/aether/apps/production/nem-monitoring.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-nem-monitoring.yaml
rename to deployment-configs/aether/apps/production/nem-monitoring.yaml
diff --git a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml b/deployment-configs/aether/apps/production/omec-cp.yaml
similarity index 76%
rename from deployment-configs/aether/apps/production-omec-cp-gcp.yaml
rename to deployment-configs/aether/apps/production/omec-cp.yaml
index aa20397..c299746 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production/omec-cp.yaml
@@ -1,11 +1,11 @@
images:
tags:
- hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.4"
- mme: "registry.aether.opennetworking.org/openmme:1.4.4"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
- spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
- pullPolicy: "Always"
+ hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
+ hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
+ mme: "registry.central.aetherproject.net/openmme:1.5.5"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.2"
+ pullPolicy: "IfNotPresent"
cassandra:
deploy: false
@@ -32,25 +32,25 @@
cfgFiles:
app_config.cfg: |
[GLOBAL]
- NUM_DP_SELECTION_RULES = 4
+ DNS_PRIMARY = 8.8.8.8
+ DNS_SECONDARY = 8.8.4.4
+ NUM_DP_SELECTION_RULES = 2
[DP_SELECTION_RULE_1]
DPID = 1
- DPNAME = dp1
+ DPNAME = dp-menlo
MCC = 315
MNC = 010
TAC = 202
+ DNS_PRIMARY = 1.1.1.1
+ DNS_SECONDARY = 8.8.8.8
[DP_SELECTION_RULE_2]
DPID = 2
- DPNAME = dp2
- MCC = 315
- MNC = 010
- TAC = 203
- [DP_SELECTION_RULE_3]
- DPID = 3
DPNAME = dp-intel
MCC = 315
MNC = 010
TAC = 101
+ DNS_PRIMARY = 1.1.1.1
+ DNS_SECONDARY = 8.8.8.8
mme:
cfgFiles:
config.json:
@@ -71,55 +71,55 @@
users:
- imsi: "315010999912342"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912343"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912344"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912345"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912346"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912347"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912348"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010888812341"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010888812342"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
diff --git a/deployment-configs/aether/apps/production-omec-dp-cni.yaml b/deployment-configs/aether/apps/production/omec-dp-cni.yaml
similarity index 100%
copy from deployment-configs/aether/apps/production-omec-dp-cni.yaml
copy to deployment-configs/aether/apps/production/omec-dp-cni.yaml
diff --git a/deployment-configs/aether/apps/production-omec-dp-intel.yaml b/deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml
similarity index 84%
rename from deployment-configs/aether/apps/production-omec-dp-intel.yaml
rename to deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml
index f6e343e..1fd2fae 100644
--- a/deployment-configs/aether/apps/production-omec-dp-intel.yaml
+++ b/deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml
@@ -1,7 +1,7 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
+ spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.2"
+ pullPolicy: "IfNotPresent"
nodeSelectors:
enabled: true
diff --git a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml b/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
similarity index 76%
rename from deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
rename to deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
index fd3fd46..c6c28f9 100644
--- a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
@@ -1,7 +1,7 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
+ spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.2"
+ pullPolicy: "IfNotPresent"
nodeSelectors:
enabled: true
@@ -22,8 +22,8 @@
device: "sgi-net"
# NOTE: set different IP for each edge
ip: "192.168.250.7/24"
- dpName: "dp1"
+ dpName: "dp-menlo"
networks:
sgi:
# NOTE: set correct gateway for each edge
- gateway: "192.168.250.30"
+ gateway: "192.168.250.1"
diff --git a/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml b/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
index 32e2b9c..38bde54 100644
--- a/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
+++ b/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
@@ -1,9 +1,9 @@
images:
tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats-b17:v1.0.0
- redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis-b17:v1.0.0
- vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-fdd-b17:v1.0.0
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ nats: registry.central.aetherproject.net/aether/accelleran-cu-nats-b17:v1.0.0
+ redis: registry.central.aetherproject.net/aether/accelleran-cu-redis-b17:v1.0.0
+ vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-fdd-b17:v1.0.0
pullPolicy: IfNotPresent
nodeSelectors:
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
index 1495813..018ef28 100644
--- a/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
+++ b/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
@@ -1,12 +1,12 @@
images:
tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
- redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
- redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
- ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
- ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
- depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
+ redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
+ redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
+ ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
+ ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
pullPolicy: IfNotPresent
nodeSelectors:
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
index d3c5375..b0dbf8a 100644
--- a/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
+++ b/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
@@ -1,8 +1,8 @@
images:
tags:
- initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
- vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-tdd:v1.0.2
- depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+ initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
+ vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
+ depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
pullPolicy: IfNotPresent
nodeSelectors:
diff --git a/deployment-configs/aether/apps/production-cassandra-azure.yaml b/deployment-configs/aether/apps/staging/cassandra-azure.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-cassandra-azure.yaml
rename to deployment-configs/aether/apps/staging/cassandra-azure.yaml
diff --git a/deployment-configs/aether/apps/staging/cassandra-gcp.yaml b/deployment-configs/aether/apps/staging/cassandra-gcp.yaml
new file mode 100644
index 0000000..00fbdde
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/cassandra-gcp.yaml
@@ -0,0 +1,9 @@
+fullnameOverride: "cassandra"
+image:
+ tag: "2.1.20"
+persistence:
+ enabled: true
+ storageClass: "zonal-ssd"
+config:
+ cluster_domain: "staging.central"
+ endpoint_snitch: "GossipingPropertyFileSnitch"
diff --git a/deployment-configs/aether/apps/staging/apps-cdn-local.yaml b/deployment-configs/aether/apps/staging/cdn-local.yaml
similarity index 88%
rename from deployment-configs/aether/apps/staging/apps-cdn-local.yaml
rename to deployment-configs/aether/apps/staging/cdn-local.yaml
index 1ebd7a0..c22efe1 100644
--- a/deployment-configs/aether/apps/staging/apps-cdn-local.yaml
+++ b/deployment-configs/aether/apps/staging/cdn-local.yaml
@@ -1,6 +1,6 @@
images:
tags:
- nginx: registry.aether.opennetworking.org/cdn-nginx:1.0.0
+ nginx: registry.central.aetherproject.net/cdn-nginx:1.0.0
pullPolicy: IfNotPresent
nodeSelectors:
diff --git a/deployment-configs/aether/apps/production-mcord-services-gcp.yaml b/deployment-configs/aether/apps/staging/mcord-services.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-mcord-services-gcp.yaml
rename to deployment-configs/aether/apps/staging/mcord-services.yaml
diff --git a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml b/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
index 1ab7815..5dbe134 100644
--- a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
+++ b/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
@@ -1,11 +1,11 @@
images:
tags:
- hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.4"
- mme: "registry.aether.opennetworking.org/openmme:1.5.4-bad"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
- spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
- pullPolicy: "Always"
+ hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
+ hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
+ mme: "registry.central.aetherproject.net/openmme:1.5.5"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.2"
+ pullPolicy: "IfNotPresent"
cassandra:
deploy: false
@@ -28,6 +28,8 @@
cfgFiles:
app_config.cfg: |
[GLOBAL]
+ DNS_PRIMARY = 8.8.8.8
+ DNS_SECONDARY = 8.8.4.4
NUM_DP_SELECTION_RULES = 2
[DP_SELECTION_RULE_1]
DPID = 1
@@ -35,12 +37,16 @@
MCC = 315
MNC = 100
TAC = 17
+ DNS_PRIMARY = 1.1.1.1
+ DNS_SECONDARY = 8.8.8.8
[DP_SELECTION_RULE_2]
DPID = 1
DPNAME = dp1
MCC = 315
MNC = 100
TAC = 18
+ DNS_PRIMARY = 1.1.1.1
+ DNS_SECONDARY = 8.8.8.8
mme:
cfgFiles:
config.json:
diff --git a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml b/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
index febc008..18a018f 100644
--- a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
+++ b/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
@@ -1,11 +1,11 @@
images:
tags:
- hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.0"
- mme: "registry.aether.opennetworking.org/openmme:1.5.4-bad"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
- spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
- pullPolicy: "Always"
+ hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
+ hss: "registry.central.aetherproject.net/c3po-hss:1.1.0"
+ mme: "registry.central.aetherproject.net/openmme:1.5.5"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.2"
+ pullPolicy: "IfNotPresent"
cassandra:
deploy: false
@@ -31,7 +31,7 @@
app_config.cfg: |
[GLOBAL]
DNS_PRIMARY = 8.8.8.8
- DNS_SECONDARY = 8.8.8.4
+ DNS_SECONDARY = 8.8.4.4
NUM_DP_SELECTION_RULES = 1
[DP_SELECTION_RULE_1]
DPID = 1
@@ -61,19 +61,19 @@
users:
- imsi: "315010999912342"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912343"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912344"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
@@ -85,31 +85,31 @@
sqn: 135
- imsi: "315010999912346"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912347"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912348"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010888812341"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010888812342"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
diff --git a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml b/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
index 90ddb5b..a02cbb1 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
+++ b/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
@@ -1,7 +1,7 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
+ spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
+ pullPolicy: "IfNotPresent"
nodeSelectors:
enabled: true
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml b/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
index 88877c3..7c24694 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
+++ b/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
@@ -1,7 +1,7 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
- pullPolicy: "Always"
+ spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
+ pullPolicy: "IfNotPresent"
nodeSelectors:
enabled: true
diff --git a/deployment-configs/aether/apps/production-omec-dp-cni.yaml b/deployment-configs/aether/apps/staging/omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-omec-dp-cni.yaml
rename to deployment-configs/aether/apps/staging/omec-dp-cni.yaml