Kubernetes: Azure CNI network monitor agents configuration errata (#3674

)
Azure · Aug 16, 2018 · 74fc515 · 74fc515
1 parent 62d63a6
commit 74fc515
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/parts/k8s/addons/azure-cni-networkmonitor.yaml b/parts/k8s/addons/azure-cni-networkmonitor.yaml
@@ -20,6 +20,11 @@ spec:
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
+        # Allow the pod to run on the master.
+      - key: node-role.kubernetes.io/master
+        operator: Equal
+        value: "true"
+        effect: NoSchedule
       nodeSelector:
         beta.kubernetes.io/os: linux
       containers:

diff --git a/parts/k8s/kubernetesagentcustomdata.yml b/parts/k8s/kubernetesagentcustomdata.yml
@@ -150,7 +150,6 @@ AGENT_ARTIFACTS_CONFIG_PLACEHOLDER
 {{if IsAzureCNI}}
     # SNAT outbound traffic from pods to destinations outside of VNET.
     iptables -t nat -A POSTROUTING -m iprange ! --dst-range 168.63.129.16 -m addrtype ! --dst-type local ! -d {{WrapAsParameter "vnetCidr"}} -j MASQUERADE
-    sed -i "s|<azureCNINetworkMonitorImage>|{{WrapAsParameter "AzureCNINetworkMonitorImageURL"}}|g" "/etc/kubernetes/addons/azure-cni-networkmonitor.yaml"
 {{end}}
 {{if not EnablePodSecurityPolicy}}
     sed -i "s|apparmor_parser|d|g" "/etc/systemd/system/kubelet.service"