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 #769 from pbx0/v1.5-updates
Browse files Browse the repository at this point in the history
v1.5.1 updates
  • Loading branch information
Patrick Baxter committed Dec 15, 2016
2 parents a7fdcd6 + ffd2e78 commit 3af9754
Show file tree
Hide file tree
Showing 13 changed files with 233 additions and 91 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.6/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6/cluster/addons/dns
[k8s-dns-addon]: https://github.com/kubernetes/kubernetes/tree/v1.5.1/cluster/addons/dns
This single YAML file is actually creating 2 different Kubernetes objects, separated by `---`.

Expand Down
13 changes: 7 additions & 6 deletions Documentation/deploy-master.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.6_coreos.0`.
* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.1_coreos.0`.
* If using Calico for network policy
- Replace `${NETWORK_PLUGIN}` with `cni`
- Add the following to `RKT_OPS=`
Expand Down Expand Up @@ -194,7 +194,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
command:
- /hyperkube
- apiserver
Expand All @@ -210,6 +210,7 @@ spec:
- --client-ca-file=/etc/kubernetes/ssl/ca.pem
- --service-account-key-file=/etc/kubernetes/ssl/apiserver-key.pem
- --runtime-config=extensions/v1beta1/networkpolicies=true
- --anonymous-auth=false
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down Expand Up @@ -260,7 +261,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
command:
- /hyperkube
- proxy
Expand Down Expand Up @@ -299,7 +300,7 @@ spec:
hostNetwork: true
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
command:
- /hyperkube
- controller-manager
Expand Down Expand Up @@ -352,7 +353,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
command:
- /hyperkube
- scheduler
Expand Down Expand Up @@ -640,7 +641,7 @@ A successful response should look something like:
{
"major": "1",
"minor": "4",
"gitVersion": "v1.4.6+coreos.0",
"gitVersion": "v1.5.1+coreos.0",
"gitCommit": "ec2b52fabadf824a42b66b6729fe4cff2c62af8c",
"gitTreeState": "clean",
"buildDate": "2016-11-14T19:42:00Z",
Expand Down
4 changes: 2 additions & 2 deletions Documentation/deploy-workers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.6_coreos.0`.
* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.1_coreos.0`.
* If using Calico for network policy
- Replace `${NETWORK_PLUGIN}` with `cni`
- Add the following to `RKT_OPS=`
Expand Down Expand Up @@ -173,7 +173,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
image: quay.io/coreos/hyperkube:v1.5.1_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.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_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 \
Expand All @@ -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.4.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_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"
Expand All @@ -58,7 +58,7 @@ Pods running in your cluster can reference remote storage volumes located on an

```ini
[Service]
Environment=KUBELET_VERSION=v1.4.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_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"
Expand All @@ -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.4.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_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 \
Expand All @@ -100,7 +100,7 @@ For example:

```ini
[Service]
Environment=KUBELET_VERSION=v1.4.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_coreos.0
...
ExecStart=/opt/bin/kubelet-wrapper \
--api-servers=http://127.0.0.1:8080 \
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.6/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6/bin/linux/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6/bin/darwin/amd64/kubectl
$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/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.6_coreos.0
Environment=KUBELET_VERSION=v1.5.1_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.6_coreos.0'"
echo " example: $0 'v1.5.1_coreos.0'"
exit 1
fi

CURRENT_VERSION=${CURRENT_VERSION:-"v1.4.6_coreos.0"}
CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.1_coreos.0"}
TARGET_VERSION=${1}

CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
Expand Down
8 changes: 4 additions & 4 deletions 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.6+coreos.0}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.1+coreos.0}
SSH_OPTS=${SSH_OPTS:-}

usage() {
Expand Down Expand Up @@ -38,10 +38,10 @@ ssh ${SSH_OPTS} -i ${ssh_key} -p ${ssh_port} core@${ssh_host} \
ssh ${SSH_OPTS} -i ${ssh_key} -p ${ssh_port} core@${ssh_host} \
"[[ -f /home/core/kubeconfig ]] || echo '${kubeconfig}' > /home/core/kubeconfig"

# Init steps necessary to run conformance in docker://golang:1.6.3 container
# Init steps necessary to run conformance in docker://golang:1.7.4 container
INIT="apt-get update && apt-get install -y rsync && go get -u github.com/jteeuwen/go-bindata/go-bindata"

TEST_FLAGS="-v --test -check_version_skew=false -check_node_count=${CHECK_NODE_COUNT} --test_args=\"ginkgo.focus='\[Conformance\]'\""
TEST_FLAGS="-v --test -check_version_skew=false --test_args=\"ginkgo.focus='\[Conformance\]'\""

CONFORMANCE=$(echo \
"cd /go/src/k8s.io/kubernetes && " \
Expand All @@ -57,6 +57,6 @@ RKT_OPTS=$(echo \
"--mount volume=kc,target=/kubeconfig " \
"--mount volume=k8s,target=/go/src/k8s.io/kubernetes")

CMD="sudo rkt run --net=host --insecure-options=image ${RKT_OPTS} docker://golang:1.6.3 --exec /bin/bash -- -c \"${INIT} && ${CONFORMANCE}\""
CMD="sudo rkt run --net=host --insecure-options=image ${RKT_OPTS} docker://golang:1.7.4 --exec /bin/bash -- -c \"${INIT} && ${CONFORMANCE}\""

ssh ${SSH_OPTS} -i ${ssh_key} -p ${ssh_port} core@${ssh_host} "${CMD}"
Loading

0 comments on commit 3af9754

Please sign in to comment.