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 Kubernetes to use bootkube v0.4.3

Browse Source 
* Update terraform-based bootkube-install cluster example
* Update manual bootkube cluster example
This commit is contained in:
Dalton Hubble
2017-05-18 14:29:52 -07:00
parent dbba1316b2
commit e9bf13963c
7 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/bootkube.md
View File

@@ -11,11 +11,11 @@ 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) v0.4.2 and add it somewhere on your PATH.
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.4.3 and add it somewhere on your PATH.
```sh
$ bootkube version
Version: v0.4.2
Version: v0.4.3
```
## Examples

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

@@ -143,7 +143,7 @@ storage:
# Wrapper for bootkube start
set -e
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.2}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.3}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \

6
examples/terraform/bootkube-install/variables.tf
View File

@@ -97,6 +97,12 @@ variable "k8s_etcd_service_ip" {
description = "Kubernetes service IP for self-hosted etcd, if enabled (must be within service_cidr)"
}
variable "k8s_bootstrap_etcd_service_ip" {
type = "string"
default = "10.3.0.200"
description = "Kubernetes service IP for bootstrap self-hosted etcd, if enabled (must be within service_cidr)"
}
variable "container_linux_oem" {
type = "string"
default = ""

3
examples/terraform/modules/bootkube/bootkube.tf
View File

@@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" {
source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=bf57fb4de14638db481897b1c9228e974c2db90a"
source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=209da6d09b1cadad655eee56d63ff0dc750c5bda"
cluster_name = "${var.cluster_name}"
api_servers = ["${var.k8s_domain_name}"]
@@ -11,5 +11,6 @@ module "bootkube" {
kube_apiserver_service_ip = "${var.k8s_apiserver_service_ip}"
kube_dns_service_ip = "${var.k8s_dns_service_ip}"
kube_etcd_service_ip = "${var.k8s_etcd_service_ip}"
kube_bootstrap_etcd_service_ip = "${var.k8s_bootstrap_etcd_service_ip}"
experimental_self_hosted_etcd = "${var.experimental_self_hosted_etcd}"
}

6
examples/terraform/modules/bootkube/variables.tf
View File

@@ -92,6 +92,12 @@ variable "k8s_etcd_service_ip" {
description = "Kubernetes service IP for self-hosted etcd, if enabled (must be within service_cidr)"
}
variable "k8s_bootstrap_etcd_service_ip" {
type = "string"
default = "10.3.0.200"
description = "Kubernetes service IP for bootstrap self-hosted etcd, if enabled (must be within service_cidr)"
}
variable "container_linux_oem" {
type = "string"
default = ""

2
examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl
View File

@@ -154,7 +154,7 @@ storage:
[ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests
[ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.2}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.3}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \

2
scripts/get-bootkube
View File

@@ -4,7 +4,7 @@
set -eu
DEST=${1:-"bin"}
VERSION="v0.4.2"
VERSION="v0.4.3"
URL="https://github.com/kubernetes-incubator/bootkube/releases/download/${VERSION}/bootkube.tar.gz"