Update Kubernetes from v1.7.3 to v1.7.5
This commit is contained in:
parent
00b61a26c0
commit
a441f5c6e0
14
README.md
14
README.md
|
@ -11,10 +11,10 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* Kubernetes v1.7.3 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube))
|
* Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube))
|
||||||
* Self-hosted control plane, single or multi master, workloads isolated to workers
|
* Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) or [Calico](https://www.projectcalico.org/) networking
|
||||||
* On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled
|
* On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/)
|
||||||
* Ready for Ingress, Metrics, Dashboards, and other optional [addons](https://typhoon.psdn.io/addons/overview/)
|
* Ready for Ingress, Dashboards, Metrics, and other optional [addons](https://typhoon.psdn.io/addons/overview/)
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
@ -74,9 +74,9 @@ In 5-10 minutes (varies by platform), the cluster will be ready. This Google Clo
|
||||||
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
||||||
$ kubectl get nodes
|
$ kubectl get nodes
|
||||||
NAME STATUS AGE VERSION
|
NAME STATUS AGE VERSION
|
||||||
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.3+coreos.0
|
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0
|
||||||
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
```
|
```
|
||||||
|
|
||||||
List the pods.
|
List the pods.
|
||||||
|
|
|
@ -128,7 +128,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/hostname
|
- path: /etc/hostname
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
@ -157,7 +157,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/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
|
[ -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_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
|
||||||
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.6.1}"
|
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.6.2}"
|
||||||
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
||||||
exec /usr/bin/rkt run \
|
exec /usr/bin/rkt run \
|
||||||
--trust-keys-from-https \
|
--trust-keys-from-https \
|
||||||
|
|
|
@ -92,7 +92,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/hostname
|
- path: /etc/hostname
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
|
|
@ -92,7 +92,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/hostname
|
- path: /etc/hostname
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Self-hosted Kubernetes assets (kubeconfig, manifests)
|
# Self-hosted Kubernetes assets (kubeconfig, manifests)
|
||||||
module "bootkube" {
|
module "bootkube" {
|
||||||
source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=5ffbfec46dc05721eaf9d15c3c9bbedefaead1bc"
|
source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=dbfb11c6eafa08f839eac2834ca1aca35dafe965"
|
||||||
|
|
||||||
cluster_name = "${var.cluster_name}"
|
cluster_name = "${var.cluster_name}"
|
||||||
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]
|
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]
|
||||||
|
|
|
@ -105,7 +105,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
|
@ -128,7 +128,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/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
|
[ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
|
||||||
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.1}"
|
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}"
|
||||||
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
||||||
exec /usr/bin/rkt run \
|
exec /usr/bin/rkt run \
|
||||||
--trust-keys-from-https \
|
--trust-keys-from-https \
|
||||||
|
|
|
@ -103,7 +103,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
|
@ -120,7 +120,7 @@ storage:
|
||||||
--trust-keys-from-https \
|
--trust-keys-from-https \
|
||||||
--volume config,kind=host,source=/etc/kubernetes \
|
--volume config,kind=host,source=/etc/kubernetes \
|
||||||
--mount volume=config,target=/etc/kubernetes \
|
--mount volume=config,target=/etc/kubernetes \
|
||||||
quay.io/coreos/hyperkube:v1.7.3_coreos.0 \
|
quay.io/coreos/hyperkube:v1.7.5_coreos.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Bare-Metal
|
# Bare-Metal
|
||||||
|
|
||||||
In this tutorial, we'll network boot and provison a Kubernetes v1.7.3 cluster on bare-metal.
|
In this tutorial, we'll network boot and provison a Kubernetes v1.7.5 cluster on bare-metal.
|
||||||
|
|
||||||
First, we'll deploy a [Matchbox](https://github.com/coreos/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module and power on machines. On PXE boot, machines will install Container Linux to disk, reboot into the disk install, and provision themselves as Kubernetes controllers or workers.
|
First, we'll deploy a [Matchbox](https://github.com/coreos/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module and power on machines. On PXE boot, machines will install Container Linux to disk, reboot into the disk install, and provision themselves as Kubernetes controllers or workers.
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ Get or update Terraform modules.
|
||||||
$ terraform get # downloads missing modules
|
$ terraform get # downloads missing modules
|
||||||
$ terraform get --update # updates all modules
|
$ terraform get --update # updates all modules
|
||||||
Get: git::https://github.com/poseidon/typhoon (update)
|
Get: git::https://github.com/poseidon/typhoon (update)
|
||||||
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1 (update)
|
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.2 (update)
|
||||||
```
|
```
|
||||||
|
|
||||||
Plan the resources to be created.
|
Plan the resources to be created.
|
||||||
|
@ -295,9 +295,9 @@ bootkube[5]: Tearing down temporary bootstrap control plane...
|
||||||
$ KUBECONFIG=/home/user/.secrets/clusters/mercury/auth/kubeconfig
|
$ KUBECONFIG=/home/user/.secrets/clusters/mercury/auth/kubeconfig
|
||||||
$ kubectl get nodes
|
$ kubectl get nodes
|
||||||
NAME STATUS AGE VERSION
|
NAME STATUS AGE VERSION
|
||||||
node1.example.com Ready 11m v1.7.3+coreos.0
|
node1.example.com Ready 11m v1.7.5+coreos.0
|
||||||
node2.example.com Ready 11m v1.7.3+coreos.0
|
node2.example.com Ready 11m v1.7.5+coreos.0
|
||||||
node3.example.com Ready 11m v1.7.3+coreos.0
|
node3.example.com Ready 11m v1.7.5+coreos.0
|
||||||
```
|
```
|
||||||
|
|
||||||
List the pods.
|
List the pods.
|
||||||
|
|
|
@ -60,7 +60,7 @@ Modules are updated regularly, set the version to a [release tag](https://github
|
||||||
|
|
||||||
```tf
|
```tf
|
||||||
...
|
...
|
||||||
source = "git:https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.7.3"
|
source = "git:https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.7.5"
|
||||||
```
|
```
|
||||||
|
|
||||||
Module versioning ensures `terraform get --update` only fetches the desired version, so plan and apply don't change cluster resources, unless the version is altered.
|
Module versioning ensures `terraform get --update` only fetches the desired version, so plan and apply don't change cluster resources, unless the version is altered.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Digital Ocean
|
# Digital Ocean
|
||||||
|
|
||||||
In this tutorial, we'll create a Kubernetes v1.7.3 cluster on Digital Ocean.
|
In this tutorial, we'll create a Kubernetes v1.7.5 cluster on Digital Ocean.
|
||||||
|
|
||||||
We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, firewall rules, DNS records, tags, and droplets for Kubernetes controllers and workers will be created.
|
We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, firewall rules, DNS records, tags, and droplets for Kubernetes controllers and workers will be created.
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ Get or update Terraform modules.
|
||||||
$ terraform get # downloads missing modules
|
$ terraform get # downloads missing modules
|
||||||
$ terraform get --update # updates all modules
|
$ terraform get --update # updates all modules
|
||||||
Get: git::https://github.com/poseidon/typhoon (update)
|
Get: git::https://github.com/poseidon/typhoon (update)
|
||||||
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1 (update)
|
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.2 (update)
|
||||||
```
|
```
|
||||||
|
|
||||||
Plan the resources to be created.
|
Plan the resources to be created.
|
||||||
|
@ -147,9 +147,9 @@ In 5-10 minutes, the Kubernetes cluster will be ready.
|
||||||
$ KUBECONFIG=/home/user/.secrets/clusters/nemo/auth/kubeconfig
|
$ KUBECONFIG=/home/user/.secrets/clusters/nemo/auth/kubeconfig
|
||||||
$ kubectl get nodes
|
$ kubectl get nodes
|
||||||
NAME STATUS AGE VERSION
|
NAME STATUS AGE VERSION
|
||||||
10.132.110.130 Ready 10m v1.7.3+coreos.0
|
10.132.110.130 Ready 10m v1.7.5+coreos.0
|
||||||
10.132.115.81 Ready 10m v1.7.3+coreos.0
|
10.132.115.81 Ready 10m v1.7.5+coreos.0
|
||||||
10.132.124.107 Ready 10m v1.7.3+coreos.0
|
10.132.124.107 Ready 10m v1.7.5+coreos.0
|
||||||
```
|
```
|
||||||
|
|
||||||
List the pods.
|
List the pods.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Google Cloud
|
# Google Cloud
|
||||||
|
|
||||||
In this tutorial, we'll create a Kubernetes v1.7.3 cluster on Google Compute Engine (not GKE).
|
In this tutorial, we'll create a Kubernetes v1.7.5 cluster on Google Compute Engine (not GKE).
|
||||||
|
|
||||||
We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a network, firewall rules, managed instance groups of Kubernetes controllers and workers, network load balancers for controllers and workers, and health checks will be created.
|
We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a network, firewall rules, managed instance groups of Kubernetes controllers and workers, network load balancers for controllers and workers, and health checks will be created.
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ Get or update Terraform modules.
|
||||||
$ terraform get # downloads missing modules
|
$ terraform get # downloads missing modules
|
||||||
$ terraform get --update # updates all modules
|
$ terraform get --update # updates all modules
|
||||||
Get: git::https://github.com/poseidon/typhoon (update)
|
Get: git::https://github.com/poseidon/typhoon (update)
|
||||||
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1 (update)
|
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.2 (update)
|
||||||
```
|
```
|
||||||
|
|
||||||
Plan the resources to be created.
|
Plan the resources to be created.
|
||||||
|
@ -154,9 +154,9 @@ In 5-10 minutes, the Kubernetes cluster will be ready.
|
||||||
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
||||||
$ kubectl get nodes
|
$ kubectl get nodes
|
||||||
NAME STATUS AGE VERSION
|
NAME STATUS AGE VERSION
|
||||||
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.3+coreos.0
|
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0
|
||||||
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
```
|
```
|
||||||
|
|
||||||
List the pods.
|
List the pods.
|
||||||
|
|
|
@ -11,8 +11,8 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* Kubernetes v1.7.3 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube))
|
* Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube))
|
||||||
* Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) or [Calico](https://www.projectcalico.org/) networking (with BGP peering)
|
* Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) or [Calico](https://www.projectcalico.org/) networking
|
||||||
* On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/)
|
* On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/)
|
||||||
* Ready for Ingress, Dashboards, Metrics and other optional [addons](addons/overview.md)
|
* Ready for Ingress, Dashboards, Metrics and other optional [addons](addons/overview.md)
|
||||||
* Provided via Terraform Modules
|
* Provided via Terraform Modules
|
||||||
|
@ -75,9 +75,9 @@ In 5-10 minutes (varies by platform), the cluster will be ready. This Google Clo
|
||||||
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
$ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig
|
||||||
$ kubectl get nodes
|
$ kubectl get nodes
|
||||||
NAME STATUS AGE VERSION
|
NAME STATUS AGE VERSION
|
||||||
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.3+coreos.0
|
yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0
|
||||||
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.3+coreos.0
|
yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0
|
||||||
```
|
```
|
||||||
|
|
||||||
List the pods.
|
List the pods.
|
||||||
|
|
|
@ -101,7 +101,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
|
@ -124,7 +124,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/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
|
[ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
|
||||||
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.1}"
|
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}"
|
||||||
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
|
||||||
exec /usr/bin/rkt run \
|
exec /usr/bin/rkt run \
|
||||||
--trust-keys-from-https \
|
--trust-keys-from-https \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Self-hosted Kubernetes assets (kubeconfig, manifests)
|
# Self-hosted Kubernetes assets (kubeconfig, manifests)
|
||||||
module "bootkube" {
|
module "bootkube" {
|
||||||
source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=5ffbfec46dc05721eaf9d15c3c9bbedefaead1bc"
|
source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=dbfb11c6eafa08f839eac2834ca1aca35dafe965"
|
||||||
|
|
||||||
cluster_name = "${var.cluster_name}"
|
cluster_name = "${var.cluster_name}"
|
||||||
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]
|
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]
|
||||||
|
|
|
@ -99,7 +99,7 @@ storage:
|
||||||
contents:
|
contents:
|
||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
|
KUBELET_IMAGE_TAG=v1.7.5_coreos.0
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
|
@ -116,7 +116,7 @@ storage:
|
||||||
--trust-keys-from-https \
|
--trust-keys-from-https \
|
||||||
--volume config,kind=host,source=/etc/kubernetes \
|
--volume config,kind=host,source=/etc/kubernetes \
|
||||||
--mount volume=config,target=/etc/kubernetes \
|
--mount volume=config,target=/etc/kubernetes \
|
||||||
quay.io/coreos/hyperkube:v1.7.3_coreos.0 \
|
quay.io/coreos/hyperkube:v1.7.5_coreos.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
||||||
|
|
Loading…
Reference in New Issue