Merge pull request #584 from colhom/v1.3.2

all: update hyperkube version to v1.3.2_coreos.0
coreos · Jul 22, 2016 · 1611e91 · 1611e91
2 parents a66401a + 0885e8e
commit 1611e91
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/Documentation/deploy-master.md b/Documentation/deploy-master.md
@@ -150,7 +150,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-apiserver
-    image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
+    image: quay.io/coreos/hyperkube:v1.3.2_coreos.0
     command:
     - /hyperkube
     - apiserver
@@ -209,7 +209,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
+    image: quay.io/coreos/hyperkube:v1.3.2_coreos.0
     command:
     - /hyperkube
     - proxy
@@ -249,7 +249,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-controller-manager
-    image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
+    image: quay.io/coreos/hyperkube:v1.3.2_coreos.0
     command:
     - /hyperkube
     - controller-manager
@@ -298,7 +298,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-scheduler
-    image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
+    image: quay.io/coreos/hyperkube:v1.3.2_coreos.0
     command:
     - /hyperkube
     - scheduler

diff --git a/Documentation/deploy-workers.md b/Documentation/deploy-workers.md
@@ -159,7 +159,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: quay.io/coreos/hyperkube:v1.3.0_coreos.1
+    image: quay.io/coreos/hyperkube:v1.3.2_coreos.0
     command:
     - /hyperkube
     - proxy

diff --git a/Documentation/kubelet-wrapper.md b/Documentation/kubelet-wrapper.md
@@ -19,7 +19,7 @@ An example systemd kubelet.service file which takes advantage of the kubelet-wra
 
 ```ini
 [Service]
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
   --config=/etc/kubernetes/manifests
@@ -38,7 +38,7 @@ Mount the host's `/etc/resolv.conf` file directly into the container in order to
 ```ini
 [Service]
 Environment="RKT_OPTS=--volume=resolv,kind=host,source=/etc/resolv.conf --mount volume=resolv,target=/etc/resolv.conf"
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
   --config=/etc/kubernetes/manifests
@@ -52,7 +52,7 @@ Pods running in your cluster can reference remote storage volumes located on an
 ```ini
 [Service]
 Environment="RKT_OPTS=--volume iscsiadm,kind=host,source=/usr/sbin/iscsiadm --mount volume=iscsiadm,target=/usr/sbin/iscsiadm"
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
   --config=/etc/kubernetes/manifests
@@ -66,7 +66,7 @@ Export the logs collected by the kubelet via a volume mount, so that [other logg
 ```ini
 [Service]
 Environment="RKT_OPTS=--volume var-log,kind=host,source=/var/log --mount volume=var-log,target=/var/log"
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStartPre=/usr/bin/mkdir -p /var/log/containers
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
@@ -87,7 +87,7 @@ For example:
 
 ```ini
 [Service]
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStart=/opt/bin/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
   --config=/etc/kubernetes/manifests

diff --git a/Documentation/kubernetes-upgrade.md b/Documentation/kubernetes-upgrade.md
@@ -15,7 +15,7 @@ For example, modifying the `KUBELET_VERSION` environment variable in the followi
 **/etc/systemd/system/kubelet.service**
 
 ```
-Environment=KUBELET_VERSION=v1.3.0_coreos.1
+Environment=KUBELET_VERSION=v1.3.2_coreos.0
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=https://master [...]
 ```

diff --git a/contrib/bump-version.sh b/contrib/bump-version.sh
@@ -6,11 +6,11 @@
 
 if [ $# -ne 1 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.3.0_coreos.1'"
+    echo "  example: $0 'v1.3.2_coreos.0'"
     exit 1
 fi
 
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.3.0_coreos.1"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.3.2_coreos.0"}
 TARGET_VERSION=${1}
 
 GIT_ROOT=$(git rev-parse --show-toplevel)

diff --git a/multi-node/aws/pkg/config/config.go b/multi-node/aws/pkg/config/config.go
@@ -36,7 +36,7 @@ func newDefaultCluster() *Cluster {
 		PodCIDR:                  "10.2.0.0/16",
 		ServiceCIDR:              "10.3.0.0/24",
 		DNSServiceIP:             "10.3.0.10",
-		K8sVer:                   "v1.3.0_coreos.1",
+		K8sVer:                   "v1.3.2_coreos.0",
 		HyperkubeImageRepo:       "quay.io/coreos/hyperkube",
 		ControllerInstanceType:   "m3.medium",
 		ControllerRootVolumeSize: 30,

diff --git a/multi-node/aws/pkg/config/templates/cluster.yaml b/multi-node/aws/pkg/config/templates/cluster.yaml
@@ -92,7 +92,7 @@ kmsKeyArn: "{{.KMSKeyARN}}"
 # dnsServiceIP: 10.3.0.10
 
 # Version of hyperkube image to use. This is the tag for the hyperkube image repository.
-# kubernetesVersion: v1.3.0_coreos.1
+# kubernetesVersion: v1.3.2_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImageRepo: quay.io/coreos/hyperkube

diff --git a/multi-node/generic/controller-install.sh b/multi-node/generic/controller-install.sh
@@ -5,7 +5,7 @@ set -e
 export ETCD_ENDPOINTS=
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.3.0_coreos.1
+export K8S_VER=v1.3.2_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube

diff --git a/multi-node/generic/worker-install.sh b/multi-node/generic/worker-install.sh
@@ -10,7 +10,7 @@ export ETCD_ENDPOINTS=
 export CONTROLLER_ENDPOINT=
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.3.0_coreos.1
+export K8S_VER=v1.3.2_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube

diff --git a/single-node/user-data b/single-node/user-data
@@ -5,7 +5,7 @@ set -e
 export ETCD_ENDPOINTS="http://127.0.0.1:2379"
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.3.0_coreos.1
+export K8S_VER=v1.3.2_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube