Commit Graph

5194 Commits

Author SHA1 Message Date
Rolf Neugebauer
e145ef02b3 pkg/lcow: Update OpenGCS to latest
While at it might as well bump alpine base

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-15 10:57:55 +00:00
Justin Cormack
bebb6a09db
Merge pull request #2723 from pcfdev-forks/master
allow hyperkit console input/output to be redirected
2017-11-15 10:55:51 +00:00
Justin Cormack
675281a665
Merge pull request #2716 from rn/4.14
Add support for 4.14 kernels
2017-11-15 10:54:14 +00:00
Justin Cormack
2a3d6d5930
Merge pull request #2729 from ijc/bump-runc
Bump runc to 74a17296470088de3805e138d3d87c62e613dfc4
2017-11-15 10:53:04 +00:00
Ian Campbell
d88a1e591d Bump runc yml
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-15 09:34:06 +00:00
Ian Campbell
ca02060a4c Bump runc to 74a17296470088de3805e138d3d87c62e613dfc4
As recommended by containerd v1.0.0-beta.3

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-15 09:28:44 +00:00
Dave Protasowski
f598d9aff2 allow hyperkit console input/output to be redirected
Signed-off-by: Dave Protasowski <dprotaso@gmail.com>
Signed-off-by: Steve Hiehn <shiehn@pivotal.io>
2017-11-14 11:44:51 -05:00
Rolf Neugebauer
8c3140885c tests: Add 4.14 tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:48:08 +00:00
Rolf Neugebauer
eb4bb1fa39 kernel: Tweak the 4.14.x kernel config
- aarch64/x86_64: Disable RC_CORE: Don't need support for remote controls
- aarch64/x86_64: Enable RESET_ATTACK_MITIGATION (clear contents of RAM
  after reboot)
- x86_64: Disable NET_VENDOR_HUAWEI
- x86_64: Use ORC_UNWINDER for stack traces
- aarch64: Enable GPIO_THUNDERX
- aarch64: Enable BUG_ON_DATA_CORRUPTION

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:09:04 +00:00
Rolf Neugebauer
a6a46c8fcf kernel: 4.14.x config after oldconfig
The previous commit used the 4.13.x config files as the
4.14.x config files. This commit stashes the result of
running the 4.14.x oldconfig over them.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:09:03 +00:00
Rolf Neugebauer
c486675df0 kernel: Add initial support for 4.14 kernels
The kernel config files are a copy of the 4.13 kernel configs,
which will be refined in subsequent commits.

This does not yet include any patches which may
be required for LCOW.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:09:03 +00:00
Rolf Neugebauer
ca3e9edb00 kernel: Don't include firmware from linux source tree
4.14.x has dropped 'make firmware_install' and according to [1]
the in-tree firmware has not been updated since 2013, so drop it
for all kernels.

We will need to find another way to add firmware blobs to a
LinuxKit image (see [2])

[1] https://lkml.org/lkml/2017/9/15/343
[2] https://github.com/linuxkit/linuxkit/issues/2714

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:09:03 +00:00
Rolf Neugebauer
f103145050 kernel: Switch Dockerfile.kconfig to bsdtar
I got error when un-tarring the linux-4.14 kernel:
tar: linux-4.14/arch/arm64/boot/dts/arm: Directory renamed before its status could be extracted
tar: linux-4.14/arch/arm64/boot/dts: Directory renamed before its status could be extracted
tar: linux-4.14/arch/arm64/boot: Directory renamed before its status could be extracted
tar: linux-4.14/arch/arm64: Directory renamed before its status could be extracted
tar: linux-4.14/arch: Directory renamed before its status could be extracted

