diff --git a/Dockerfile b/Dockerfile index 353b51d7f..ce8f2fd6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,7 +134,7 @@ RUN mkdir -p /rootfs/opt/cni/bin RUN curl -L https://github.com/containernetworking/cni/releases/download/v0.6.0/cni-amd64-v0.6.0.tgz | tar -xz -C /rootfs/opt/cni/bin RUN curl -L https://github.com/containernetworking/plugins/releases/download/v0.7.4/cni-plugins-amd64-v0.7.4.tgz | tar -xz -C /rootfs/opt/cni/bin # kubeadm -RUN curl --retry 3 --retry-delay 60 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/linux/amd64/kubeadm -o /rootfs/bin/kubeadm +RUN curl --retry 3 --retry-delay 60 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.2/bin/linux/amd64/kubeadm -o /rootfs/bin/kubeadm RUN chmod +x /rootfs/bin/kubeadm # images COPY images /rootfs/usr/images diff --git a/Makefile b/Makefile index 1a6d6c90d..2ef17b4ce 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,8 @@ lint: $(COMMON_APP_ARGS) hyperkube: - @docker pull k8s.gcr.io/$@:v1.13.1 - @docker save k8s.gcr.io/$@:v1.13.1 -o ./images/$@.tar + @docker pull k8s.gcr.io/$@:v1.13.2 + @docker save k8s.gcr.io/$@:v1.13.2 -o ./images/$@.tar etcd: @docker pull k8s.gcr.io/$@:3.2.24 diff --git a/go.mod b/go.mod index e7e0ef2a4..88bbc340b 100644 --- a/go.mod +++ b/go.mod @@ -73,9 +73,9 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.2.2 gotest.tools v2.1.0+incompatible // indirect - k8s.io/api v0.0.0-20181221193117-173ce66c1e39 + k8s.io/api v0.0.0-20190111032252-67edc246be36 k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476 // indirect - k8s.io/apimachinery v0.0.0-20181220065808-98853ca904e8 + k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 // indirect k8s.io/client-go v10.0.0+incompatible k8s.io/cluster-bootstrap v0.0.0-20181108060158-bf9d13f1fbeb // indirect @@ -83,7 +83,7 @@ require ( k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5 // indirect k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5 // indirect k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017 // indirect - k8s.io/kubernetes v1.13.1 + k8s.io/kubernetes v1.13.2 k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67 // indirect sigs.k8s.io/yaml v1.1.0 // indirect ) diff --git a/go.sum b/go.sum index 286f8df67..49c9db070 100644 --- a/go.sum +++ b/go.sum @@ -167,12 +167,12 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.1.0+incompatible h1:5USw7CrJBYKqjg9R7QlA6jzqZKEAtvW82aNmsxxGPxw= gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20181221193117-173ce66c1e39 h1:iGq7zEPXFb0IeXAQK5RiYT1SVKX/af9F9Wv0M+yudPY= -k8s.io/api v0.0.0-20181221193117-173ce66c1e39/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/api v0.0.0-20190111032252-67edc246be36 h1:XrFGq/4TDgOxYOxtNROTyp2ASjHjBIITdk/+aJD+zyY= +k8s.io/api v0.0.0-20190111032252-67edc246be36/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476 h1:Ws9zfxsgV19Durts9ftyTG7TO0A/QLhmu98VqNWLiH8= k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= -k8s.io/apimachinery v0.0.0-20181220065808-98853ca904e8 h1:WLypux0abPAfOJJKJNA1+g5yphAOk+ESOeSqWMwMnqA= -k8s.io/apimachinery v0.0.0-20181220065808-98853ca904e8/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 h1:tT6oQBi0qwLbbZSfDkdIsb23EwaLY85hoAV4SpXfdao= +k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 h1:NyOpnIh+7SLvC05NGCIXF9c4KhnkTZQE2SxF+m9otww= k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34= @@ -187,8 +187,8 @@ k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5 h1:tM7Kt5AXss8IHvgPHoff1hyJ k8s.io/kube-proxy v0.0.0-20181108055616-8eeec43ca7b5/go.mod h1:wYVhqAVLhGBLbGzgb9GsBakzIddI81JxSUHANQvzZZs= k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017 h1:Df4PBcfWHh/oi4pHC+G7mbJEKtbukYl34RDo12caUxA= k8s.io/kubelet v0.0.0-20181108055742-1ff588f76017/go.mod h1:m6JOtVhjgs4GGnzhPpXuNF9VG+IjARwo/dHCNw4+QDA= -k8s.io/kubernetes v1.13.1 h1:IwCCcPOZwY9rKcQyBJYXAE4Wgma4oOW5NYR3HXKFfZ8= -k8s.io/kubernetes v1.13.1/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/kubernetes v1.13.2 h1:rBz6dubDY4bfv85G6zo04v9G5wniTxvBI9yQ/QxJS3g= +k8s.io/kubernetes v1.13.2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67 h1:+kBMW7D4cSYIhPz0fVs6NRp5QILMz6+65ec4kWJOoXs= k8s.io/utils v0.0.0-20181102055113-1bd4f387aa67/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= diff --git a/internal/pkg/constants/constants.go b/internal/pkg/constants/constants.go index 248f6eba4..bef4b722c 100644 --- a/internal/pkg/constants/constants.go +++ b/internal/pkg/constants/constants.go @@ -47,7 +47,7 @@ const ( KubeadmCAKey = "/etc/kubernetes/pki/ca.key" // KubernetesVersion is the enforced target version of the control plane. - KubernetesVersion = "v1.13.1" + KubernetesVersion = "v1.13.2" // KubernetesImage is the enforced hyperkube image to use for the control plane. KubernetesImage = "k8s.gcr.io/hyperkube:" + KubernetesVersion