Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #459 from kinvolk/surajssd/update-skewed-kube-proxy
Browse files Browse the repository at this point in the history
Update Kubernetes to v1.18.3
  • Loading branch information
surajssd authored May 21, 2020
2 parents 9e3eaf6 + d77a237 commit 50122a6
Show file tree
Hide file tree
Showing 17 changed files with 47 additions and 47 deletions.
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.18.2
KUBELET_IMAGE_TAG=v1.18.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 @@ -144,7 +144,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.18.2
docker pull k8s.gcr.io/hyperkube:v1.18.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 @@ -100,7 +100,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2 \
docker://k8s.gcr.io/hyperkube:v1.18.3 \
--net=host \
--dns=host \
-- \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.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 @@ -98,7 +98,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2 \
docker://k8s.gcr.io/hyperkube:v1.18.3 \
--net=host \
--dns=host \
-- \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.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 @@ -157,7 +157,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.18.2
docker pull k8s.gcr.io/hyperkube:v1.18.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 @@ -89,7 +89,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.3
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node"
- path: /etc/hostname
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apiserver:
aggregationCaCert:
aggregationClientCert:
aggregationClientKey:
image: k8s.gcr.io/kube-apiserver:v1.18.2
image: k8s.gcr.io/kube-apiserver:v1.18.3
cloudProvider:
etcdServers:
aggregationFlags:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image: k8s.gcr.io/hyperkube:v1.18.2
image: k8s.gcr.io/hyperkube:v1.18.3
clusterDNS: 10.0.0.10
clusterDomain: cluster.local
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ controllerManager:
serviceAccountKey:
caCert:
caKey:
image: k8s.gcr.io/kube-controller-manager:v1.18.2
image: k8s.gcr.io/kube-controller-manager:v1.18.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/kube-proxy:v1.18.2
image: k8s.gcr.io/kube-proxy:v1.18.3
podCIDR: 10.2.0.0/16
trustedCertsDir: /usr/share/ca-certificates
kubeScheduler:
image: k8s.gcr.io/kube-scheduler:v1.18.2
image: k8s.gcr.io/kube-scheduler:v1.18.3
controlPlaneReplicas: 1
kubeConfigInCluster:
server:
Expand Down
10 changes: 5 additions & 5 deletions assets/lokomotive-kubernetes/bootkube/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ variable "container_images" {
calico = "calico/node:v3.13.3"
calico_cni = "calico/cni:v3.13.3"
calico_controllers = "calico/kube-controllers:v3.13.3"
hyperkube = "k8s.gcr.io/hyperkube:v1.18.2"
hyperkube = "k8s.gcr.io/hyperkube:v1.18.3"
coredns = "coredns/coredns:coredns-"
pod_checkpointer = "kinvolk/pod-checkpointer:83e25e5968391b9eb342042c435d1b3eeddb2be1"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.2"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.2"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.2"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.17.4"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.3"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.3"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.3"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.18.3"
}
}

Expand Down
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.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2 \
docker://k8s.gcr.io/hyperkube:v1.18.3 \
--net=host \
--dns=host \
-- \
Expand Down
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.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2
docker pull k8s.gcr.io/hyperkube:v1.18.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.18.2
KUBELET_IMAGE_TAG=v1.18.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.18.2 \
docker://k8s.gcr.io/hyperkube:v1.18.3 \
--net=host \
--dns=host \
-- \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube-${os_arch}
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.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 @@ -191,7 +191,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.18.2
docker pull k8s.gcr.io/hyperkube-${os_arch}:v1.18.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 @@ -276,7 +276,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube-${os_arch}
KUBELET_IMAGE_TAG=v1.18.2
KUBELET_IMAGE_TAG=v1.18.3
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node,${node_labels}"
BGP_NODE_LABELS="${bgp_node_labels}"
Expand All @@ -300,7 +300,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.18.2 \
docker://k8s.gcr.io/hyperkube-${os_arch}:v1.18.3 \
--net=host \
--dns=host \
-- \
Expand Down
Loading

0 comments on commit 50122a6

Please sign in to comment.