From 05617a45837da02e477dfab86982ab71727bba2d Mon Sep 17 00:00:00 2001 From: Jonathan Wills Date: Mon, 31 Aug 2015 23:07:11 -0400 Subject: [PATCH 1/2] Add CLUSTER_REGISTER_DISK and CLUSTER_REGISTRY_DISK_SIZE to gce/coreos --- cluster/gce/coreos/helper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index 5ef057acf4a..bdfbb435843 100755 --- a/cluster/gce/coreos/helper.sh +++ b/cluster/gce/coreos/helper.sh @@ -44,6 +44,8 @@ LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-}) ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false}) ENABLE_CLUSTER_REGISTRY: $(yaml-quote ${ENABLE_CLUSTER_REGISTRY:-false}) +CLUSTER_REGISTRY_DISK: $(yaml-quote ${CLUSTER_REGISTRY_DISK}) +CLUSTER_REGISTRY_DISK_SIZE: $(yaml-quote ${CLUSTER_REGISTRY_DISK_SIZE}) DNS_REPLICAS: $(yaml-quote ${DNS_REPLICAS:-}) DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-}) DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-}) @@ -81,7 +83,7 @@ ENABLE_NODE_LOGGING=${ENABLE_NODE_LOGGING:-false} LOGGING_DESTINATION=${LOGGING_DESTINATION:-} ELASTICSEARCH_LOGGING_REPLICAS=${ELASTICSEARCH_LOGGING_REPLICAS:-} ENABLE_CLUSTER_DNS=${ENABLE_CLUSTER_DNS:-false} -ENABLE_CLUSTER_REGISTRY=${ENABLE_CLUSTER_REGISTRY:-false}) +ENABLE_CLUSTER_REGISTRY=${ENABLE_CLUSTER_REGISTRY:-false} DNS_REPLICAS=${DNS_REPLICAS:-} DNS_SERVER_IP=${DNS_SERVER_IP:-} DNS_DOMAIN=${DNS_DOMAIN:-} From 5d38a8f0248a82333826d097baffcea6aa33c304 Mon Sep 17 00:00:00 2001 From: Jonathan Wills Date: Fri, 4 Sep 2015 11:58:48 -0400 Subject: [PATCH 2/2] Create /etc/rkt on startup --- cluster/gce/coreos/node.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml index 0bcffef910f..c00c328c61a 100644 --- a/cluster/gce/coreos/node.yaml +++ b/cluster/gce/coreos/node.yaml @@ -93,6 +93,7 @@ coreos: EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/rm -rf /opt/rkt ExecStartPre=/usr/bin/mkdir -p /opt/rkt + ExecStartPre=/usr/bin/mkdir -p /etc/rkt ExecStartPre=/usr/bin/wget \ -O /opt/rkt/rkt-v${RKT_VERSION}.tar.gz \ https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz