From 7c327b8bf452c617a336fb97d61ba8437a6074ad Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 29 Jul 2018 11:20:17 -0700 Subject: [PATCH] Update from bootkube v0.12.0 to v0.13.0 --- CHANGES.md | 2 ++ aws/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index aaefe1e2..f24e2c7b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ Notable changes between versions. ## Latest +* Use kubernetes-incubator/bootkube v0.13.0 + #### Bare-Metal * Introduce [Container Linux Config snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) on bare-metal diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 21a8ea75..54a7b881 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -143,7 +143,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.13.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 36fa388f..02960b4f 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -94,7 +94,7 @@ runcmd: - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.8" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.12.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - [systemctl, start, --no-block, kubelet.service] diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 883dd851..a19a1a51 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -150,7 +150,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.13.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index f37448e5..242d2a10 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -85,7 +85,7 @@ runcmd: - [hostnamectl, set-hostname, ${domain_name}] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.8" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.12.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index 108b3966..fcbb5bb5 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -149,7 +149,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.13.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index db7e414e..9ba12bd9 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -91,7 +91,7 @@ runcmd: - [systemctl, daemon-reload] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.8" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.12.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - [systemctl, enable, kubelet.path] diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl index 8b264950..1b824b08 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -144,7 +144,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.13.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 3d08bd8d..5e0d0e2c 100644 --- a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -95,7 +95,7 @@ runcmd: - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.8" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.12.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - [systemctl, start, --no-block, kubelet.service]