diff --git a/CHANGES.md b/CHANGES.md index 6b0a3bc6..57f85ef0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ Notable changes between versions. ## Latest * Change kube-apiserver `--kubelet-preferred-address-types` to InternalIP,ExternalIP,Hostname +* Use kubernetes-incubator/bootkube v0.14.0 #### Addons diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index f6730372..c4b417b3 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -143,17 +143,14 @@ storage: set -e # 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.13.0}" - BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ - --volume assets,kind=host,source=$${BOOTKUBE_ASSETS} \ + --volume assets,kind=host,source=/opt/bootkube/assets \ --mount volume=assets,target=/assets \ --volume bootstrap,kind=host,source=/etc/kubernetes \ --mount volume=bootstrap,target=/etc/kubernetes \ $${RKT_OPTS} \ - $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + quay.io/coreos/bootkube:v0.14.0 \ --net=host \ --dns=host \ --exec=/bootkube -- start --asset-dir=/assets "$@" diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index ea239643..ee699c78 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -80,7 +80,7 @@ runcmd: - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.10" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.12.2" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.14.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, start, --no-block, kubelet.service] users: diff --git a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl index f6730372..c4b417b3 100644 --- a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -143,17 +143,14 @@ storage: set -e # 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.13.0}" - BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ - --volume assets,kind=host,source=$${BOOTKUBE_ASSETS} \ + --volume assets,kind=host,source=/opt/bootkube/assets \ --mount volume=assets,target=/assets \ --volume bootstrap,kind=host,source=/etc/kubernetes \ --mount volume=bootstrap,target=/etc/kubernetes \ $${RKT_OPTS} \ - $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + quay.io/coreos/bootkube:v0.14.0 \ --net=host \ --dns=host \ --exec=/bootkube -- start --asset-dir=/assets "$@" diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index dbca4815..9d3d8f1a 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -150,17 +150,14 @@ storage: set -e # 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.13.0}" - BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ - --volume assets,kind=host,source=$BOOTKUBE_ASSETS \ + --volume assets,kind=host,source=/opt/bootkube/assets \ --mount volume=assets,target=/assets \ --volume bootstrap,kind=host,source=/etc/kubernetes \ --mount volume=bootstrap,target=/etc/kubernetes \ $$RKT_OPTS \ - $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + quay.io/coreos/bootkube:v0.14.0 \ --net=host \ --dns=host \ --exec=/bootkube -- start --asset-dir=/assets "$@" diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 45eda806..30d0f7d0 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -86,7 +86,7 @@ runcmd: - [hostnamectl, set-hostname, ${domain_name}] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.10" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.12.2" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.14.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 6c2caa12..46b332a4 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -145,17 +145,14 @@ storage: set -e # 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.13.0}" - BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ - --volume assets,kind=host,source=$${BOOTKUBE_ASSETS} \ + --volume assets,kind=host,source=/opt/bootkube/assets \ --mount volume=assets,target=/assets \ --volume bootstrap,kind=host,source=/etc/kubernetes \ --mount volume=bootstrap,target=/etc/kubernetes \ $${RKT_OPTS} \ - $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + quay.io/coreos/bootkube:v0.14.0 \ --net=host \ --dns=host \ --exec=/bootkube -- start --asset-dir=/assets "$@" diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 19a45063..d460b106 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -77,7 +77,7 @@ runcmd: - [systemctl, daemon-reload] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.10" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.12.2" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.14.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, 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 a4b3fcbb..91d2dd2b 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -144,17 +144,14 @@ storage: set -e # 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.13.0}" - BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ - --volume assets,kind=host,source=$${BOOTKUBE_ASSETS} \ + --volume assets,kind=host,source=/opt/bootkube/assets \ --mount volume=assets,target=/assets \ --volume bootstrap,kind=host,source=/etc/kubernetes \ --mount volume=bootstrap,target=/etc/kubernetes \ $${RKT_OPTS} \ - $${BOOTKUBE_ACI}:$${BOOTKUBE_VERSION} \ + quay.io/coreos/bootkube:v0.14.0 \ --net=host \ --dns=host \ --exec=/bootkube -- start --asset-dir=/assets "$@" diff --git a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index ea239643..ee699c78 100644 --- a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -80,7 +80,7 @@ runcmd: - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.10" - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.12.2" - - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" + - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.14.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, start, --no-block, kubelet.service] users: