Update rook-ceph kubernetes deployment for k8s 1.15

[infra/stack/kubernetes.git] / apps / ceph / kubespray / playbooks / roles / install / templates / ping-tunnel-workaround.yaml.j2

diff --git a/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2 b/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
index 089f729f0ba588a29d5d4da438367d315ad69cf2..5941c35c669ea19baf1fc0d3961f97c786390630 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
+++ b/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
@@ -19,11 +19,14 @@ spec:
       # remove it if your masters can't run pods
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      - key: {{ rook_storage_label }}
+        effect: NoSchedule
+        operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
       containers:
       - name: busybox
-        image: {{ busybox_repository }}/library/busybox:{{ busybox_version }}
+        image: {{ busybox_repository }}:{{ busybox_version }}
         command: ["/bin/sh"]
         args:  ["-c", "while true ; do ip route | grep tunl0 | awk -F/ '{print $1}' | xargs -n 1 ping -c 1; sleep 5; done"]