Merge pull request #1402 from HotelsDotCom/remove-dependency-on-aline…

…-latest-0.10.x 0.10.x Remove dependency on alpine:latest
kubernetes-retired · Jul 13, 2018 · a0cb160 · a0cb160
2 parents 75a0235 + 845e310
commit a0cb160
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -1232,7 +1232,7 @@ write_files:
             terminationGracePeriodSeconds: 0
             initContainers:
               - name: remove-cni-networks
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/rm
                 - -rf
@@ -1242,7 +1242,7 @@ write_files:
                 - mountPath: /etc/kubernetes/cni/net.d
                   name: cni-net-dir
               - name: net-migration
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/touch
                 - /etc/kubernetes/cni/net.d/net-migration
@@ -1441,7 +1441,7 @@ write_files:
             terminationGracePeriodSeconds: 0
             initContainers:
               - name: remove-cni-networks
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/rm
                 - -rf
@@ -1451,7 +1451,7 @@ write_files:
                 - mountPath: /etc/kubernetes/cni/net.d
                   name: cni-net-dir
               - name: net-migration
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/touch
                 - /etc/kubernetes/cni/net.d/net-migration
@@ -1943,7 +1943,7 @@ write_files:
             terminationGracePeriodSeconds: 0
             initContainers:
               - name: remove-cni-networks
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/rm
                 - -rf
@@ -1953,7 +1953,7 @@ write_files:
                 - mountPath: /etc/kubernetes/cni/net.d
                   name: cni-net-dir
               - name: net-migration
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/touch
                 - /etc/kubernetes/cni/net.d/net-migration
@@ -2108,7 +2108,7 @@ write_files:
             terminationGracePeriodSeconds: 0
             initContainers:
               - name: remove-cni-networks
-                image: alpine:latest
+                image: {{.HyperkubeImage.RepoWithTag}}
                 command:
                 - /bin/rm
                 - -rf
@@ -4508,7 +4508,7 @@ write_files:
 
         log "Running a pod on node ${node} to determine pod ip address..."
         local selector="{ \"apiVersion\": \"v1\", \"spec\": { \"nodeSelector\": { \"kubernetes.io/hostname\": \"${node}\" }, \"tolerations\": [ { \"effect\": \"NoSchedule\", \"operator\": \"Exists\" }, { \"effect\": \"NoExecute\", \"operator\": \"Exists\" } ] } }"
-        ipaddress=$(kubectl -n kube-system run find-pod-ip-${node%%.*} --pod-running-timeout=1m -i -t --image=alpine:latest --restart=Never --overrides="${selector}" -- /bin/sh -c "cat /proc/net/fib_trie | awk '/32 host/ {print f} {f=\$2}' | grep -v 127.0.0.1 | uniq") || return 1
+        ipaddress=$(kubectl -n kube-system run find-pod-ip-${node%%.*} --pod-running-timeout=1m -i -t --image={{.HyperkubeImage.RepoWithTag}} --restart=Never --overrides="${selector}" -- /bin/sh -c "cat /proc/net/fib_trie | awk '/32 host/ {print f} {f=\$2}' | grep -v 127.0.0.1 | uniq") || return 1
         kubectl -n kube-system delete pod find-pod-ip-${node%%.*} 2>&1 >/dev/null
 
         if [[ -n "${ipaddress}" ]]; then