Azure · jackfrancis · Feb 27, 2019 · Feb 21, 2019 · Feb 21, 2019 · Feb 21, 2019
diff --git a/parts/k8s/addons/1.9/kubernetesmasteraddons-kube-dns-deployment.yaml b/parts/k8s/addons/1.9/kubernetesmasteraddons-kube-dns-deployment.yaml
@@ -82,6 +82,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"

diff --git a/parts/k8s/addons/coredns.yaml b/parts/k8s/addons/coredns.yaml
@@ -122,6 +122,7 @@ spec:
               topologyKey: kubernetes.io/hostname
             weight: 5
       serviceAccountName: coredns
+      priorityClassName: system-cluster-critical
       tolerations:
         - key: node-role.kubernetes.io/master
           effect: NoSchedule

diff --git a/parts/k8s/addons/kubernetesmasteraddons-azure-npm-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-azure-npm-daemonset.yaml
@@ -68,6 +68,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists

diff --git a/parts/k8s/addons/kubernetesmasteraddons-flannel-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-flannel-daemonset.yaml
@@ -57,6 +57,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
         beta.kubernetes.io/os: linux
+      priorityClassName: system-cluster-critical
       tolerations:
         - key: node.kubernetes.io/not-ready
           operator: Exists

diff --git a/parts/k8s/addons/kubernetesmasteraddons-kube-proxy-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-kube-proxy-daemonset.yaml
@@ -14,6 +14,7 @@ spec:
         component: kube-proxy
         tier: node
     spec:
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: node-role.kubernetes.io/master
         operator: Equal

diff --git a/parts/k8s/containeraddons/azure-cni-networkmonitor.yaml b/parts/k8s/containeraddons/azure-cni-networkmonitor.yaml
@@ -17,6 +17,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists

diff --git a/parts/k8s/containeraddons/ip-masq-agent.yaml b/parts/k8s/containeraddons/ip-masq-agent.yaml
@@ -15,6 +15,7 @@ spec:
         k8s-app: azure-ip-masq-agent
         tier: node
     spec:
+      priorityClassName: system-cluster-critical
       hostNetwork: true
       nodeSelector:
         beta.kubernetes.io/os: linux

diff --git a/parts/k8s/containeraddons/kubernetesmasteraddons-cluster-autoscaler-deployment.yaml b/parts/k8s/containeraddons/kubernetesmasteraddons-cluster-autoscaler-deployment.yaml
@@ -142,6 +142,7 @@ spec:
       labels:
         app: cluster-autoscaler
     spec:
+      priorityClassName: system-cluster-critical
       <hostNet>
       serviceAccountName: cluster-autoscaler
       tolerations:

diff --git a/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml b/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml
@@ -50,142 +50,142 @@ roleRef:
 ---
 kind: ConfigMap
 apiVersion: v1
