github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1546 from errordeveloper/minor-updates

Browse Source 
Minor updates
This commit is contained in:
Justin Cormack 2017-04-08 10:04:28 +01:00 committed by GitHub
commit 06ea4620d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/demo/etcd/README.md
View File

@ -1,6 +1,6 @@
This directory contains scripts/files to bootstrap a `etcd` cluster both on the local machine as well as on Google Cloud.
An `etcd` cluster can be bootstrapped in different ways (see the [Documentatiob](https://coreos.com/etcd/docs/latest/op-guide/clustering.html) for more details. For the demo we use configuration via static IP addresses. With Infrakit these are managed by assigning `LogicalID`s to cluster members. The `LogicalID` is interpreted as a IP address.
An `etcd` cluster can be bootstrapped in different ways (see the [Documentation](https://coreos.com/etcd/docs/latest/op-guide/clustering.html) for more details. For the demo we use configuration via static IP addresses. With Infrakit these are managed by assigning `LogicalID`s to cluster members. The `LogicalID` is interpreted as a IP address.
The moby `etcd` package is build with [build-pkg.sh](./build-pkg.sh). It takes the official `etcd` container and adds a [script](./etcd.sh) to start `etcd`. [etcd.sh](./etcd.sh) first attempts to join a new cluster. If that fails it attempts to join an existing cluster. Note, the number and members of the cluster are somewhat hard coded in the script.

4
projects/kubernetes/kube-master.yml
View File

@ -74,7 +74,7 @@ daemon:
- /var/log:/var/log #/var/log/containers
- /etc/kubernetes:/etc/kubernetes
files:
- path: etc/kubernetes/.empty
contents: '# workaround to create parent directory'
- path: etc/kubernetes/
directory: true
outputs:
- format: kernel+initrd