diff --git a/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml b/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml index 00a20f3b4ae..ee31c5107c8 100644 --- a/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml +++ b/docs/getting-started-guides/coreos/azure/addons/skydns-rc.yaml @@ -1,22 +1,22 @@ apiVersion: v1 kind: ReplicationController metadata: - name: kube-dns-v8 + name: kube-dns-v9 namespace: kube-system labels: k8s-app: kube-dns - version: v8 + version: v9 kubernetes.io/cluster-service: "true" spec: replicas: 3 selector: k8s-app: kube-dns - version: v8 + version: v9 template: metadata: labels: k8s-app: kube-dns - version: v8 + version: v9 kubernetes.io/cluster-service: "true" spec: containers: @@ -74,6 +74,13 @@ spec: scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 + readinessProbe: + httpGet: + path: /healthz + port: 8080 + scheme: HTTP + initialDelaySeconds: 1 + timeoutSeconds: 5 - name: healthz image: gcr.io/google_containers/exechealthz:1.0 resources: diff --git a/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml b/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml index a0e979c2664..c15822d6bce 100644 --- a/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml +++ b/docs/getting-started-guides/coreos/azure/addons/skydns-svc.yaml @@ -10,7 +10,7 @@ metadata: spec: selector: k8s-app: kube-dns - clusterIP: 10.1.0.3 + clusterIP: 10.16.0.3 ports: - name: dns port: 53 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 340c804139f..71ab36390f9 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 @@ -25,13 +25,6 @@ coreos: ExecStart=/bin/sh -x -c \ 'until curl --silent --fail https://status.github.com/api/status.json | grep -q \"good\"; do sleep 2; done' - - name: docker.service - drop-ins: - - name: 50-weave-kubernetes.conf - content: | - [Service] - Environment=DOCKER_OPTS='--bridge="weave" -r="false"' - - name: weave-network.target enable: true content: | @@ -92,46 +85,46 @@ coreos: content: | [Unit] After=network-online.target + After=docker.service Before=weave.service - Before=weave-helper.service - Before=docker.service Description=Install Weave Documentation=http://docs.weave.works/ Requires=network-online.target [Service] + EnvironmentFile=-/etc/weave.%H.env + EnvironmentFile=-/etc/weave.env Type=oneshot RemainAfterExit=yes + TimeoutStartSec=0 ExecStartPre=/bin/mkdir -p /opt/bin/ ExecStartPre=/opt/bin/curl-retry.sh \ --silent \ --location \ - https://github.com/weaveworks/weave/releases/download/latest_release/weave \ + git.io/weave \ --output /opt/bin/weave - ExecStartPre=/opt/bin/curl-retry.sh \ - --silent \ - --location \ - https://raw.github.com/errordeveloper/weave-demos/master/poseidon/weave-helper \ - --output /opt/bin/weave-helper ExecStartPre=/usr/bin/chmod +x /opt/bin/weave - ExecStartPre=/usr/bin/chmod +x /opt/bin/weave-helper - ExecStart=/bin/echo Weave Installed + ExecStart=/opt/bin/weave setup [Install] WantedBy=weave-network.target WantedBy=weave.service - - name: weave-helper.service + - name: weaveproxy.service enable: true content: | [Unit] After=install-weave.service After=docker.service - Description=Weave Network Router + Description=Weave proxy for Docker API Documentation=http://docs.weave.works/ Requires=docker.service Requires=install-weave.service [Service] - ExecStart=/opt/bin/weave-helper - Restart=always + EnvironmentFile=-/etc/weave.%H.env + EnvironmentFile=-/etc/weave.env + ExecStartPre=/opt/bin/weave launch-proxy --rewrite-inspect --without-dns + ExecStart=/usr/bin/docker attach weaveproxy + Restart=on-failure + ExecStop=/opt/bin/weave stop-proxy [Install] WantedBy=weave-network.target @@ -147,35 +140,35 @@ coreos: Requires=install-weave.service [Service] TimeoutStartSec=0 - EnvironmentFile=/etc/weave.%H.env - ExecStartPre=/opt/bin/weave setup - ExecStartPre=/opt/bin/weave launch $WEAVE_PEERS + EnvironmentFile=-/etc/weave.%H.env + EnvironmentFile=-/etc/weave.env + ExecStartPre=/opt/bin/weave launch-router $WEAVE_PEERS ExecStart=/usr/bin/docker attach weave Restart=on-failure - Restart=always - ExecStop=/opt/bin/weave stop + ExecStop=/opt/bin/weave stop-router [Install] WantedBy=weave-network.target - - name: weave-create-bridge.service + - name: weave-expose.service enable: true content: | [Unit] - After=network.target After=install-weave.service - Before=weave.service - Before=docker.service - Requires=network.target + After=weave.service + After=docker.service + Documentation=http://docs.weave.works/ + Requires=docker.service Requires=install-weave.service + Requires=weave.service [Service] Type=oneshot - EnvironmentFile=/etc/weave.%H.env - ExecStart=/opt/bin/weave --local create-bridge - ExecStart=/usr/bin/ip addr add dev weave $BRIDGE_ADDRESS_CIDR - ExecStart=/usr/bin/ip route add $BREAKOUT_ROUTE dev weave scope link - ExecStart=/usr/bin/ip route add 224.0.0.0/4 dev weave + RemainAfterExit=yes + TimeoutStartSec=0 + EnvironmentFile=-/etc/weave.%H.env + EnvironmentFile=-/etc/weave.env + ExecStart=/opt/bin/weave expose + ExecStop=/opt/bin/weave hide [Install] - WantedBy=multi-user.target WantedBy=weave-network.target - name: install-kubernetes.service @@ -191,7 +184,7 @@ coreos: Documentation=http://kubernetes.io/ Requires=network-online.target [Service] - Environment=KUBE_RELEASE_TARBALL=https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v1.0.1/kubernetes.tar.gz + Environment=KUBE_RELEASE_TARBALL=https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v1.0.6/kubernetes.tar.gz ExecStartPre=/bin/mkdir -p /opt/ ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/ @@ -222,11 +215,13 @@ coreos: ConditionHost=kube-00 [Service] ExecStart=/opt/kubernetes/server/bin/kube-apiserver \ - --address=0.0.0.0 \ + --insecure-bind-address=0.0.0.0 \ + --advertise-address=$public_ipv4 \ --port=8080 \ $ETCD_SERVERS \ - --service-cluster-ip-range=10.1.0.0/16 \ - --logtostderr=true --v=3 + --service-cluster-ip-range=10.16.0.0/12 \ + --cloud-provider=vagrant \ + --logtostderr=true Restart=always RestartSec=10 [Install] @@ -286,12 +281,13 @@ coreos: [Service] ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests/ ExecStart=/opt/kubernetes/server/bin/kubelet \ + --docker-endpoint=unix:/var/run/weave.sock \ --address=0.0.0.0 \ --port=10250 \ --hostname-override=%H \ --api-servers=http://kube-00:8080 \ --logtostderr=true \ - --cluster-dns=10.1.0.3 \ + --cluster-dns=10.16.0.3 \ --cluster-domain=kube.local \ --config=/etc/kubernetes/manifests/ Restart=always @@ -333,7 +329,7 @@ coreos: [Service] Type=oneshot RemainAfterExit=no - ExecStart=/opt/kubernetes/server/bin/kubectl create -f /etc/kubernetes/addons/ + ExecStart=/bin/bash -c 'until /opt/kubernetes/server/bin/kubectl create -f /etc/kubernetes/addons/; do sleep 2; done' SuccessExitStatus=1 [Install] WantedBy=kubernetes-master.target 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 d45b03ac950..c0f204d62ab 100644 --- a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js +++ b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js @@ -13,9 +13,9 @@ var inspect = require('util').inspect; var util = require('./util.js'); var coreos_image_ids = { - 'stable': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-717.3.0', - 'beta': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Beta-723.3.0', // untested - 'alpha': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Alpha-745.1.0' // untested + 'stable': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-766.4.0', + 'beta': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Beta-766.4.0', // untested + 'alpha': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Alpha-815.0.0' // untested }; var conf = {}; diff --git a/docs/getting-started-guides/coreos/azure/package.json b/docs/getting-started-guides/coreos/azure/package.json index 3269b418e0c..3f7e05f7371 100644 --- a/docs/getting-started-guides/coreos/azure/package.json +++ b/docs/getting-started-guides/coreos/azure/package.json @@ -9,7 +9,7 @@ "author": "Ilya Dmitrichenko ", "license": "Apache 2.0", "dependencies": { - "azure-cli": "^0.9.5", + "azure-cli": "^0.9.9", "colors": "^1.0.3", "js-yaml": "^3.2.5", "openssl-wrapper": "^0.2.1",