Merge "Set CPU manager policy to static by default"
diff --git a/deployment-configs/aether/clusters/production-edge-intel.yaml b/deployment-configs/aether/clusters/production-edge-intel.yaml
index 930356f..49c1789 100644
--- a/deployment-configs/aether/clusters/production-edge-intel.yaml
+++ b/deployment-configs/aether/clusters/production-edge-intel.yaml
@@ -37,6 +37,9 @@
       cluster_dns_server: 10.212.74.138
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: 10.212.75.0/24
diff --git a/deployment-configs/aether/clusters/production-edge-mwc.yaml b/deployment-configs/aether/clusters/production-edge-mwc.yaml
deleted file mode 100644
index e85ebb0..0000000
--- a/deployment-configs/aether/clusters/production-edge-mwc.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-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.54.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: mwc.edge
-      cluster_dns_server: 10.54.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.54.0.0/17
-      service_cluster_ip_range: 10.54.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 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
-        }
-        azure.central:53 {
-            errors
-            cache 30
-            forward . 10.55.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  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
diff --git a/deployment-configs/aether/clusters/production-edge-ntt.yaml b/deployment-configs/aether/clusters/production-edge-ntt.yaml
index 6a40bbc..cda0c20 100644
--- a/deployment-configs/aether/clusters/production-edge-ntt.yaml
+++ b/deployment-configs/aether/clusters/production-edge-ntt.yaml
@@ -37,6 +37,9 @@
       cluster_dns_server: 10.80.128.10
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: 10.80.0.0/17
diff --git a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
index df44a31..819f08d 100644
--- a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
@@ -37,6 +37,9 @@
       cluster_dns_server: 10.53.128.10
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: 10.53.0.0/17
diff --git a/deployment-configs/aether/clusters/production-edge-onf-tucson.yml b/deployment-configs/aether/clusters/production-edge-onf-tucson.yml
index b065fe9..30a0b0b 100644
--- a/deployment-configs/aether/clusters/production-edge-onf-tucson.yml
+++ b/deployment-configs/aether/clusters/production-edge-onf-tucson.yml
@@ -37,6 +37,9 @@
       cluster_dns_server: 10.59.128.10
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: 10.59.0.0/17
diff --git a/deployment-configs/aether/clusters/production-edge-template.yaml b/deployment-configs/aether/clusters/production-edge-template.yaml
index 789be21..79f122d 100644
--- a/deployment-configs/aether/clusters/production-edge-template.yaml
+++ b/deployment-configs/aether/clusters/production-edge-template.yaml
@@ -37,6 +37,9 @@
       cluster_dns_server: #SET_VALUE(10.53.128.10)
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: #SET_VALUE(10.53.0.0/17)
diff --git a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
index 0a9a8d1..b4d8774 100644
--- a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
@@ -37,6 +37,9 @@
       cluster_dns_server: 10.51.128.10
       fail_swap_on: false
       extra_args:
+        cpu-manager-policy: static
+        kube-reserved: 'cpu=500m,memory=256Mi'
+        system-reserved: 'cpu=500m,memory=256Mi'
         feature-gates: "SCTPSupport=True"
     kube-controller:
       cluster_cidr: 10.51.0.0/17