github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #460 from coreos/bump-k8s

Browse Source 
examples: Update static Kubernetes to v1.5.4
This commit is contained in:
Dalton Hubble
2017-03-13 15:46:15 -07:00
committed by GitHub
parent a79d94947f 07e22ca6ed
commit 1a48a51253
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@@ -8,7 +8,7 @@ Notable changes between releases.
### Examples
* Upgrade Kubernetes v1.5.2 (static) example clusters
* Upgrade Kubernetes v1.5.4 (static) example clusters
* Upgrade Kubernetes v1.5.4 (self-hosted) example cluster
* Use etcd3 by default in all clusters (remove etcd2 clusters)

2
Documentation/kubernetes.md
View File

@@ -1,6 +1,6 @@
# Kubernetes
The Kubernetes example provisions a 3 node Kubernetes v1.5.2 cluster with one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs).
The Kubernetes example provisions a 3 node Kubernetes v1.5.4 cluster with one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs).
## Requirements

2
Documentation/rktnetes.md
View File

@@ -1,6 +1,6 @@
# Kubernetes (with rkt)
The `rktnetes` example provisions a 3 node Kubernetes v1.5.2 cluster with [rkt](https://github.com/coreos/rkt) as the container runtime. The cluster has one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs).
The `rktnetes` example provisions a 3 node Kubernetes v1.5.4 cluster with [rkt](https://github.com/coreos/rkt) as the container runtime. The cluster has one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs).
## Requirements

10
examples/ignition/k8s-controller.yaml
View File

@@ -64,7 +64,7 @@ systemd:
Requires=k8s-assets.target
After=k8s-assets.target
[Service]
Environment=KUBELET_VERSION=v1.5.2_coreos.0
Environment=KUBELET_VERSION=v1.5.4_coreos.0
Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume dns,kind=host,source=/etc/resolv.conf \
--mount volume=dns,target=/etc/resolv.conf \
@@ -194,7 +194,7 @@ storage:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
command:
- /hyperkube
- proxy
@@ -228,7 +228,7 @@ storage:
hostNetwork: true
containers:
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
command:
- /hyperkube
- apiserver
@@ -289,7 +289,7 @@ storage:
spec:
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
command:
- /hyperkube
- controller-manager
@@ -335,7 +335,7 @@ storage:
hostNetwork: true
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
command:
- /hyperkube
- scheduler

4
examples/ignition/k8s-worker.yaml
View File

@@ -58,7 +58,7 @@ systemd:
Requires=k8s-assets.target
After=k8s-assets.target
[Service]
Environment=KUBELET_VERSION=v1.5.2_coreos.0
Environment=KUBELET_VERSION=v1.5.4_coreos.0
Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume dns,kind=host,source=/etc/resolv.conf \
--mount volume=dns,target=/etc/resolv.conf \
@@ -201,7 +201,7 @@ storage:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
command:
- /hyperkube
- proxy

2
scripts/get-kubectl
View File

@@ -4,7 +4,7 @@
set -eu
DEST=${1:-"bin"}
VERSION="v1.5.2"
VERSION="v1.5.4"
URL="https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl"