Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cri-containerd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ENV GOPATH=/go PATH=$PATH:/go/bin

ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git
#ENV CRI_CONTAINERD_BRANCH pull/NNN/head
ENV CRI_CONTAINERD_COMMIT f75fa1e39817f83d3ccaf679518b005380df2880
ENV CRI_CONTAINERD_COMMIT v1.0.0-beta.0
RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \
cd $GOPATH/src/github.com/kubernetes-incubator && \
git clone $CRI_CONTAINERD_URL cri-containerd
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build

ENV kubernetes_version v1.8.5
ENV kubernetes_version v1.9.0
ENV cni_version v0.6.0

RUN apk add -U --no-cache \
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubeadm-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ if [ -f /etc/kubeadm/kubeadm.yaml ]; then
if [ $# -ne 0 ] ; then
echo WARNING: Ignoring command line options: $@
fi
kubeadm init --skip-preflight-checks --config /etc/kubeadm/kubeadm.yaml
kubeadm init --ignore-preflight-errors=all --config /etc/kubeadm/kubeadm.yaml
else
kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ $@
kubeadm init --ignore-preflight-errors=all --kubernetes-version @KUBERNETES_VERSION@ $@
fi

# sorting by basename relies on the dirnames having the same number of directories
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ elif [ -d /var/config/kubeadm ] ; then
kubeadm-init.sh --skip-token-print $(cat /var/config/kubeadm/init) &
elif [ -e /var/config/kubeadm/join ] ; then
echo "kubelet.sh: joining cluster with metadata \"$(cat /var/config/kubeadm/join)\""
kubeadm join --skip-preflight-checks $(cat /var/config/kubeadm/join)
kubeadm join --ignore-preflight-errors=all $(cat /var/config/kubeadm/join)
await=/etc/kubernetes/bootstrap-kubelet.conf
fi
elif [ -e /var/config/userdata ] ; then
echo "kubelet.sh: joining cluster with metadata \"$(cat /var/config/userdata)\""
kubeadm join --skip-preflight-checks $(cat /var/config/userdata)
kubeadm join --ignore-preflight-errors=all $(cat /var/config/userdata)
await=/etc/kubernetes/bootstrap-kubelet.conf
fi

Expand Down
8 changes: 4 additions & 4 deletions pkg/kubernetes-docker-image-cache-common/images.lst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# autogenerated by:
# ./scripts/mk-image-cache-lst common
gcr.io/google_containers/kube-proxy-amd64:v1.8.5@sha256:75e0c95306fa74a5ae2078aaf3e71513a787d7d84432b4d6c6c444150546bb4b
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5@sha256:9aab42bf6a2a068b797fe7d91a5d8d915b10dbbc3d6f2b10492848debfba6044
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5@sha256:1a3fc069de481ae690188f6f1ba4664b5cc7760af37120f70c86505c79eea61d
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5@sha256:46b933bb70270c8a02fa6b6f87d440f6f1fce1a5a2a719e164f83f7b109f7544
gcr.io/google_containers/kube-proxy-amd64:v1.9.0@sha256:3760355108b97ed0ff74d33fbec72764e1d7f8fbdb06ed0934117196819e3d00
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7@sha256:f80f5f9328107dc516d67f7b70054354b9367d31d4946a3bffd3383d83d7efe8
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7@sha256:f5bddc71efe905f4e4b96f3ca346414be6d733610c1525b98fff808f93966680
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7@sha256:6cfb9f9c2756979013dbd3074e852c2d8ac99652570c5d17d152e0c0eb3321d6
gcr.io/google_containers/pause-amd64:3.0@sha256:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516
8 changes: 4 additions & 4 deletions pkg/kubernetes-docker-image-cache-control-plane/images.lst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# autogenerated by:
# ./scripts/mk-image-cache-lst control-plane
gcr.io/google_containers/kube-apiserver-amd64:v1.8.5@sha256:6c74eb9d3aed062d604a518f7e346ea92ee4466ede47671b756d780e3993e6f7
gcr.io/google_containers/kube-controller-manager-amd64:v1.8.5@sha256:29f08121733e1ff54f3f72dbb4638729d4d457b5e7304691d2b814dfaa3400fc
gcr.io/google_containers/kube-scheduler-amd64:v1.8.5@sha256:03c0cc3642b75f873a878129f60a934120d6202914dfddb55ab98495c63039af
gcr.io/google_containers/etcd-amd64:3.0.17@sha256:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940
gcr.io/google_containers/kube-apiserver-amd64:v1.9.0@sha256:47377f5df3ea25cb677fe081be78dce9ffe4a58dcaaa4191a0a9e8295cfb848b
gcr.io/google_containers/kube-controller-manager-amd64:v1.9.0@sha256:c65affb682b51f8137e52841732c90170d1b9f2ec32202be0be124dff3d3ba39
gcr.io/google_containers/kube-scheduler-amd64:v1.9.0@sha256:14f8f8dcf2e52e19b5db5ad8e84239d50fdb080a8b96677f9cf0ea944b40bec4
gcr.io/google_containers/etcd-amd64:3.1.10@sha256:28cf78933de29fd26d7a879e51ebd39784cd98109568fd3da61b141257fb85a6
6 changes: 3 additions & 3 deletions scripts/mk-image-cache-lst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
repo=gcr.io/google_containers
kube_version=v1.8.5
kube_dns_version=1.14.5
kube_version=v1.9.0
kube_dns_version=1.14.7
pause_version=3.0
etcd_version=3.0.17
etcd_version=3.1.10

common="
kube-proxy-amd64:$kube_version
Expand Down
2 changes: 1 addition & 1 deletion yml/cri-containerd.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
- name: cri-containerd
image: linuxkit/cri-containerd:179d9a1087d615f3a628e47a73243f8e56fb1440
image: linuxkit/cri-containerd:0a91a4e43787a89c0d4824ea71072e56a29bb833
cgroupsPath: podruntime/runtime
files:
- path: /etc/kubelet.sh.conf
Expand Down
2 changes: 1 addition & 1 deletion yml/docker-master.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
services:
- name: kubernetes-docker-image-cache-control-plane
image: linuxkit/kubernetes-docker-image-cache-control-plane:659330f3bcf72004616f7a09bcf228ec7ba2b0b2
image: linuxkit/kubernetes-docker-image-cache-control-plane:7e3358c0fc82f9049ad27fee27e305e96b816f9a
2 changes: 1 addition & 1 deletion yml/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
runtime:
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt", "/var/lib/kubelet-plugins"]
- name: kubernetes-docker-image-cache-common
image: linuxkit/kubernetes-docker-image-cache-common:c83c9b98eaf010aff2b30e531ad393b1543fb3e9
image: linuxkit/kubernetes-docker-image-cache-common:d406f234bf7747ea4f25b8f6d6740f7557ad1255
files:
- path: /etc/kubelet.sh.conf
contents: ""
2 changes: 1 addition & 1 deletion yml/kube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
- name: sshd
image: linuxkit/sshd:ac5e8364e2e9aa8717a3295c51eb60b8c57373d5
- name: kubelet
image: linuxkit/kubelet:8edc4993e743f1b4d16008aff605aefe37c568e7
image: linuxkit/kubelet:11082f2f27278399856d2ec37b112c79bc68c5a6
files:
- path: etc/linuxkit.yml
metadata: yaml
Expand Down