mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 22:17:14 +00:00
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.
This commit is contained in:
parent
cc9f6b1f79
commit
5deff8b2be
@ -10,11 +10,6 @@ coreos:
|
|||||||
snapshot: true
|
snapshot: true
|
||||||
max-retry-attempts: 50
|
max-retry-attempts: 50
|
||||||
units:
|
units:
|
||||||
- name: dhcpcd.service
|
|
||||||
enable: true
|
|
||||||
command: start
|
|
||||||
- name: systemd-resolved.service
|
|
||||||
command: stop
|
|
||||||
- name: etcd.service
|
- name: etcd.service
|
||||||
command: start
|
command: start
|
||||||
update:
|
update:
|
||||||
|
@ -29,30 +29,6 @@ coreos:
|
|||||||
[Service]
|
[Service]
|
||||||
Environment=DOCKER_OPTS='--bridge="weave" -r="false"'
|
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
|
- name: weave-network.target
|
||||||
enable: true
|
enable: true
|
||||||
content: |
|
content: |
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
var azure = require('./lib/azure_wrapper.js');
|
var azure = require('./lib/azure_wrapper.js');
|
||||||
var kube = require('./lib/deployment_logic/kubernetes.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.run_task_queue([
|
||||||
azure.queue_default_network(),
|
azure.queue_default_network(),
|
||||||
|
@ -227,7 +227,7 @@ exports.create_config = function (name, nodes) {
|
|||||||
weave_salt: util.rand_string(),
|
weave_salt: util.rand_string(),
|
||||||
resources: {
|
resources: {
|
||||||
vnet: [name, 'internal-vnet', util.rand_suffix].join('-'),
|
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),
|
ssh_key: create_ssh_key(name),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user