From 12d6e38b4887b9fa5a4a5764fee4af54ee2dc730 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Sat, 8 Apr 2017 05:49:58 +0100 Subject: [PATCH 1/2] Use `directory: true` instead fo writing a dummy file Signed-off-by: Ilya Dmitrichenko --- projects/kubernetes/kube-master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 967022147..b5fdad989 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -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 From 54835a1d67020b12fb64bd1aca166cd7e46ef195 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Sat, 8 Apr 2017 05:51:54 +0100 Subject: [PATCH 2/2] Fix typo Signed-off-by: Ilya Dmitrichenko --- projects/demo/etcd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/demo/etcd/README.md b/projects/demo/etcd/README.md index 9acd91471..6f6f013b9 100644 --- a/projects/demo/etcd/README.md +++ b/projects/demo/etcd/README.md @@ -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.