diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index 846bb2591b0..ac8d686299a 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:-}) @@ -83,7 +85,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:-} 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