From f814d4a5715bc5f80ba6684b2821f44c3ad88f38 Mon Sep 17 00:00:00 2001 From: Aaron Levy Date: Fri, 13 Jan 2017 11:49:46 -0800 Subject: [PATCH] Kubernetes v1.5.2 --- Documentation/configure-kubectl.md | 4 ++-- Documentation/deploy-addons.md | 2 +- Documentation/deploy-master.md | 12 ++++++------ Documentation/deploy-workers.md | 4 ++-- Documentation/kubelet-wrapper.md | 10 +++++----- Documentation/kubernetes-on-vagrant-single.md | 4 ++-- Documentation/kubernetes-on-vagrant.md | 4 ++-- Documentation/kubernetes-upgrade.md | 2 +- contrib/bump-version.sh | 4 ++-- contrib/conformance-test.sh | 2 +- lib/init-ssl-ca | 4 ++-- multi-node/generic/controller-install.sh | 2 +- multi-node/generic/worker-install.sh | 2 +- single-node/user-data | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Documentation/configure-kubectl.md b/Documentation/configure-kubectl.md index b3efa997a8..2aab758121 100644 --- a/Documentation/configure-kubectl.md +++ b/Documentation/configure-kubectl.md @@ -15,13 +15,13 @@ Download `kubectl` from the Kubernetes release artifact site with the `curl` too The linux `kubectl` binary can be fetched with a command like: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/linux/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/linux/amd64/kubectl ``` On an OS X workstation, replace `linux` in the URL above with `darwin`: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/darwin/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/darwin/amd64/kubectl ``` After downloading the binary, ensure it is executable and move it into your `PATH`: diff --git a/Documentation/deploy-addons.md b/Documentation/deploy-addons.md index 21221734e3..96a1fbfaf5 100644 --- a/Documentation/deploy-addons.md +++ b/Documentation/deploy-addons.md @@ -142,7 +142,7 @@ spec: *Note:* The above YAML definition is based on the upstream DNS addon in the [Kubernetes addon folder][k8s-dns-addon]. -[k8s-dns-addon]: https://github.com/kubernetes/kubernetes/tree/v1.5.1/cluster/addons/dns +[k8s-dns-addon]: https://github.com/kubernetes/kubernetes/tree/v1.5.2/cluster/addons/dns This single YAML file is actually creating 2 different Kubernetes objects, separated by `---`. diff --git a/Documentation/deploy-master.md b/Documentation/deploy-master.md index 37a1f5947f..d6aacc9af0 100644 --- a/Documentation/deploy-master.md +++ b/Documentation/deploy-master.md @@ -123,7 +123,7 @@ Note that the kubelet running on a master node may log repeated attempts to post * Replace `${ADVERTISE_IP}` with this node's publicly routable IP. * Replace `${DNS_SERVICE_IP}` -* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.1_coreos.0`. +* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.2_coreos.0`. * If using Calico for network policy - Replace `${NETWORK_PLUGIN}` with `cni` - Add the following to `RKT_OPS=` @@ -194,7 +194,7 @@ spec: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 command: - /hyperkube - apiserver @@ -261,7 +261,7 @@ spec: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 command: - /hyperkube - proxy @@ -300,7 +300,7 @@ spec: hostNetwork: true containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 command: - /hyperkube - controller-manager @@ -353,7 +353,7 @@ spec: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 command: - /hyperkube - scheduler @@ -641,7 +641,7 @@ A successful response should look something like: { "major": "1", "minor": "4", - "gitVersion": "v1.5.1+coreos.0", + "gitVersion": "v1.5.2+coreos.0", "gitCommit": "ec2b52fabadf824a42b66b6729fe4cff2c62af8c", "gitTreeState": "clean", "buildDate": "2016-11-14T19:42:00Z", diff --git a/Documentation/deploy-workers.md b/Documentation/deploy-workers.md index 3d485f9e2b..8fa2ba41bc 100644 --- a/Documentation/deploy-workers.md +++ b/Documentation/deploy-workers.md @@ -105,7 +105,7 @@ Create `/etc/systemd/system/kubelet.service` and substitute the following variab * Replace `${MASTER_HOST}` * Replace `${ADVERTISE_IP}` with this node's publicly routable IP. * Replace `${DNS_SERVICE_IP}` -* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.1_coreos.0`. +* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.2_coreos.0`. * If using Calico for network policy - Replace `${NETWORK_PLUGIN}` with `cni` - Add the following to `RKT_OPS=` @@ -173,7 +173,7 @@ spec: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 command: - /hyperkube - proxy diff --git a/Documentation/kubelet-wrapper.md b/Documentation/kubelet-wrapper.md index 667937c0dc..d8976ab35a 100644 --- 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.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.2_coreos.0 Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid" ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ @@ -40,7 +40,7 @@ Mount the host's `/etc/resolv.conf` file directly into the container in order to ```ini [Service] -Environment=KUBELET_VERSION=v1.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.2_coreos.0 Environment="RKT_OPTS=--volume=resolv,kind=host,source=/etc/resolv.conf \ --mount volume=resolv,target=/etc/resolv.conf \ --uuid-file-save=/var/run/kubelet-pod.uuid" @@ -58,7 +58,7 @@ Pods running in your cluster can reference remote storage volumes located on an ```ini [Service] -Environment=KUBELET_VERSION=v1.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.2_coreos.0 Environment="RKT_OPTS=--volume iscsiadm,kind=host,source=/usr/sbin/iscsiadm \ --mount volume=iscsiadm,target=/usr/sbin/iscsiadm \ --uuid-file-save=/var/run/kubelet-pod.uuid" @@ -76,7 +76,7 @@ Pods using the [rbd volume plugin][rbd-example] to consume data from ceph must e ```ini [Service] -Environment=KUBELET_VERSION=v1.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.2_coreos.0 Environment="RKT_OPTS=--volume modprobe,kind=host,source=/usr/sbin/modprobe \ --mount volume=modprobe,target=/usr/sbin/modprobe \ --volume lib-modules,kind=host,source=/lib/modules \ @@ -100,7 +100,7 @@ For example: ```ini [Service] -Environment=KUBELET_VERSION=v1.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.2_coreos.0 ... ExecStart=/opt/bin/kubelet-wrapper \ --api-servers=http://127.0.0.1:8080 \ diff --git a/Documentation/kubernetes-on-vagrant-single.md b/Documentation/kubernetes-on-vagrant-single.md index bb414a098d..39977edb80 100644 --- a/Documentation/kubernetes-on-vagrant-single.md +++ b/Documentation/kubernetes-on-vagrant-single.md @@ -19,13 +19,13 @@ Navigate to the [Vagrant downloads page][vagrant-downloads] and grab the appropr The linux `kubectl` binary can be fetched with a command like: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/linux/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/linux/amd64/kubectl ``` On an OS X workstation, replace `linux` in the URL above with `darwin`: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/darwin/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/darwin/amd64/kubectl ``` After downloading the binary, ensure it is executable and move it into your PATH: diff --git a/Documentation/kubernetes-on-vagrant.md b/Documentation/kubernetes-on-vagrant.md index 9105d8cc32..0f075f2f5a 100644 --- a/Documentation/kubernetes-on-vagrant.md +++ b/Documentation/kubernetes-on-vagrant.md @@ -18,13 +18,13 @@ Navigate to the [Vagrant downloads page][vagrant-downloads] and grab the appropr The linux `kubectl` binary can be fetched with a command like: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/linux/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/linux/amd64/kubectl ``` On an OS X workstation, replace `linux` in the URL above with `darwin`: ```sh -$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/darwin/amd64/kubectl +$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.2/bin/darwin/amd64/kubectl ``` After downloading the binary, ensure it is executable and move it into your PATH: diff --git a/Documentation/kubernetes-upgrade.md b/Documentation/kubernetes-upgrade.md index 411fbf62f9..f10e447e10 100644 --- 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.5.1_coreos.0 +Environment=KUBELET_VERSION=v1.5.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 index fa95d7f334..fa0421af9e 100755 --- a/contrib/bump-version.sh +++ b/contrib/bump-version.sh @@ -6,11 +6,11 @@ if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then echo "USAGE: $0 " - echo " example: $0 'v1.5.1_coreos.0'" + echo " example: $0 'v1.5.2_coreos.0'" exit 1 fi -CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.1_coreos.0"} +CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.2_coreos.0"} TARGET_VERSION=${1} CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*} diff --git a/contrib/conformance-test.sh b/contrib/conformance-test.sh index 6311c2bd66..0e5220e309 100755 --- a/contrib/conformance-test.sh +++ b/contrib/conformance-test.sh @@ -3,7 +3,7 @@ set -euo pipefail CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true} CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes} -CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.1+coreos.0} +CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.2+coreos.0} SSH_OPTS=${SSH_OPTS:-} usage() { diff --git a/lib/init-ssl-ca b/lib/init-ssl-ca index 84d4d08efb..57e43ac413 100755 --- a/lib/init-ssl-ca +++ b/lib/init-ssl-ca @@ -29,7 +29,7 @@ if [ -f "$OUTFILE" ];then fi # establish cluster CA and self-sign a cert -$OPENSSL genrsa -out "$OUTDIR/ca-key.pem" 2048 -$OPENSSL req -x509 -new -nodes -key "$OUTDIR/ca-key.pem" -days 10000 -out "$OUTFILE" -subj "/CN=kube-ca" +openssl genrsa -out "$OUTDIR/ca-key.pem" 2048 +openssl req -x509 -new -nodes -key "$OUTDIR/ca-key.pem" -days 10000 -out "$OUTFILE" -subj "/CN=kube-ca" diff --git a/multi-node/generic/controller-install.sh b/multi-node/generic/controller-install.sh index 927524a4b9..db6933b1d7 100644 --- 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.5.1_coreos.0 +export K8S_VER=v1.5.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 index 850f09be5b..3e45716a0d 100644 --- 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.5.1_coreos.0 +export K8S_VER=v1.5.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 index fcafd7554e..5552240622 100644 --- 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.5.1_coreos.0 +export K8S_VER=v1.5.2_coreos.0 # Hyperkube image repository to use. export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube