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

examples: Update bootkube to v0.3.7 and etcd3

Browse Source
This commit is contained in:
Dalton Hubble
2017-02-17 18:36:12 -08:00
parent dabf0eae54
commit 8fd4bea89b
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/bootkube.md
View File

@@ -12,12 +12,12 @@ Ensure that you've gone through the [matchbox with rkt](getting-started-rkt.md)
* Create the example libvirt client VMs
* `/etc/hosts` entries for `node[1-3].example.com` (or pass custom names to `k8s-certgen`)
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases/tag/v0.3.5) v0.3.5 and add it somewhere on your PATH.
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.3.7 and add it somewhere on your PATH.
$ wget https://github.com/kubernetes-incubator/bootkube/releases/download/v0.3.5/bootkube.tar.gz
$ wget https://github.com/kubernetes-incubator/bootkube/releases/download/v0.3.7/bootkube.tar.gz
$ tar xzf bootkube.tar.gz
$ ./bin/linux/bootkube version
Version: v0.3.5
Version: v0.3.7
## Examples

2
examples/groups/bootkube-install/node2.json
View File

@@ -8,7 +8,7 @@
},
"metadata": {
"domain_name": "node2.example.com",
"etcd_initial_cluster": "node1=http://node1.example.com:2380",
"etcd_endpoints": "node1.example.com:2379",
"k8s_dns_service_ip": "10.3.0.10",
"ssh_authorized_keys": [
"ADD ME"

2
examples/groups/bootkube-install/node3.json
View File

@@ -8,7 +8,7 @@
},
"metadata": {
"domain_name": "node3.example.com",
"etcd_initial_cluster": "node1=http://node1.example.com:2380",
"etcd_endpoints": "node1.example.com:2379",
"k8s_dns_service_ip": "10.3.0.10",
"ssh_authorized_keys": [
"ADD ME"

2
examples/groups/bootkube/node2.json
View File

@@ -7,7 +7,7 @@
},
"metadata": {
"domain_name": "node2.example.com",
"etcd_initial_cluster": "node1=http://node1.example.com:2380",
"etcd_endpoints": "node1.example.com:2379",
"k8s_dns_service_ip": "10.3.0.10",
"pxe": "true",
"ssh_authorized_keys": [

2
examples/groups/bootkube/node3.json
View File

@@ -7,7 +7,7 @@
},
"metadata": {
"domain_name": "node3.example.com",
"etcd_initial_cluster": "node1=http://node1.example.com:2380",
"etcd_endpoints": "node1.example.com:2379",
"k8s_dns_service_ip": "10.3.0.10",
"pxe": "true",
"ssh_authorized_keys": [

7
examples/ignition/bootkube-controller.yaml
View File

@@ -1,12 +1,13 @@
---
systemd:
units:
- name: etcd2.service
- name: etcd-member.service
enable: true
dropins:
- name: 40-etcd-cluster.conf
contents: |
[Service]
Environment="ETCD_IMAGE_TAG=v3.1.0"
Environment="ETCD_NAME={{.etcd_name}}"
Environment="ETCD_ADVERTISE_CLIENT_URLS=http://{{.domain_name}}:2379"
Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=http://{{.domain_name}}:2380"
@@ -113,7 +114,7 @@ storage:
contents:
inline: |
KUBELET_ACI=quay.io/coreos/hyperkube
KUBELET_VERSION=v1.5.2_coreos.0
KUBELET_VERSION=v1.5.2_coreos.2
- path: /etc/hostname
filesystem: root
mode: 0644
@@ -138,7 +139,7 @@ storage:
# Wrapper for bootkube start
set -e
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.3.5}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.3.7}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \

12
examples/ignition/bootkube-worker.yaml
View File

@@ -1,15 +1,17 @@
---
systemd:
units:
- name: etcd2.service
- name: etcd-member.service
enable: true
dropins:
- name: 40-etcd-cluster.conf
contents: |
[Service]
Environment="ETCD_PROXY=on"
Environment="ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379"
Environment="ETCD_INITIAL_CLUSTER={{.etcd_initial_cluster}}"
Environment="ETCD_IMAGE_TAG=v3.1.0"
ExecStart=
ExecStart=/usr/lib/coreos/etcd-wrapper gateway start \
--listen-addr=127.0.0.1:2379 \
--endpoints={{.etcd_endpoints}}
- name: docker.service
enable: true
- name: locksmithd.service
@@ -101,7 +103,7 @@ storage:
contents:
inline: |
KUBELET_ACI=quay.io/coreos/hyperkube
KUBELET_VERSION=v1.5.2_coreos.0
KUBELET_VERSION=v1.5.2_coreos.2
- path: /etc/hostname
filesystem: root
mode: 0644