From d34b4ea6587b76fab34670541029cf08d4e187ca Mon Sep 17 00:00:00 2001 From: Suraj Deshmukh Date: Wed, 12 Feb 2020 13:10:39 +0530 Subject: [PATCH] kubernetes: Update to v1.17.3 Release Notes: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.17.md#v1173 Signed-off-by: Suraj Deshmukh --- README.md | 2 +- aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- .../flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- .../flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl | 2 +- bootkube/resources/charts/kubelet/values.yaml | 2 +- bootkube/resources/charts/kubernetes/values.yaml | 8 ++++---- bootkube/variables.tf | 2 +- docs/index.md | 2 +- .../flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- .../flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- .../flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 1a6935b1..57ef526d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Lokomotive is an open source project by [Kinvolk](https://kinvolk.io/) which dis ## Features -* Kubernetes v1.17.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.17.3 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) 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/) * Advanced features like [worker pools](docs/advanced/worker-pools.md) and [snippets](docs/advanced/customization.md#flatcar-linux) customization diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index 2aeb652e..498959ba 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -120,7 +120,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" @@ -142,7 +142,7 @@ storage: # Wrapper for bootkube start set -e # Pre-pull hyperkube image because when it is later pulled but takes too long it times out - docker pull k8s.gcr.io/hyperkube:v1.17.2 + docker pull k8s.gcr.io/hyperkube:v1.17.3 # 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-* exec /usr/bin/rkt run \ diff --git a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl index 5b3c857d..ba6e2650 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -100,7 +100,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node" - path: /etc/sysctl.d/max-user-watches.conf @@ -133,7 +133,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.17.2 \ + docker://k8s.gcr.io/hyperkube:v1.17.3 \ --net=host \ --dns=host \ -- \ diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index eb3809ed..ec2e6cee 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -122,7 +122,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" diff --git a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl index d0c08b50..c0afef9e 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -98,7 +98,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node" - path: /etc/sysctl.d/max-user-watches.conf @@ -118,7 +118,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.17.2 \ + docker://k8s.gcr.io/hyperkube:v1.17.3 \ --net=host \ --dns=host \ -- \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index c57d1883..377ebdf5 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -127,7 +127,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" @@ -155,7 +155,7 @@ storage: # Wrapper for bootkube start set -e # Pre-pull hyperkube image because when it is later pulled but takes too long it times out - docker pull k8s.gcr.io/hyperkube:v1.17.2 + docker pull k8s.gcr.io/hyperkube:v1.17.3 # 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-* exec /usr/bin/rkt run \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl index d19b0dd0..e3b774f5 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl @@ -89,7 +89,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node" - path: /etc/hostname diff --git a/bootkube/resources/charts/kubelet/values.yaml b/bootkube/resources/charts/kubelet/values.yaml index 84b74d77..5a1eea83 100644 --- a/bootkube/resources/charts/kubelet/values.yaml +++ b/bootkube/resources/charts/kubelet/values.yaml @@ -1,3 +1,3 @@ -image: k8s.gcr.io/hyperkube:v1.17.2 +image: k8s.gcr.io/hyperkube:v1.17.3 clusterDNS: 10.0.0.10 clusterDomain: cluster.local diff --git a/bootkube/resources/charts/kubernetes/values.yaml b/bootkube/resources/charts/kubernetes/values.yaml index d628cc66..97781a6e 100644 --- a/bootkube/resources/charts/kubernetes/values.yaml +++ b/bootkube/resources/charts/kubernetes/values.yaml @@ -9,7 +9,7 @@ apiserver: aggregationCaCert: aggregationClientCert: aggregationClientKey: - image: k8s.gcr.io/hyperkube:v1.17.2 + image: k8s.gcr.io/hyperkube:v1.17.3 cloudProvider: etcdServers: aggregationFlags: @@ -19,18 +19,18 @@ controllerManager: serviceAccountKey: caCert: caKey: - image: k8s.gcr.io/hyperkube:v1.17.2 + image: k8s.gcr.io/hyperkube:v1.17.3 cloudProvider: serviceCIDR: 10.0.0.0/24 podCIDR: 10.2.0.0/16 controlPlaneReplicas: 1 trustedCertsDir: /usr/share/ca-certificates kubeProxy: - image: k8s.gcr.io/hyperkube:v1.17.2 + image: k8s.gcr.io/hyperkube:v1.17.3 podCIDR: 10.2.0.0/16 trustedCertsDir: /usr/share/ca-certificates kubeScheduler: - image: k8s.gcr.io/hyperkube:v1.17.2 + image: k8s.gcr.io/hyperkube:v1.17.3 controlPlaneReplicas: 1 kubeConfigInCluster: server: diff --git a/bootkube/variables.tf b/bootkube/variables.tf index a8f9c7db..08e64c31 100644 --- a/bootkube/variables.tf +++ b/bootkube/variables.tf @@ -102,7 +102,7 @@ variable "container_images" { flannel_cni = "quay.io/coreos/flannel-cni:v0.3.0" # only amd64 images available for cloudnativelabs/kube-router kube_router = "cloudnativelabs/kube-router:v0.3.2" - hyperkube = "k8s.gcr.io/hyperkube:v1.17.2" + hyperkube = "k8s.gcr.io/hyperkube:v1.17.3" coredns = "coredns/coredns:coredns-" pod_checkpointer = "kinvolk/pod-checkpointer:83e25e5968391b9eb342042c435d1b3eeddb2be1" } diff --git a/docs/index.md b/docs/index.md index 6a5f2ac9..66b08285 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Lokomotive distributes upstream Kubernetes. ## Features -* Kubernetes v1.17.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.17.3 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) 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/) * Advanced features like [worker pools](advanced/worker-pools/) and [snippets](advanced/customization/#flatcar-linux) customization diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index 3149d1e2..0c911c27 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -123,7 +123,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" diff --git a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl index 5c38dcf4..dd8e935d 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -94,7 +94,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node" - path: /etc/sysctl.d/max-user-watches.conf @@ -114,7 +114,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.17.2 \ + docker://k8s.gcr.io/hyperkube:v1.17.3 \ --net=host \ --dns=host \ -- \ diff --git a/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index ee4a6b4a..42f1d03f 100644 --- a/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -125,7 +125,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" @@ -153,7 +153,7 @@ storage: # Wrapper for bootkube start set -e # Pre-pull hyperkube image because when it is later pulled but takes too long it times out - docker pull k8s.gcr.io/hyperkube:v1.17.2 + docker pull k8s.gcr.io/hyperkube:v1.17.3 # 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-* exec /usr/bin/rkt run \ diff --git a/kvm-libvirt/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/kvm-libvirt/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl index eb05406e..f8a6558a 100644 --- a/kvm-libvirt/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/kvm-libvirt/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -101,7 +101,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node" - path: /etc/sysctl.d/max-user-watches.conf @@ -140,7 +140,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.17.2 \ + docker://k8s.gcr.io/hyperkube:v1.17.3 \ --net=host \ --dns=host \ -- \ diff --git a/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl index dc7540eb..3744e195 100644 --- a/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl +++ b/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl @@ -149,7 +149,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube-${os_arch} - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true" NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule" @@ -171,7 +171,7 @@ storage: # Wrapper for bootkube start set -e # Pre-pull hyperkube image because when it is later pulled but takes too long it times out - docker pull k8s.gcr.io/hyperkube-${os_arch}:v1.17.2 + docker pull k8s.gcr.io/hyperkube-${os_arch}:v1.17.3 # 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-* exec /usr/bin/rkt run \ diff --git a/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl index 3909b2d2..b240bb49 100644 --- a/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -265,7 +265,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube-${os_arch} - KUBELET_IMAGE_TAG=v1.17.2 + KUBELET_IMAGE_TAG=v1.17.3 KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet" NODE_LABELS="node.kubernetes.io/node,${worker_labels}" NODE_TAINTS="${taints}" @@ -288,7 +288,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube-${os_arch}:v1.17.2 \ + docker://k8s.gcr.io/hyperkube-${os_arch}:v1.17.3 \ --net=host \ --dns=host \ -- \