Using bsdtar, this error goes away.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 14:09:03 +00:00
Rolf Neugebauer
ea6ed3c354
Merge pull request #2719 from rn/packet2
examples/packet: Add ssh keys to example
2017-11-14 13:57:37 +00:00
Rolf Neugebauer
879ea03277
Merge pull request #2703 from guillaumerose/multi
metadata: handle json with more than 2 levels
2017-11-14 13:39:27 +00:00
Rolf Neugebauer
1d6e957c7e
Merge pull request #2718 from Wolphin-project/exporter-0.15
node_exporter 0.15.1; updated parameters
2017-11-14 12:12:43 +00:00
Rolf Neugebauer
20c7d6ae0a examples/packet: Add ssh keys to example
without it sshd will not start

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-14 11:54:06 +00:00
Marco Mariani
d87e4f622b node_exporter 0.15.1; updated parameters
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr>
2017-11-14 11:37:02 +01:00
Justin Cormack
c6696145b4
Merge pull request #2715 from rn/packet
examples: Update packet.net examples
2017-11-13 22:48:05 +01:00
Rolf Neugebauer
5b1cb7ec50 examples: Update packet.net examples
- Add getty to get access to the serial console
- Add a arm64 example for baremetal type 2a
- Update documentation (and use example in documentation)

I've tested the PXE boot on arm64 and the bond interface gets
set up and seems usable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-13 18:23:06 +00:00
Guillaume Rose
74167a5dd1 metadata: update image
Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
2017-11-13 15:54:48 +01:00
Guillaume Rose
06e86154b6 metadata: handle json with more than 2 levels
Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
2017-11-13 14:35:17 +01:00
Rolf Neugebauer
6bd6f35d4b
Merge pull request #2712 from justincormack/packet-bonded
Update Packet docs to say we support bonding
2017-11-13 13:21:53 +00:00
Justin Cormack
7fd8b5bc5a Update Packet docs to say we support bonding
Spotted this while reviewing another commit, has been supported for a while.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-13 11:28:19 +00:00
Justin Cormack
1040a9b9ab
Merge pull request #2706 from rn/no-cma
Kernel update to 4.13.12/4.9.61/4.4.97 + disable CMA on arm64
2017-11-13 12:26:38 +01:00
Ian Campbell
1490cad25f
Merge pull request #2708 from djs55/kubernetes-yaml
kubernetes: allow yaml, CNI configuration to be provided via metadata
2017-11-13 11:12:31 +00:00
David Scott
eb7eff8ad7 kubernetes: allow yaml to be provided via metadata
Previously the network policy yaml had to be hard-coded in the image.
This patch allows the policy to be added via the metadata directories:

- /var/config/cni/etc/net.d/
- /var/config/kube-system.init/

Signed-off-by: David Scott <dave.scott@docker.com>
2017-11-11 12:04:36 +00:00
Rolf Neugebauer
815d8da2ed
Merge pull request #2700 from ijc/kubernetes
Kubernetes updates
2017-11-10 22:41:37 +00:00
Ian Campbell
e7327db49f kubernetes: bump yaml
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:51:23 +00:00
Ian Campbell
c08c77e3c8 kubernetes: bump to cri-containerd master
This includes a bump to use containerd v1.0.0-beta.3.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:50:11 +00:00
Ian Campbell
cf01aa4c8d kubernetes: Add a simple bridged option for KUBE_NETWORK
This has no kube object(s) but just arranges for the CNI configuration to be
written in the right place. The CNI bridge, loopback etc binaries are already
included since they are in the reference set.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:50:11 +00:00
Ian Campbell
ed0e79aa9d kubernetes: Refactor network provider selection
KUBE_NETWORK now specifies a yml which is passed to the Moby tool, which can
introduce files into /etc/kubeadm/kube-system.init/ or do other things as it
likes.

In the case of weave this just adds the weave yaml to that directory. To avoid
too much confusion between weave.yml (Moby tool input) and `weave.yaml` (the
kubernetes `ServiceAccount`, `DeamonsSet` etc object specs) name the latter
`kube-weave.yaml`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:50:11 +00:00
Ian Campbell
22cdd22184 kubernetes: Only build the relevant image for the platform
Building both BIOS and EFI variants is a waste of time in most cases, instead
just build whichever one is relevant to the platform (which currently means EFI
on Darwin and BIOS everywhere else).

At the same time make it possible to pass "KUBE_FORMATS" (a space separated
list of targets) to the build e.g. `make KUBE_FORMATS="iso-efi iso-bios"` will
preserve the behaviour prior to this patch.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:50:11 +00:00
Ian Campbell
425553d390 kubernetes: better tolerate bad contents of /etc/kubeadm/kube-system.init/
Specifically ignore present-but-empty files entirely and ignore (but log)
failure to apply any one file.

