Merge pull request #713 from MaximilianMeister/k8s-1.13

[k8s 1.13] Adapt configs to 1.13
SUSE · Jan 31, 2019 · 864d52e · 864d52e
2 parents 840eeec + ed1b79e
commit 864d52e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/salt/cni/kube-flannel.yaml.jinja b/salt/cni/kube-flannel.yaml.jinja
@@ -152,8 +152,7 @@ spec:
       tolerations:
         # Allow the pod to run on the master.  This is required for
         # the master to communicate with pods.
-        - key: node-role.kubernetes.io/master
-          operator: Exists
+        - operator: Exists
           effect: NoSchedule
         # Mark the pod as a critical add-on for rescheduling.
         - key: "CriticalAddonsOnly"

diff --git a/salt/kubelet/kubelet.jinja b/salt/kubelet/kubelet.jinja
@@ -19,7 +19,6 @@ KUBELET_HOSTNAME="--hostname-override={{ grains['nodename'] }}"
 
 # Add your own!
 KUBELET_ARGS="\
-    --cadvisor-port=0 \
     --read-only-port=0 \
     --config=/etc/kubernetes/kubelet-config.yaml \
 {%- if salt.caasp_pillar.get_kubelet_reserved_resources('kube') %}