mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 15:25:57 +00:00
Fixed CloudFormation template by replacing pretty-but-broken quotes written by troublesome text editor. Fixes #3543
This commit is contained in:
parent
4788f7fa4b
commit
81477fce2b
@ -113,90 +113,90 @@
|
||||
"SecurityGroups": [{"Ref": "KubernetesSecurityGroup"}],
|
||||
"UserData": { "Fn::Base64": {"Fn::Join" : ["", [
|
||||
"#cloud-config\n\n",
|
||||
“---\n“,
|
||||
“write_files:\n”,
|
||||
“- path: /opt/bin/waiter.sh\n”,
|
||||
“ owner: root\n”,
|
||||
“ content: |\n”,
|
||||
“ #! /usr/bin/bash\n”,
|
||||
“ until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done\n”,
|
||||
"---\n",
|
||||
"write_files:\n",
|
||||
"- path: /opt/bin/waiter.sh\n",
|
||||
" owner: root\n",
|
||||
" content: |\n",
|
||||
" #! /usr/bin/bash\n",
|
||||
" until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done\n",
|
||||
"coreos:\n",
|
||||
" fleet:\n",
|
||||
" public-ip: $public_ipv4\n",
|
||||
“units:\n",
|
||||
“ - name: setup-network-environment.service\n",
|
||||
“ command: start\n",
|
||||
“ content: |\n",
|
||||
“ [Unit]\n",
|
||||
“ Description=Setup Network Environment\n",
|
||||
“ Documentation=https://github.com/kelseyhightower/setup-network-environment\n",
|
||||
“ Requires=network-online.target\n",
|
||||
“ After=network-online.target\n\n”,
|
||||
“ [Service]\n”,
|
||||
“ ExecStartPre=/usr/bin/mkdir -p /opt/bin\n”,
|
||||
“ ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/setup-network-environment\n”,
|
||||
“ ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment\n”,
|
||||
“ ExecStart=/opt/bin/setup-network-environment\n”,
|
||||
“ RemainAfterExit=yes\n”,
|
||||
“ Type=oneshot\n”,
|
||||
"units:\n",
|
||||
" - name: setup-network-environment.service\n",
|
||||
" command: start\n",
|
||||
" content: |\n",
|
||||
" [Unit]\n",
|
||||
" Description=Setup Network Environment\n",
|
||||
" Documentation=https://github.com/kelseyhightower/setup-network-environment\n",
|
||||
" Requires=network-online.target\n",
|
||||
" After=network-online.target\n\n",
|
||||
" [Service]\n",
|
||||
" ExecStartPre=/usr/bin/mkdir -p /opt/bin\n",
|
||||
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/setup-network-environment\n",
|
||||
" ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment\n",
|
||||
" ExecStart=/opt/bin/setup-network-environment\n",
|
||||
" RemainAfterExit=yes\n",
|
||||
" Type=oneshot\n",
|
||||
" - name: etcd.service\n",
|
||||
" command: start\n",
|
||||
“ content: |\n",
|
||||
“ [Unit]\n",
|
||||
“ Description=etcd\n",
|
||||
“ Requires=setup-network-environment.service\n",
|
||||
“ After=setup-network-environment.service\n\n”,
|
||||
“ [Service]
|
||||
“ EnvironmentFile=/etc/network-environment\n",
|
||||
“ User=etcd\n",
|
||||
“ PermissionsStartOnly=true\n",
|
||||
“ ExecStart=/usr/bin/etcd \\\n”,
|
||||
“ --name $public_ipv4 \\\n",
|
||||
“ --addr $public_ipv4:4001 \\\n",
|
||||
“ --bind-addr 0.0.0.0 \\\n",
|
||||
“ --cluster-active-size 1 \\\n",
|
||||
“ --data-dir /var/lib/etcd \\\n",
|
||||
“ --http-read-timeout 86400 \\\n",
|
||||
“ --peer-addr $public_ipv4:7001 \\\n”,
|
||||
“ --snapshot true\n",
|
||||
“ Restart=always\n",
|
||||
“ RestartSec=10s\n",
|
||||
“ - name: fleet.socket\n",
|
||||
“ command: start\n",
|
||||
“ content: |\n",
|
||||
“ [Socket]\n",
|
||||
“ ListenStream=/var/run/fleet.sock\n",
|
||||
" content: |\n",
|
||||
" [Unit]\n",
|
||||
" Description=etcd\n",
|
||||
" Requires=setup-network-environment.service\n",
|
||||
" After=setup-network-environment.service\n\n",
|
||||
" [Service]\n",
|
||||
" EnvironmentFile=/etc/network-environment\n",
|
||||
" User=etcd\n",
|
||||
" PermissionsStartOnly=true\n",
|
||||
" ExecStart=/usr/bin/etcd \\\n",
|
||||
" --name $public_ipv4 \\\n",
|
||||
" --addr $public_ipv4:4001 \\\n",
|
||||
" --bind-addr 0.0.0.0 \\\n",
|
||||
" --cluster-active-size 1 \\\n",
|
||||
" --data-dir /var/lib/etcd \\\n",
|
||||
" --http-read-timeout 86400 \\\n",
|
||||
" --peer-addr $public_ipv4:7001 \\\n",
|
||||
" --snapshot true\n",
|
||||
" Restart=always\n",
|
||||
" RestartSec=10s\n",
|
||||
" - name: fleet.socket\n",
|
||||
" command: start\n",
|
||||
" content: |\n",
|
||||
" [Socket]\n",
|
||||
" ListenStream=/var/run/fleet.sock\n",
|
||||
" - name: fleet.service\n",
|
||||
" command: start\n",
|
||||
“ content: |\n",
|
||||
“ [Unit]\n",
|
||||
“ Description=fleet daemon\n",
|
||||
“ Wants=etcd.service\n",
|
||||
“ After=etcd.service\n",
|
||||
“ Wants=fleet.socket\n",
|
||||
“ After=fleet.socket\n\n”,
|
||||
“ [Service]\n”,
|
||||
“ Environment=\”FLEET_ETCD_SERVERS=http://127.0.0.1:4001\”\n”,
|
||||
“ Environment=\”FLEET_METADATA=role=master\”\n”,
|
||||
“ ExecStart=/usr/bin/fleetd\n”,
|
||||
“ Restart=always\n”,
|
||||
“ RestartSec=10s\n”,
|
||||
“ - name: etcd-waiter.service\n”,
|
||||
“ command: start\n”,
|
||||
“ content: |\n”,
|
||||
“ [Unit]\n”,
|
||||
“ Description=etcd waiter\n”,
|
||||
“ Wants=network-online.target\n”,
|
||||
“ Wants=etcd.service\n”,
|
||||
“ After=etcd.service\n”,
|
||||
“ After=network-online.target\n”,
|
||||
“ Before=flannel.service\n”,
|
||||
“ Before=setup-network-environment.service\n\n”,
|
||||
“ [Service]\n”,
|
||||
“ ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n”,
|
||||
“ ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n”,
|
||||
“ RemainAfterExit=true\n”,
|
||||
“ Type=oneshot\n”,
|
||||
" content: |\n",
|
||||
" [Unit]\n",
|
||||
" Description=fleet daemon\n",
|
||||
" Wants=etcd.service\n",
|
||||
" After=etcd.service\n",
|
||||
" Wants=fleet.socket\n",
|
||||
" After=fleet.socket\n\n",
|
||||
" [Service]\n",
|
||||
" Environment=\"FLEET_ETCD_SERVERS=http://127.0.0.1:4001\"\n",
|
||||
" Environment=\"FLEET_METADATA=role=master\"\n",
|
||||
" ExecStart=/usr/bin/fleetd\n",
|
||||
" Restart=always\n",
|
||||
" RestartSec=10s\n",
|
||||
" - name: etcd-waiter.service\n",
|
||||
" command: start\n",
|
||||
" content: |\n",
|
||||
" [Unit]\n",
|
||||
" Description=etcd waiter\n",
|
||||
" Wants=network-online.target\n",
|
||||
" Wants=etcd.service\n",
|
||||
" After=etcd.service\n",
|
||||
" After=network-online.target\n",
|
||||
" Before=flannel.service\n",
|
||||
" Before=setup-network-environment.service\n\n",
|
||||
" [Service]\n",
|
||||
" ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n",
|
||||
" ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n",
|
||||
" RemainAfterExit=true\n",
|
||||
" Type=oneshot\n",
|
||||
" - name: flannel.service\n",
|
||||
" command: start\n",
|
||||
" content: |\n",
|
||||
@ -231,7 +231,7 @@
|
||||
" --port=8080 \\\n",
|
||||
" --portal_net 10.244.0.0/16 \\\n",
|
||||
" --etcd_servers=http://127.0.0.1:4001 \\\n",
|
||||
“ --public_address_override=$private_ipv4 \\\n",
|
||||
" --public_address_override=$private_ipv4 \\\n",
|
||||
" --logtostderr=true\n",
|
||||
" Restart=always\n",
|
||||
" RestartSec=10\n",
|
||||
|
Loading…
Reference in New Issue
Block a user