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.
duda · Mar 10, 2015 · 5deff8b · 5deff8b
1 parent cc9f6b1
commit 5deff8b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 31 deletions.
diff --git a/...rted-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml b/...rted-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/...ted-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/...ted-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
@@ -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
@@ -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),
     }
   };