From 5deff8b2bede6cd2702268361dcc1759d7f95644 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Mon, 9 Mar 2015 17:33:07 +0000 Subject: [PATCH] coreos/azure: Remove workaround coreos/bugs#267 - it turned out the issue was due to the domain lenght, so let's just keep it short. --- .../kubernetes-cluster-etcd-node-template.yml | 5 ---- ...kubernetes-cluster-main-nodes-template.yml | 24 ------------------- .../coreos/azure/create-kubernetes-cluster.js | 2 +- .../coreos/azure/lib/azure_wrapper.js | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml index e3f90055608ca..85a7f70a901a6 100644 --- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml +++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml @@ -10,11 +10,6 @@ coreos: snapshot: true max-retry-attempts: 50 units: - - name: dhcpcd.service - enable: true - command: start - - name: systemd-resolved.service - command: stop - name: etcd.service command: start update: diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml index 603f59d6da469..f0c8f335e7daa 100644 --- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml +++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml @@ -29,30 +29,6 @@ coreos: [Service] Environment=DOCKER_OPTS='--bridge="weave" -r="false"' - - name: dhcpcd.service - enable: true - command: start - - - name: systemd-resolved.service - command: stop - - - name: wait-for-network-online.service - enable: true - command: start - content: | - [Unit] - After=network-online.target - Before=install-weave.service - Before=download-kubernetes.service - Description=Temporary hack, as the use of dhcpcd.service breaks nework-online.online - Documentation=https://github.com/coreos/bugs/issues/267 - Requires=network-online.target - [Service] - Type=oneshot - ExecStart=/bin/sh -c 'until curl --silent --fail https://status.github.com/api/status.json | grep -q \"good\"; do sleep 2; done' - [Install] - WantedBy=network-online.target - - name: weave-network.target enable: true content: | diff --git a/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js b/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js index e05bbc061a89c..70248c596c673 100755 --- a/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js +++ b/docs/getting-started-guides/coreos/azure/create-kubernetes-cluster.js @@ -3,7 +3,7 @@ var azure = require('./lib/azure_wrapper.js'); var kube = require('./lib/deployment_logic/kubernetes.js'); -azure.create_config('kubernetes', { 'etcd': 3, 'kube': 3 }); +azure.create_config('kube', { 'etcd': 3, 'kube': 3 }); azure.run_task_queue([ azure.queue_default_network(), diff --git a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js index c34a79b12bcdc..74ec0a8e4afaf 100644 --- a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js +++ b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js @@ -227,7 +227,7 @@ exports.create_config = function (name, nodes) { weave_salt: util.rand_string(), resources: { vnet: [name, 'internal-vnet', util.rand_suffix].join('-'), - service: [name, 'service-cluster', util.rand_suffix].join('-'), + service: [name, util.rand_suffix].join('-'), ssh_key: create_ssh_key(name), } };