github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2667 from ijc/kubernetes

Browse Source 
Kubernetes: Bump to 1.8.2 and Weave 2.0.5
This commit is contained in:
Ian Campbell 2017-11-02 13:42:18 +00:00 committed by GitHub
commit fba575a9fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/kubernetes/Makefile
View File

@ -1,5 +1,5 @@
KUBE_RUNTIME ?= docker
NETWORK ?= weave-v2.0.4
KUBE_NETWORK ?= weave-v2.0.5
INIT_YAML ?=
INIT_YAML += network.yaml
@ -25,7 +25,7 @@ kube-master.iso: kube.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml $(INIT_
kube-node.iso: kube.yml $(KUBE_RUNTIME).yml
moby build -name kube-node -format iso-efi -format iso-bios $^
network.yaml: $(NETWORK).yaml
network.yaml: $(KUBE_NETWORK).yaml
ln -nf $< $@
weave-%.yaml:

2
projects/kubernetes/docker-master.yml
View File

@ -1,3 +1,3 @@
services:
- name: kubernetes-image-cache-control-plane
image: linuxkitprojects/kubernetes-image-cache-control-plane:b0fa7a0191616ed8bef9b7d4a5014dffc62c2082
image: linuxkitprojects/kubernetes-image-cache-control-plane:77fd430bba18ed06d2128e9e8b45767b6fa39178

2
projects/kubernetes/docker.yml
View File

@ -23,7 +23,7 @@ services:
runtime:
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt", "/var/lib/kubelet-plugins"]
- name: kubernetes-image-cache-common
image: linuxkitprojects/kubernetes-image-cache-common:b0fa7a0191616ed8bef9b7d4a5014dffc62c2082
image: linuxkitprojects/kubernetes-image-cache-common:77fd430bba18ed06d2128e9e8b45767b6fa39178
files:
- path: /etc/kubelet.sh.conf
contents: ""

2
projects/kubernetes/image-cache/mkversions
View File

@ -1,6 +1,6 @@
#!/bin/sh
repo=gcr.io/google_containers
kube_version=v1.8.1
kube_version=v1.8.2
kube_dns_version=1.14.5
pause_version=3.0
etcd_version=3.0.17

8
projects/kubernetes/image-cache/versions.mk
View File

@ -1,13 +1,13 @@
# autogenerated by mkversions
COMMON_IMAGES := \
kube-proxy-amd64\:v1.8.1@sha256\:58fd496116bf3d2790279f9c44040bdfa71791aba7a7a1b5ca35025b5a032b9f \
kube-proxy-amd64\:v1.8.2@sha256\:8b81f3be506ca13df59731a75cc7795aeeff64cad48202067b431b9c2a4d91a9 \
k8s-dns-sidecar-amd64\:1.14.5@sha256\:9aab42bf6a2a068b797fe7d91a5d8d915b10dbbc3d6f2b10492848debfba6044 \
k8s-dns-kube-dns-amd64\:1.14.5@sha256\:1a3fc069de481ae690188f6f1ba4664b5cc7760af37120f70c86505c79eea61d \
k8s-dns-dnsmasq-nanny-amd64\:1.14.5@sha256\:46b933bb70270c8a02fa6b6f87d440f6f1fce1a5a2a719e164f83f7b109f7544 \
pause-amd64\:3.0@sha256\:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516
CONTROL_PLANE_IMAGES := \
kube-apiserver-amd64\:v1.8.1@sha256\:e1f4066f2f8e0cf975d8427842d95c86fd872c239e9ed2534f83121ebdce10a1 \
kube-controller-manager-amd64\:v1.8.1@sha256\:d9a1ab41ba39939511077ce2da44774daafaaecc6460a62358c6e0428831b7d2 \
kube-scheduler-amd64\:v1.8.1@sha256\:fbb29b579b8f20075073987023caa146783d85eac66808c0860f99187fc02454 \
kube-apiserver-amd64\:v1.8.2@sha256\:3e980f4b57292568ea8c87be462cf0583e40bbc2dbfff71d0d9e19beda3cb74b \
kube-controller-manager-amd64\:v1.8.2@sha256\:c2cd4acd4238b2f2526abf5ba546d4e6f4a46618ad5747a539e8a72c294a7482 \
kube-scheduler-amd64\:v1.8.2@sha256\:7c920b718509e8cf811c69178526d84ebfab2bdbb95949f6e82eb5233e7b5f0e \
etcd-amd64\:3.0.17@sha256\:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940

2
projects/kubernetes/kube.yml
View File

@ -36,7 +36,7 @@ services:
- name: sshd
image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67
- name: kubelet
image: linuxkitprojects/kubernetes:d6caf404753aa1d72ad96ff149ea5edc7c24be8f
image: linuxkitprojects/kubernetes:4d8ef8789cc04cb0e8cf42dc3f34e03ec70daf3d
files:
- path: etc/linuxkit.yml
metadata: yaml

2
projects/kubernetes/kubernetes/Dockerfile
View File

@ -1,6 +1,6 @@
FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
ENV kubernetes_version v1.8.1
ENV kubernetes_version v1.8.2
ENV cni_version v0.6.0
RUN apk add -U --no-cache \