Merge "EDGEPOD-147 Add Intel Hillsboro Edge to Aether cluster"
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global-nem-monitoring.yaml
index 465546e..36e88a9 100644
--- a/deployment-configs/aether/apps/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global-nem-monitoring.yaml
@@ -55,8 +55,4 @@
   aaa: false
   voltha: false
   omec: false
-  aetherClusters: true
-  aetherEdges: true
-  aetherCentralPods: true
-  aetherEdgePods: false
-  aetherMMEExporter: true
+  aether: true
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
index 2d5cbc7..2b7deaa 100644
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -2,7 +2,8 @@
   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.1.2"
+    mme: "registry.aether.opennetworking.org/openmme:1.3.6"
+    mmeExporter: "registry.aether.opennetworking.org/openmme:0.1.9"
     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 01f98a0..b7a7c40 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
@@ -2,7 +2,8 @@
   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.1.2"
+    mme: "registry.aether.opennetworking.org/openmme:1.3.6"
+    mmeExporter: "registry.aether.opennetworking.org/openmme:0.1.9"
     spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
   pullPolicy: "Always"
 
@@ -11,6 +12,13 @@
 
 resources:
   enabled: true
+  mme:
+    requests:
+      cpu: 0.3
+      memory: 1Gi
+    limits:
+      cpu: 0.3
+      memory: 1Gi
 
 config:
   coreDump:
diff --git a/deployment-configs/aether/clusters/production-edge-intel.yaml b/deployment-configs/aether/clusters/production-edge-intel.yaml
new file mode 100644
index 0000000..de072ab
--- /dev/null
+++ b/deployment-configs/aether/clusters/production-edge-intel.yaml
@@ -0,0 +1,93 @@
+name: production-edge-mwc
+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.212.74.128/25
+      extra_args:
+        feature-gates: "SCTPSupport=True"
+    kubelet:
+      cluster_domain: intel.edge
+      cluster_dns_server: 10.212.74.138
+      fail_swap_on: false
+      extra_args:
+        feature-gates: "SCTPSupport=True"
+    kube-controller:
+      cluster_cidr: 10.212.75.0/24
+      service_cluster_ip_range: 10.212.74.128/25
+      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 mwc.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