Merge "reverting onu custom image to master"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml
similarity index 95%
rename from deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
rename to deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml
index 96c22ff..8e3dda8 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
+++ b/deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml
@@ -16,7 +16,7 @@
epc:
plmnId: 130501
nats:
- ip: 192.168.251.20
+ ip: 192.168.251.31
mme:
ip: 172.16.0.8
progran:
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
index 8536db1..b606798 100644
--- 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
@@ -1,3 +1,9 @@
+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-onf-menlo.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
index 11b6e93..1b88c90 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
@@ -1,3 +1,9 @@
+nodeSelectors:
+ enabled: true
+ accelleranCBRSCU:
+ label: accelleran
+ value: enabled
+
config:
mme:
ip: "10.168.0.204"
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
index 52505d5..a536fe8 100644
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -1,9 +1,9 @@
images:
tags:
hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
- mme: "registry.aether.opennetworking.org/openmme:1.4.3"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.1.9"
+ 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"
diff --git a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
index b52f80f..c5173a5 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
@@ -1,9 +1,9 @@
images:
tags:
hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
- hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
- mme: "registry.aether.opennetworking.org/openmme:1.4.3"
- mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.1.9"
+ 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"
@@ -32,7 +32,7 @@
cfgFiles:
app_config.cfg: |
[GLOBAL]
- NUM_DP_SELECTION_RULES = 3
+ NUM_DP_SELECTION_RULES = 4
[DP_SELECTION_RULE_1]
DPID = 1
DPNAME = dp1
@@ -69,6 +69,12 @@
bootstrap:
enabled: true
users:
+ - imsi: "315010999912342"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
- imsi: "315010999912343"
msisdn: "1122334455"
apn: "apn1"
@@ -105,18 +111,6 @@
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- - imsi: "315010999912342"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912349"
- msisdn: "1122334455"
- apn: "apn1"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- imsi: "315010888812341"
msisdn: "1122334455"
apn: "apn1"
diff --git a/deployment-configs/aether/apps/production-omec-dp-intel.yaml b/deployment-configs/aether/apps/production-omec-dp-intel.yaml
index e9d5f92..f6e343e 100644
--- a/deployment-configs/aether/apps/production-omec-dp-intel.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-intel.yaml
@@ -1,6 +1,6 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.1-intel"
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
pullPolicy: "Always"
nodeSelectors:
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml
similarity index 94%
rename from deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
rename to deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml
index 38b19ce..a052732 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-onf-menlo-b7.yaml
@@ -26,4 +26,4 @@
networks:
sgi:
# NOTE: set correct gateway for each edge
- gateway: "192.168.250.250"
+ gateway: "192.168.250.31"
diff --git a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
index f96eb6b..fd3fd46 100644
--- a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
@@ -3,6 +3,12 @@
spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
pullPolicy: "Always"
+nodeSelectors:
+ enabled: true
+ spgwu:
+ label: omec-dp
+ value: enabled
+
config:
spgwu:
multiUpfs: true
diff --git a/deployment-configs/aether/clusters/production-edge-intel.yaml b/deployment-configs/aether/clusters/production-edge-intel.yaml
index 07635a2..9e8c16d 100644
--- a/deployment-configs/aether/clusters/production-edge-intel.yaml
+++ b/deployment-configs/aether/clusters/production-edge-intel.yaml
@@ -1,4 +1,4 @@
-name: production-edge-mwc
+name: production-edge-intel
rancher_kubernetes_engine_config:
authentication:
strategy: x509
diff --git a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
new file mode 100644
index 0000000..1971af6
--- /dev/null
+++ b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
@@ -0,0 +1,93 @@
+name: staging-edge-onf-menlo
+rancher_kubernetes_engine_config:
+ authentication:
+ strategy: x509
+ ignore_docker_version: true
+ ingress:
+ provider: nginx
+ kubernetes_version: v1.15.6-rancher1-2
+ monitoring:
+ provider: none
+ network:
+ plugin: calico
+ services:
+ etcd:
+ backup_config:
+ enabled: true
+ interval_hours: 12
+ retention: 6
+ safe_timestamp: false
+ creation: 12h
+ extra_args:
+ election-timeout: 5000
+ heartbeat-interval: 500
+ gid: 0
+ retention: 72h
+ snapshot: false
+ uid: 0
+ kube_api:
+ always_pull_images: false
+ pod_security_policy: false
+ service_node_port_range: 2000-36767
+ service_cluster_ip_range: 10.51.128.0/17
+ extra_args:
+ feature-gates: "SCTPSupport=True"
+ kubelet:
+ cluster_domain: menlo.staging.edge
+ cluster_dns_server: 10.51.128.10
+ fail_swap_on: false
+ extra_args:
+ feature-gates: "SCTPSupport=True"
+ kube-controller:
+ cluster_cidr: 10.51.0.0/17
+ service_cluster_ip_range: 10.51.128.0/17
+ extra_args:
+ feature-gates: "SCTPSupport=True"
+ scheduler:
+ extra_args:
+ feature-gates: "SCTPSupport=True"
+ kubeproxy:
+ extra_args:
+ feature-gates: "SCTPSupport=True"
+ ssh_agent_auth: false
+ addon_job_timeout: 30
+ addons: |-
+ ---
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+ namespace: kube-system
+ name: coredns
+ data:
+ Corefile: |
+ .:53 {
+ errors
+ health
+ kubernetes menlo.staging.edge in-addr.arpa ip6.arpa {
+ pods insecure
+ upstream
+ fallthrough in-addr.arpa ip6.arpa
+ ttl 30
+ }
+ prometheus :9153
+ forward . "/etc/resolv.conf"
+ cache 30
+ loop
+ reload
+ loadbalance
+ }
+ product.central:53 {
+ errors
+ cache 30
+ forward . 10.52.128.10
+ }
+ addons_include:
+ - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
+
+windows_prefered_cluster: false
+docker_root_dir: /var/lib/docker
+local_cluster_auth_endpoint:
+ enabled: true
+enable_network_policy: false
+enable_cluster_alerting: false
+enable_cluster_monitoring: false