Skip to content

Commit

Permalink
Switch Kubernetes version from 1.1.3 to 1.3.0
Browse files Browse the repository at this point in the history
Now that 1.3.0 is released.
  • Loading branch information
MikeSpreitzer committed Jul 7, 2016
1 parent f2e2cf7 commit a1e6b95
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions samples/kubernetes/cloud-config/master-config-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ write_files:
echo "Kubenetes not installed - installing."
# Extract the Kubernetes binaries.
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.1.3/bin/linux/amd64/kubectl
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.1.3/bin/linux/amd64/kubelet
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.3.0/bin/linux/amd64/kubectl
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.3.0/bin/linux/amd64/kubelet
sudo chmod +x /opt/bin/kubelet /opt/bin/kubectl
fi
Expand Down Expand Up @@ -58,9 +58,9 @@ write_files:
echo "Manifests not installed - installing."
# Download config.
sudo wget -N -P /etc/kubernetes/manifests/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/master/kubernetes-master.manifest
sudo wget -N -P /etc/kubernetes/manifests/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/master/calico-etcd.manifest
sudo wget -N -P /etc/kubernetes/addons/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/master/dns/skydns.yaml
sudo wget -N -P /etc/kubernetes/manifests/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.3-docs/samples/kubernetes/master/kubernetes-master.manifest
sudo wget -N -P /etc/kubernetes/manifests/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.3-docs/samples/kubernetes/master/calico-etcd.manifest
sudo wget -N -P /etc/kubernetes/addons/ https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.3-docs/samples/kubernetes/master/dns/skydns.yaml
fi
# Insert the master's IP address into the manifest.
Expand Down
4 changes: 2 additions & 2 deletions samples/kubernetes/cloud-config/node-config-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ write_files:
echo "Kubenetes not installed - installing."
# Extract the Kubernetes binaries.
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.1.3/bin/linux/amd64/kubelet
sudo wget -N -P /opt/bin http://storage.googleapis.com/kubernetes-release/release/v1.3.0/bin/linux/amd64/kubelet
sudo chmod +x /opt/bin/kubelet
# Create required folders
Expand Down Expand Up @@ -149,7 +149,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- proxy
Expand Down
8 changes: 4 additions & 4 deletions samples/kubernetes/master/kubernetes-master.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
name: "etcd-datadir"

- name: kube-apiserver
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- apiserver
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
name: "var-run-kubernetes"

- name: kube-controller-manager
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- controller-manager
Expand All @@ -99,7 +99,7 @@ spec:
readOnly: true

- name: kube-scheduler
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- scheduler
Expand All @@ -113,7 +113,7 @@ spec:
timeoutSeconds: 1

- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- proxy
Expand Down
2 changes: 1 addition & 1 deletion samples/kubernetes/node/kube-proxy.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.1.3
image: gcr.io/google_containers/hyperkube:v1.3.0
command:
- /hyperkube
- proxy
Expand Down

0 comments on commit a1e6b95

Please sign in to comment.