Rolf Neugebauer
8e5424f65f
Merge pull request #2526 from justincormack/build-containerd-in-alpine
...
Build containerd in Alpine image
2017-09-21 08:05:11 +01:00
Isaac Rodman
0add33e288
added capability to pkg/dhcpcd for sethostname
...
Signed-off-by: Isaac Rodman <isaac@eyz.us>
2017-09-20 15:11:43 -07:00
Justin Cormack
a5054d5ad4
Update containerd hashes
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-20 14:35:37 -07:00
Justin Cormack
498086dbb9
Update containerd to use pre-built version
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-20 14:24:10 -07:00
Justin Cormack
a48a6b3e97
Build containerd in Alpine image
...
This makes it easier to add the containerd testing tools like
`containerd-stress` to test packages, for example, and also at
some point move `ctr` out of the base image as it can be installed
from the alpine image.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-20 21:16:54 +00:00
Justin Cormack
28c08bc293
Merge pull request #2525 from ijc/kubernetes
...
Kubernetes updates
2017-09-20 13:31:07 -07:00
Ian Campbell
ac6b8dcf6a
kubernetes: more flexible selection of network stack
...
Also move to 50 in the ordering so things can be added before as well as after.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 16:45:56 +01:00
Ian Campbell
451fe22c82
kubernetes: update yml
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 15:26:41 +01:00
Ian Campbell
615f135d61
kubernetes: use coreutils in kubelet container for full fat du
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 15:24:18 +01:00
Ian Campbell
5c4c25cac6
kubernetes: support auto-init via metadata
...
Set KUBE_MASTER_AUTOINIT when using boot.sh to enable. User will need to pick
up the token for other nodes using `kubeadm token list`.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 15:23:27 +01:00
Ian Campbell
3ce260cb9a
kubernetes: rework kubelet and kubeadm start of day interations
...
Rework the kubelet.sh script by adding an explicit step which waits for the
configuration to be valid, either by finding appropriate metadata or by waiting
explicitly for kubelet.conf to be created (e.g. by kubeadm) before launching
kubelet. The previous construct was implicitly waiting for kubelet.conf to be
created since kubelet fails if that file is not present.
Pull the set of start of day yaml files to be applied (currently just weave)
out of the kubelet image and into the LinuxKit yaml by providing a directory
which is searched for *.yaml after init.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 15:23:27 +01:00
Ian Campbell
7145b40947
kubernetes: bump to cri-containerd a2dbc6ec1ce6
...
Adds some bug fixes and support for copy up of anonymous volume contents from
the underlying image.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 15:23:27 +01:00
Ian Campbell
dea2e1df66
alpine: add coreutils
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 14:22:55 +00:00
Rolf Neugebauer
b6dc0ebcdc
Merge pull request #2523 from rn/update
...
Updates including kernel update to 4.12.14/4.9.51
2017-09-20 14:58:51 +01:00
Rolf Neugebauer
402f066561
Update AUTHORS
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 12:15:28 +01:00
Rolf Neugebauer
ffe6de1119
Update YAMLs to new kernel versions
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 12:14:40 +01:00
Rolf Neugebauer
bd4723d1aa
kernel: Update kernels to 4.12.14/4.9.51
...
While at it might as well update the alpine base...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 12:13:26 +01:00
Rolf Neugebauer
f2a73dcd01
kernel: Enable HPSA and SMARTPQI SCSI driver modules
...
These drivers are for HPE SCSI cards and enabling them subsequently
enabled RAID_ATTRS and CHECK_SIGNATURE.
Only enabled for 4.9 and 4.12 kernels.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 11:59:06 +01:00
Rolf Neugebauer
60dd54670f
Update YAML files with new getty, ip, and sshd package hashes
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 11:52:42 +01:00
Rolf Neugebauer
d9ffc57532
pkg: Update the getty, ip, and sshd package to latest alpine base
...
These packages use the wireguard tools which have been updated
with the previous commit.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 11:46:48 +01:00
Rolf Neugebauer
b971db8a4b
tools/alpine: Update alpine base image
...
In particular this updates the wireguard tools to a newer version.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 10:43:55 +00:00
Justin Cormack
cb1c749772
Merge pull request #2520 from yankcrime/openstack_run_sshkeys
...
[OpenStack] Support specifying an SSH key name when creating an instance
2017-09-19 12:38:25 -07:00
Justin Cormack
95cf9dabcd
Merge pull request #2522 from ijc/kubernetes
...
Bump kuberrnetes versions
2017-09-19 12:37:39 -07:00
Ian Campbell
7d7b65aa19
kubernetes: simpler rune to get image digest
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 13:31:38 +01:00
Ian Campbell
b7721daa69
kubernetes: bump yml
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:55:56 +01:00
Ian Campbell
965635ab86
kubernetes: Bump to latest cri-containerd
...
Fixes access to GCR private registries and implements mount point propagation.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:52:51 +01:00
Ian Campbell
3018c8add1
kubernetes: Add force{tag,push} targets to image-cache build
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:34:18 +01:00
Ian Campbell
faecbffff2
kubernetes: Bump to v1.7.6
...
Also pickup Weave 2.0.6 and CNI 0.6.0. Note that the CNI plugins have moved to
a new directory.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:28:18 +01:00
Ian Campbell
50ddffb1a5
kubernetes: Autogenerate file with image cache digests
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:28:14 +01:00
Ian Campbell
605c4b6675
kubernetes: Move images for caches into separate file
...
Will be auto-generated.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-19 11:28:14 +01:00
Rolf Neugebauer
144765e8cf
Merge pull request #2521 from zx2c4/wireguard-bump
...
wireguard: version bump
2017-09-19 08:09:04 +01:00
Jason A. Donenfeld
bd4775cf6f
wireguard: version bump
...
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-09-19 03:43:14 +02:00
Justin Cormack
63eae8abee
Merge pull request #149 from justincormack/shared-init
...
Used shared init with LinuxKit
2017-09-18 18:10:08 -07:00
Justin Cormack
cf15ec36a6
Merge pull request #2500 from justincormack/shared-init
...
Convert rc.init and rc.shutdown to Go
2017-09-18 18:10:00 -07:00
Nick Jones
0556812b63
[OpenStack] Support specifying an SSH key name when creating an instance
...
This commit introduces a new option - `keyname` - to the OpenStack
runner, which allows the user to specify the name of a keypair they want
to associate with the instance at the time of creation.
Signed-off-by: Nick Jones <nick@dischord.org>
2017-09-18 21:36:04 +01:00
Justin Cormack
dff6dc2876
Used shared init with LinuxKit
...
With https://github.com/linuxkit/linuxkit/pull/2500 the init script
can be used for both bare metal and in Docker.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-18 13:11:37 -07:00
Justin Cormack
7ee5ff77d1
Merge pull request #150 from ijc/updates
...
Couple of minor updates to metadata file output
2017-09-18 13:10:24 -07:00
Justin Cormack
2010d999ca
update hashes for init
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-18 11:53:02 -07:00
Justin Cormack
042cd763fe
Add vendoring for rc.init
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-18 11:46:00 -07:00
Justin Cormack
bcfb760a1d
Convert rc.init and rc.shutdown to Go
...
This removes more shell scripts to improve maintainability.
This now also works correctly in userspace, so it can be used for
running LinuxKit images in Docker and other such use cases.
It is a literal conversion of the shell scripts with a few small
tweaks.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-18 11:45:59 -07:00
Justin Cormack
f88ac735ba
Merge pull request #2518 from ijc/kubernetes-cri
...
Kube project updates, including cri-containerd integration
2017-09-18 10:33:22 -07:00
Rolf Neugebauer
94419ad709
Merge pull request #2517 from rn/tests
...
Update/Unify tests
2017-09-18 15:17:56 +01:00
Ian Campbell
411a21ae07
Make "metadata: yaml" actually output yaml
...
The existing code made json...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 15:13:32 +01:00
Ian Campbell
2f01ab25ed
Correct example yaml
...
Without the space I get:
FATA[0000] Invalid config: yaml: line 66: could not find expected ':'
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 15:13:32 +01:00
Ian Campbell
5ab6c03a08
kubernetes: Add yaml metadata
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:44:40 +01:00
Ian Campbell
7e19d38821
kubernetes: use a common base kube yml file
...
With the master tailoring for docker now being in docker-master.yml,
kube-master and kube-node are identical, so just use a single kube.yml.
The reference to kube-master.yml in README.md is obsolete, so just drop it.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:44:27 +01:00
Ian Campbell
1fa059bbd2
kubernetes: allow selection of runtime engine (docker vs cri-containerd)
...
Currently this is at build time
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:43:23 +01:00
Ian Campbell
445dcc0ac2
kubernetes: Add cri-containerd package
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:39:22 +01:00
Ian Campbell
80dff9fe99
kubernetes: update yml
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:37:39 +01:00
Ian Campbell
b6fbc82e41
kubernetes: Configuration of kubelet via file
...
This allows cri-containerd and docker based systems to pass the correct options
via composition of yml files, while keeping the kubelet service stanza common.
Since bind mounts are not conditional on the presence of the source we need to
create an empty file in the docker case.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-18 14:25:54 +01:00