-data:
-  kube.conf: |- 
-     # Fluentd config file for OMS Docker - cluster components (kubeAPI)
-     #Kubernetes pod inventory
-     <source>
-      type kubepodinventory
-      tag oms.containerinsights.KubePodInventory
-      run_interval 60s
-      log_level debug
-     </source>
-     #Kubernetes events
-     <source>
-      type kubeevents
-      tag oms.containerinsights.KubeEvents
-      run_interval 60s
-      log_level debug
-      </source>
-     #Kubernetes logs
-     <source>
-      type kubelogs
-      tag oms.api.KubeLogs
-      run_interval 60s
-     </source>
-     #Kubernetes services
-     <source>
-      type kubeservices
-      tag oms.containerinsights.KubeServices
-      run_interval 60s
-      log_level debug
-     </source>
-     #Kubernetes Nodes
-     <source>
-      type kubenodeinventory
-      tag oms.containerinsights.KubeNodeInventory
-      run_interval 60s
-      log_level debug
-     </source>
-     #Kubernetes perf
-     <source>
-      type kubeperf
-      tag oms.api.KubePerf
-      run_interval 60s
-      log_level debug
-     </source>
-     <match oms.containerinsights.KubePodInventory**>
-      type out_oms
-      log_level debug
-      num_threads 5
-      buffer_chunk_limit 20m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer
-      buffer_queue_limit 20
-      buffer_queue_full_action drop_oldest_chunk
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-      max_retry_wait 9m
-     </match>
-     <match oms.containerinsights.KubeEvents**>
-      type out_oms
-      log_level debug
-      num_threads 5
-      buffer_chunk_limit 5m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer
-      buffer_queue_limit 10
-      buffer_queue_full_action drop_oldest_chunk
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-      max_retry_wait 9m
-     </match>
-     <match oms.api.KubeLogs**>
-      type out_oms_api
-      log_level debug
-      buffer_chunk_limit 10m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_api_kubernetes_logs*.buffer
-      buffer_queue_limit 10
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-     </match>
-     <match oms.containerinsights.KubeServices**>
-      type out_oms
-      log_level debug
-      num_threads 5
-      buffer_chunk_limit 20m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_kubeservices*.buffer
-      buffer_queue_limit 20
-      buffer_queue_full_action drop_oldest_chunk
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-      max_retry_wait 9m
-     </match>
-     <match oms.containerinsights.KubeNodeInventory**>
-      type out_oms
-      log_level debug
-      num_threads 5
-      buffer_chunk_limit 20m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer
-      buffer_queue_limit 20
-      buffer_queue_full_action drop_oldest_chunk
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-      max_retry_wait 9m
-     </match>
-     <match oms.api.ContainerNodeInventory**>
-      type out_oms_api
-      log_level debug
-      buffer_chunk_limit 20m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_containernodeinventory*.buffer
-      buffer_queue_limit 20
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 15s
-      max_retry_wait 9m
-     </match>
-     <match oms.api.KubePerf**>	
-      type out_oms
-      log_level debug
-      num_threads 5
-      buffer_chunk_limit 20m
-      buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer
-      buffer_queue_limit 20
-      buffer_queue_full_action drop_oldest_chunk
-      flush_interval 20s
-      retry_limit 10
-      retry_wait 30s
-      max_retry_wait 9m
+data:
+  kube.conf: |- 
+     # Fluentd config file for OMS Docker - cluster components (kubeAPI)
+     #Kubernetes pod inventory
+     <source>
+      type kubepodinventory
+      tag oms.containerinsights.KubePodInventory
+      run_interval 60s
+      log_level debug
+     </source>
+     #Kubernetes events
+     <source>
+      type kubeevents
+      tag oms.containerinsights.KubeEvents
+      run_interval 60s
+      log_level debug
+      </source>
+     #Kubernetes logs
+     <source>
+      type kubelogs
+      tag oms.api.KubeLogs
+      run_interval 60s
+     </source>
+     #Kubernetes services
+     <source>
+      type kubeservices
+      tag oms.containerinsights.KubeServices
+      run_interval 60s
+      log_level debug
+     </source>
+     #Kubernetes Nodes
+     <source>
+      type kubenodeinventory
+      tag oms.containerinsights.KubeNodeInventory
+      run_interval 60s
+      log_level debug
+     </source>
+     #Kubernetes perf
+     <source>
+      type kubeperf
+      tag oms.api.KubePerf
+      run_interval 60s
+      log_level debug
+     </source>
+     <match oms.containerinsights.KubePodInventory**>
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+      max_retry_wait 9m
+     </match>
+     <match oms.containerinsights.KubeEvents**>
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 5m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer
+      buffer_queue_limit 10
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+      max_retry_wait 9m
+     </match>
+     <match oms.api.KubeLogs**>
+      type out_oms_api
+      log_level debug
+      buffer_chunk_limit 10m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_api_kubernetes_logs*.buffer
+      buffer_queue_limit 10
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+     </match>
+     <match oms.containerinsights.KubeServices**>
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_kubeservices*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+      max_retry_wait 9m
+     </match>
+     <match oms.containerinsights.KubeNodeInventory**>
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+      max_retry_wait 9m
+     </match>
+     <match oms.api.ContainerNodeInventory**>
+      type out_oms_api
+      log_level debug
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_containernodeinventory*.buffer
+      buffer_queue_limit 20
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 15s
+      max_retry_wait 9m
+     </match>
+     <match oms.api.KubePerf**>	
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 20m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+      max_retry_wait 9m
      </match>
 metadata:
   name: omsagent-rs-config
@@ -218,6 +218,7 @@ spec:
         component: oms-agent
         tier: node
     spec:
+      priorityClassName: system-cluster-critical
       serviceAccountName: omsagent
       containers:
         - name: omsagent