Ignoring an empty file is useful because it means you can clobber a file which
might be referenced from an images binds without needing to override those
binds (since that generally means duplicating the whole lot which is annoying).

Ignoring any failures to apply means the rest gets applied and the rest of the
script (including untaint and the stamp file creation) still happen, resulting
in a system where the admin just has to address the failures rather than the
remaining updates. We touch a file to indicate failure generally plus one to
indicate the specific yaml which failed to apply.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 14:50:11 +00:00
Rolf Neugebauer
e1a12cd67d Update YAML files to new kernel versions
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 14:20:25 +00:00
Rolf Neugebauer
5359af6b53 doc: Update packet.net ThunderX networking documentation
This currently requires the an explicit modprobe

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 13:29:34 +00:00
Rolf Neugebauer
7a67aaf7db kernel: Update to 4.13.12/4.9.61/4.4.97
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 13:29:34 +00:00
Rolf Neugebauer
fe1c723011 kernel: Disable CMA for aarch64 kernels
We don't have it enabled on x86_64 and according to
https://github.com/linuxkit/linuxkit/issues/2434#issuecomment-342370982
may cause the ThunderX NIC driver from working.

Note, this also disables MEMORY_ISOLATION and ARCH_HAS_GIGANTIC_PAGE
which are internal config variables no longer needed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 13:29:34 +00:00
Rolf Neugebauer
581cbdd1e8
Merge pull request #2701 from rn/vpnkit
Add support for publish port on localhost to the hyperkit backend
2017-11-10 13:29:02 +00:00
Ian Campbell
1e2dff62fc
Merge pull request #2705 from ijc/linuxkit-pkg
linuxkit pkg: Handle build --dev later
2017-11-10 13:26:01 +00:00
Rolf Neugebauer
4b9bf071e5 Update hyperkit vendoring
This includes using ftruncate for speedier disk creation

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:45 +00:00
Rolf Neugebauer
a9e6f37958 doc: Update networking section of platform-hyperkit.md
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:45 +00:00
Rolf Neugebauer
d29cc52be4 examples: Fix the vpnkit-forwarder example
The 'vpnkit-forwarder' packages lacked the vpnkit-expose-port which
was removed in f48a2bfe12 ("pkg: update vpnkit-forwarder").

It is not longer needed as the vpnkit-expose-port functionality
was integrated into 'linuskit run'

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:45 +00:00
Rolf Neugebauer
bc84fab42f vendor: remove github.com/satori/go.uuid
With the switch to github.com/satori/go.uuid this is no
longer needed. Strangely, it was not in vendor.conf...

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:45 +00:00
Rolf Neugebauer
638f15e1f8 tool/qemu: Switch to use github.com/google/uuid
With the hyperkit backend switched to this UUID package
switch qemu as well.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:44 +00:00
Rolf Neugebauer
c45179dce8 tool/hyperkit: Rename uuid.vpnkit to vpnkit.uuid
Other vpnkit related files start with vpnkit too.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:44 +00:00
Rolf Neugebauer
69501a8b26 tool/hyperkit: Add ability to expose port on localhost
When hyperkit is used with VPNKit we can "publish" VM ports
on localhost by using an API to the VPNKit process.

This commit adds a "-publish" flag to the hyperkit backend
exposing this functionality. "-publish" can be used multiple
times and is used the same way as for the qemu backend.

Other changes:
- Use 'github.com/google/uuid' as the 'uuid' package since
  VPKNkit uses it
- use 'vpnkit' prefix instead of 'vpnKit'
- Improve logging

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-10 11:52:44 +00:00
Ian Campbell
012e6fe9d1 linuxkit pkg: Handle build --dev later
The placement in #2679 can never have worked since we parse the yml over the
struct later on.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-10 10:16:19 +00:00
Avi Deitcher
443e47c408
Merge pull request #2702 from arm64b/remove-grub2-patches
tools: Remove the CoreOS grub2 patches
2017-11-10 10:42:44 +02:00
Dennis Chen
807c60c0c6 tools: Remove the CoreOS grub2 patche
Remove the grub2 patch from LinuxKit since it has already been merged
into the CoreOS grub2 mainline code.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-11-10 06:25:40 +00:00