Merge pull request #126 from ryansann/v1.18.5

Update k8s version to v1.18.5

Author: ryansann

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/google_containers/hyperkube:v1.18.4
+FROM gcr.io/google_containers/hyperkube:v1.18.5
 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
     apt-get update && apt-get upgrade -y && apt-get clean && \
     clean-install apt-transport-https gnupg1 curl zfsutils-linux \
@@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
     glusterfs-common \
     samba-common \
     arptables
-
-RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
-    update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \
-    update-alternatives --set arptables /usr/sbin/arptables-legacy && \
-    update-alternatives --set ebtables /usr/sbin/ebtables-legacy

Dockerfile.arm64

@@ -1,4 +1,4 @@
-FROM gcr.io/google_containers/hyperkube:v1.18.4
+FROM gcr.io/google_containers/hyperkube:v1.18.5
 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
     apt-get update && apt-get upgrade -y && apt-get clean && \
     clean-install apt-transport-https gnupg1 curl zfsutils-linux \
@@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
     glusterfs-common \
     samba-common \
     arptables
-
-RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
-    update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \
-    update-alternatives --set arptables /usr/sbin/arptables-legacy && \
-    update-alternatives --set ebtables /usr/sbin/ebtables-legacy

Dockerfile.windows

@@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \
             Exit 1; \
        } \
     }
-ENV K8S_VERSION v1.18.4
+ENV K8S_VERSION v1.18.5
 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \
     \
     function Expand-GZip ($inFile, $outFile) { \