Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Commit

Permalink
Merge pull request #171 from kinvolk/surajssd/update-k8s-1.17.3
Browse files Browse the repository at this point in the history
kubernetes: Update to v1.17.3
  • Loading branch information
surajssd authored Feb 12, 2020
2 parents a4fd239 + d34b4ea commit 400362c
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
-- \
Expand Down
2 changes: 1 addition & 1 deletion azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
-- \
Expand Down
4 changes: 2 additions & 2 deletions bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bootkube/resources/charts/kubelet/values.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions bootkube/resources/charts/kubernetes/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bootkube/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
-- \
Expand Down
4 changes: 2 additions & 2 deletions kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
-- \
Expand Down
4 changes: 2 additions & 2 deletions packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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 \
-- \
Expand Down

0 comments on commit 400362c

Please sign in to comment.