Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #734 from colhom/v1.4.3
Browse files Browse the repository at this point in the history
[all] bump Kubernetes version to v1.4.3
  • Loading branch information
brianredbeard authored Oct 19, 2016
2 parents c25ac21 + d4dd56e commit fd74bd4
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Documentation/configure-kubectl.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/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.4.1/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/bin/darwin/amd64/kubectl
```

After downloading the binary, ensure it is executable and move it into your `PATH`:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/deploy-addons.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1/cluster/addons/dns
[k8s-dns-addon]: https://github.com/kubernetes/kubernetes/tree/v1.4.3/cluster/addons/dns
This single YAML file is actually creating 2 different Kubernetes objects, separated by `---`.

Expand Down
10 changes: 5 additions & 5 deletions Documentation/deploy-master.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,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.4.1_coreos.0`.
* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.4.3_coreos.0`.
* Replace `${NETWORK_PLUGIN}` with `cni` if using Calico. Otherwise just leave it blank.
* Decide if you will use [additional features][rkt-opts-examples] such as:
- [mounting ephemeral disks][mount-disks]
Expand Down Expand Up @@ -158,7 +158,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
command:
- /hyperkube
- apiserver
Expand Down Expand Up @@ -217,7 +217,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
command:
- /hyperkube
- proxy
Expand Down Expand Up @@ -257,7 +257,7 @@ spec:
hostNetwork: true
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
command:
- /hyperkube
- controller-manager
Expand Down Expand Up @@ -306,7 +306,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
command:
- /hyperkube
- scheduler
Expand Down
4 changes: 2 additions & 2 deletions Documentation/deploy-workers.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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.4.1_coreos.0`.
* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.4.3_coreos.0`.
* Replace `${NETWORK_PLUGIN}` with `cni` if using Calico. Otherwise just leave it blank.
* Decide if you will use [additional features][rkt-opts-examples] such as:
- [mounting ephemeral disks][mount-disks]
Expand Down Expand Up @@ -170,7 +170,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
command:
- /hyperkube
- proxy
Expand Down
10 changes: 5 additions & 5 deletions Documentation/kubelet-wrapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ An example systemd kubelet.service file which takes advantage of the kubelet-wra

```ini
[Service]
Environment=KUBELET_VERSION=v1.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api-servers=http://127.0.0.1:8080 \
--config=/etc/kubernetes/manifests
Expand All @@ -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.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api-servers=http://127.0.0.1:8080 \
--config=/etc/kubernetes/manifests
Expand All @@ -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.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api-servers=http://127.0.0.1:8080 \
--config=/etc/kubernetes/manifests
Expand All @@ -69,7 +69,7 @@ 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 \
--mount volume=lib-modules,target=/lib/modules \
Environment=KUBELET_VERSION=v1.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
...
```
Expand All @@ -88,7 +88,7 @@ For example:
```ini
[Service]
Environment=KUBELET_VERSION=v1.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
ExecStart=/opt/bin/kubelet-wrapper \
--api-servers=http://127.0.0.1:8080 \
--config=/etc/kubernetes/manifests
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kubernetes-on-vagrant-single.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/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.4.1/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/bin/darwin/amd64/kubectl
```

After downloading the binary, ensure it is executable and move it into your PATH:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kubernetes-on-vagrant.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/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.4.1/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.4.3/bin/darwin/amd64/kubectl
```

After downloading the binary, ensure it is executable and move it into your PATH:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/kubernetes-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For example, modifying the `KUBELET_VERSION` environment variable in the followi
**/etc/systemd/system/kubelet.service**

```
Environment=KUBELET_VERSION=v1.4.1_coreos.0
Environment=KUBELET_VERSION=v1.4.3_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api-servers=https://master [...]
```
Expand Down
4 changes: 2 additions & 2 deletions contrib/bump-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
echo "USAGE: $0 <target-version>"
echo " example: $0 'v1.4.1_coreos.0'"
echo " example: $0 'v1.4.3_coreos.0'"
exit 1
fi

CURRENT_VERSION=${CURRENT_VERSION:-"v1.4.1_coreos.0"}
CURRENT_VERSION=${CURRENT_VERSION:-"v1.4.3_coreos.0"}
TARGET_VERSION=${1}

CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
Expand Down
2 changes: 1 addition & 1 deletion contrib/conformance-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1+coreos.0}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.3+coreos.0}
SSH_OPTS=${SSH_OPTS:-}

usage() {
Expand Down
2 changes: 1 addition & 1 deletion multi-node/aws/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func newDefaultCluster() *Cluster {
PodCIDR: "10.2.0.0/16",
ServiceCIDR: "10.3.0.0/24",
DNSServiceIP: "10.3.0.10",
K8sVer: "v1.4.1_coreos.0",
K8sVer: "v1.4.3_coreos.0",
HyperkubeImageRepo: "quay.io/coreos/hyperkube",
TLSCADurationDays: 365 * 10,
TLSCertDurationDays: 365,
Expand Down
2 changes: 1 addition & 1 deletion multi-node/aws/pkg/config/templates/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ kmsKeyArn: "{{.KMSKeyARN}}"
#tlsCertDurationDays: 365

# Version of hyperkube image to use. This is the tag for the hyperkube image repository.
# kubernetesVersion: v1.4.1_coreos.0
# kubernetesVersion: v1.4.3_coreos.0

# Hyperkube image repository to use.
# hyperkubeImageRepo: quay.io/coreos/hyperkube
Expand Down
2 changes: 1 addition & 1 deletion multi-node/generic/controller-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
export ETCD_ENDPOINTS=

# Specify the version (vX.Y.Z) of Kubernetes assets to deploy
export K8S_VER=v1.4.1_coreos.0
export K8S_VER=v1.4.3_coreos.0

# Hyperkube image repository to use.
export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube
Expand Down
2 changes: 1 addition & 1 deletion multi-node/generic/worker-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1_coreos.0
export K8S_VER=v1.4.3_coreos.0

# Hyperkube image repository to use.
export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube
Expand Down
2 changes: 1 addition & 1 deletion single-node/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1_coreos.0
export K8S_VER=v1.4.3_coreos.0

# Hyperkube image repository to use.
export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube
Expand Down

0 comments on commit fd74bd4

Please sign in to comment.