From 508c248599522261350c4860dfeba31dc77d5f21 Mon Sep 17 00:00:00 2001 From: Kelsey Hightower Date: Tue, 25 Nov 2014 16:34:43 -0800 Subject: [PATCH] update links to upstream release --- docs/getting-started-guides/aws-coreos.md | 1 - .../aws/cloud-configs/master.yaml | 6 +++--- .../aws/cloud-configs/node.yaml | 19 +++++++++++++++++- .../aws/cloudformation-template.json | 20 +++++++++---------- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/docs/getting-started-guides/aws-coreos.md b/docs/getting-started-guides/aws-coreos.md index b54d4c393ea..4931993037b 100644 --- a/docs/getting-started-guides/aws-coreos.md +++ b/docs/getting-started-guides/aws-coreos.md @@ -1,6 +1,5 @@ __Note (11/21/2014): This mostly works, but doesn't currently register minions correctly.__ -See [non-cloud formation instructions](aws.md) for a working install, we're in the process of fixing the cloud formation version. Sorry! # Getting started on Amazon EC2 diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index c526b072d09..aa3bfe31635 100644 --- a/docs/getting-started-guides/aws/cloud-configs/master.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/master.yaml @@ -44,7 +44,7 @@ coreos: After=etcd.service [Service] - ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/kube-apiserver + ExecStartPre=/usr/bin/wget -N -P https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-apiserver ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver ExecStart=/opt/bin/kube-apiserver \ --address=0.0.0.0 \ @@ -63,7 +63,7 @@ coreos: After=kube-apiserver.service [Service] - ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/kube-controller-manager + ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-controller-manager ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager ExecStart=/opt/bin/kube-controller-manager \ --master=127.0.0.1:8080 \ @@ -80,7 +80,7 @@ coreos: After=kube-apiserver.service [Service] - ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/kube-scheduler + ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-scheduler ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080 Restart=always diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml index a2b1e64b524..02c2fb7d305 100644 --- a/docs/getting-started-guides/aws/cloud-configs/node.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/node.yaml @@ -55,6 +55,23 @@ coreos: ExecStart=/opt/bin/setup-network-environment RemainAfterExit=yes Type=oneshot + - name: kube-proxy.service + command: start + content: | + [Unit] + Description=Kubernetes Proxy + Documentation=https://github.com/GoogleCloudPlatform/kubernetes + Requires=setup-network-environment.service + After=setup-network-environment.service + + [Service] + ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-proxy + ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy + ExecStart=/opt/bin/kube-proxy \ + --etcd_servers=http://:4001 \ + --logtostderr=true + Restart=always + RestartSec=10 - name: kube-kubelet.service command: start content: | @@ -66,7 +83,7 @@ coreos: [Service] EnvironmentFile=/etc/network-environment - ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/kubelet + ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kubelet ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet ExecStart=/opt/bin/kubelet \ --address=0.0.0.0 \ diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json index 8cdb8e77f69..222eb3279ab 100644 --- a/docs/getting-started-guides/aws/cloudformation-template.json +++ b/docs/getting-started-guides/aws/cloudformation-template.json @@ -142,7 +142,7 @@ " [Service]\n", " Type=notify\n", " ExecStartPre=-/usr/bin/mkdir -p /opt/bin\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/flanneld\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld\n", " ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{\"Network\":\"10.0.0.0/16\"}'\n", " ExecStart=/opt/bin/flanneld\n", @@ -155,7 +155,7 @@ " Requires=etcd.service\n", " After=etcd.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kube-apiserver\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-apiserver\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver\n", " ExecStart=/opt/bin/kube-apiserver \\\n", " --address=0.0.0.0 \\\n", @@ -174,7 +174,7 @@ " Requires=kube-apiserver.service\n", " After=kube-apiserver.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kube-controller-manager\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-controller-manager\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager\n", " ExecStart=/opt/bin/kube-controller-manager \\\n", " --master=127.0.0.1:8080 \\\n", @@ -190,7 +190,7 @@ " Requires=kube-apiserver.service\n", " After=kube-apiserver.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kube-scheduler\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-scheduler\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler\n", " ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080\n", " Restart=always\n", @@ -204,7 +204,7 @@ " Requires=etcd.service\n", " After=etcd.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kube-proxy\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-proxy\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy\n", " ExecStart=/opt/bin/kube-proxy \\\n", " --etcd_servers=http://127.0.0.1:4001 \\\n", @@ -220,7 +220,7 @@ " Requires=kube-apiserver.service\n", " After=kube-apiserver.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/kube-register\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/kube-register\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register\n", " ExecStart=/opt/bin/kube-register \\\n", " --metadata=role=knode \\\n", @@ -263,7 +263,7 @@ " [Service]\n", " Type=notify\n", " ExecStartPre=-/usr/bin/mkdir -p /opt/bin\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/flanneld\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld\n", " ExecStart=/opt/bin/flanneld -etcd-endpoints http://", {"Fn::GetAtt" :["KubernetesMasterInstance" , "PrivateIp"]}, ":4001\n", " - name: docker.service\n", @@ -290,7 +290,7 @@ " After=network-online.target\n\n", " [Service]\n", " ExecStartPre=-/usr/bin/mkdir -p /opt/bin\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/setup-network-environment\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", @@ -305,7 +305,7 @@ " After=setup-network-environment.service\n\n", " [Service]\n", " EnvironmentFile=/etc/network-environment\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kubelet\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kubelet\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet\n", " ExecStart=/opt/bin/kubelet \\\n", " --address=0.0.0.0 \\\n", @@ -324,7 +324,7 @@ " Requires=setup-network-environment.service\n", " After=setup-network-environment.service\n\n", " [Service]\n", - " ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v0.5.2/bin/linux/amd64/kube-proxy\n", + " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.5.4/bin/linux/amd64/kube-proxy\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy\n", " ExecStart=/opt/bin/kube-proxy \\\n", " --etcd_servers=http://", {"Fn::GetAtt" :["KubernetesMasterInstance" , "PrivateIp"]}, ":4001\\\n",