github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-04 16:56:32 +00:00
Code Issues Projects Releases Wiki Activity
8,251 Commits 1 Branch 32 Tags
6c29f580ae0c13ba201ffd0caec7660fcc6cf3ac
Commit Graph

957 Commits

Author SHA1 Message Date
Ian Campbell
9397b9480a kubernetes: populate host CNI paths by binding from kubernetes service. 
Kubernetes assumes (for now) that various paths are valid at the host level to
be mounted into containers, including /opt/cni and /etc/cni.

We cannot (easily) use symlinks here because the weave.yml mounts /opt and /etc
rather than /opt/cni and /etc/cni (this seems likely to be common pattern). So
if /etc/cni were a symlink to the persistent disk (under /var/lib) then it will
be dangling link within the weave container.

So add bind mounts to the runtime configuration of the kubernetes image. This
also means we must create the target mount points in the yml.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 14:25:54 +01:00
Ian Campbell
07e4f515a4 kubernetes: add basic cni plugins dynamically 
This avoids a slightly tricky sequence of nested bind mounts by just unpacking
a tarball on boot (with a stamp so it only happens once).

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 14:25:54 +01:00
Ian Campbell
1074b4a8d4 kubernetes: point kubelet at /var/lib/cni directly 
Still need the /opt bind to host for weave.yaml but no need for etc any longer.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 14:25:25 +01:00
Ian Campbell
35542e493c kubernetes: drop /rootfs from kubelet container 
Since 424203cd9c we can use /var/lib/cni/{etc,opt} directly.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 12:24:59 +01:00
Ian Campbell
67fa0ad662 kubernetes: allow users to add kubelet options by overriding the command 
For example to tell kubelet to use cri-containerd:

    command: ["/usr/bin/kubelet.sh", "--container-runtime=remote", "--container-runtime-endpoint=unix:///var/run/cri-containerd.sock"]

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 12:24:59 +01:00
Ian Campbell
32e53cf769 kubernetes: Add boot.sh options to preserve state dir and to set MAC 
Not having to redo the kubeadm-init.sh step massively speeds up the test/dev
cycle. Having the same MAC (and hence same IP) is useful there too since you
don't need to figure out the mac on each boot.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 12:24:59 +01:00
Ian Campbell
b6725a1b11 kubernetes: give more resources to worker nodes. 
The sock-shop demo[0] requires around 5G of images on a worker node and 3G of
RAM (if there is only one worker node and therefore everything runs on that
node).

Since the master is more than happy with the 4G disk and 1G RAM it is given
today split the settings into master and node specific and bump only the
latter.

KUBE_PORT_BASE is unused and was already removed in 54ddde0d43 but
accidentally reintroduced (by me) in 62aa9248a4, whack it again.

[0] https://microservices-demo.github.io/microservices-demo

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-18 12:24:59 +01:00
Rolf Neugebauer
2d20ef1014 Update YAML files to new kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-09-14 17:21:01 +01:00
David Scott
2b80ff5a0f Update init version in YAML files 
Signed-off-by: David Scott <dave.scott@docker.com>
 2017-09-14 11:47:38 +01:00
Rolf Neugebauer
11d9dc1e99 Update YAML files to latest kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-09-12 11:49:52 +01:00
Rolf Neugebauer
a1dcdd6495 Update YAML files with latest kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-09-08 15:46:02 +01:00
Ian Campbell
b7ec19bb1f Update yml for containerd beta.0 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-07 18:46:40 +01:00
Rolf Neugebauer
ed8d367e2a Update 4.9.x/4.4.x kernel version in YAML files 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-09-04 17:58:16 +01:00
Thomas Gazagnaire
14a5b64dcc Update to latest capnp & capnp-rpc 
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
 2017-09-04 16:21:53 +02:00
Justin Cormack
e27807b733 Merge pull request #2478 from justincormack/formats 
Change "output" to "format" in moby tool
 2017-09-02 12:00:13 +01:00
Justin Cormack
91207540e4 Change "output" to "format" in moby tool 
This is less confusing as there is also an output option to set the file.

See https://github.com/moby/tool/pull/146

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-09-01 23:52:25 +01:00
Theo Koulouris
1c14f278b2 okernel build dockerfile now gets openssl package from alpine base image 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-09-01 14:26:00 +01:00
Riyaz Faizullabhoy
fb8a1bf39f Merge pull request #2464 from rn/dock-up 
Update DinD from 17.06.1-ce to 17.07.0-ce
 2017-08-31 09:43:53 -07:00
Rolf Neugebauer
2d1242e271 Merge pull request #2465 from t-koulouris/ok_build_updates 
Updates to okernel project build files
 2017-08-31 15:47:22 +01:00
Theo Koulouris
27e8c1145c Streamlined how Makefile handles okernel versions 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 14:31:41 +01:00
Theo Koulouris
c51f89a600 Removed unused device drivers and options from okernel config file 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 13:43:39 +01:00
Theo Koulouris
88a2415ff5 Stop using deprecated linuxkit/kernel-compile in okernel build Dockerfile 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 13:42:07 +01:00
Rolf Neugebauer
419deee158 Update Linux kernel versions to latest 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:23:45 +01:00
Rolf Neugebauer
94cdc5aee8 Update DinD from 17.06.1-ce to 17.07.0-ce 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 16:52:15 +01:00
Theo Koulouris
2b6f533891 Updates to okernel project build files (multi-stage builds, clean-ups, etc) 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-30 15:33:34 +01:00
Ian Campbell
b34aaee4db kubernetes: document the final step for bridged networking 
Having described all the setup describing the acgual usage seems useful!

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 21:25:09 +01:00
Ian Campbell
d78321d701 Update hashes for init and containerd 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 01:05:50 +01:00
Justin Cormack
baf76d5e0c update hashes for init 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:43:18 +01:00
Justin Cormack
1c4e8c3ae2 Update Docker CE image to 17.06.1 
Bug fix update.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-22 10:54:26 +01:00
Justin Cormack
6f1e4add2e Merge pull request #2444 from justincormack/cni-persistence 
Kubernetes improvements
 2017-08-21 20:03:30 +01:00
Justin Cormack
4fec826d22 Update kube hashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 17:57:08 +01:00
Justin Cormack
c857b91e64 Update Kubernetes to 1.7.4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 17:54:21 +01:00
Justin Cormack
498d5a1966 Merge pull request #2442 from justincormack/tools-additions 
Add some more tools to base image and only clone containerd once
 2017-08-21 17:00:23 +01:00
Justin Cormack
6264912489 Restrict kubernetes to amd64 
- currently no arm64 binary downloads available

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 16:07:49 +01:00
Justin Cormack
1597ddb72f Update weave yaml to k8s 1.7 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 15:58:13 +01:00
Justin Cormack
ea87b6df79 Use standard LinuxKit base image to build Kubernetes container 
- now has everything we need in it.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 15:51:26 +01:00
Justin Cormack
424203cd9c Move Kubernetes CNI paths to /var so they persist 
Currently they will be on a read only partition so broken;
previously this would have been a non persistent read write partition
in an initramfs but this no longer works.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 15:46:18 +01:00
Justin Cormack
0cda27d4ef Update hashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 15:40:17 +01:00
Justin Cormack
534026e3ea Use new runtime mkdir instead of mkdir container 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-21 12:01:18 +01:00
Justin Cormack
3e494f7762 Update hashes for metadata 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-19 19:30:04 +01:00
Rolf Neugebauer
efe8292e25 Update YAML files to new kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-18 18:08:33 +01:00
Justin Cormack
9506d45d49 Merge pull request #2413 from justincormack/runtime-config 
Add a runtime config
 2017-08-18 17:45:10 +01:00
Justin Cormack
a9bf2a0735 Update hashes for metadata 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-17 15:03:23 +01:00
Justin Cormack
2f915b8cf2 Update init, containerd, runc images 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-17 13:54:51 +01:00
Justin Cormack
6107c866b3 Add documentation for how to run a single node Kube cluster 
As I keep forgetting where this is documented...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-16 13:52:38 +01:00
Thomas Leonard
86b4f01e17 Update https-unikernel to released capnp-rpc 0.1 API 
Also, separate out RPC encoding from application logic.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
 2017-08-15 14:16:35 +01:00
Justin Cormack
a7b3384205 Merge pull request #2405 from rn/kern-up 
Update kernels to 4.9.43/4.4.82
 2017-08-14 14:54:47 +01:00
Rolf Neugebauer
2007c4eef0 Update YAML files to 4.9.43/4.4.82 kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-14 11:02:30 +01:00
Rolf Neugebauer
ead41d0904 Update YAML files to 4.9.42 and 4.4.81 kernels 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-14 10:52:15 +01:00
Tim Potter
6f90d7a154 Update ssh_into_kubelet.sh to use ctr tasks exec 
PR #1299 moved "ctr exec" into "ctr tasks exec" so update the kubernetes project to reflect this.

Signed-off-by: Tim Potter <tpot@hpe.com>
 2017-08-14 13:52:24 +10:00