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

Commit 2b281dd

Browse files
invidianinvidian
authored
Merge pull request #861 from kinvolk/invidian/update-kubernetes
Update Kubernetes version to v1.18.8
2 parents 0ff4899 + b947520 commit 2b281dd

File tree

17 files changed

+47
-47
lines changed

17 files changed

+47
-47
lines changed

‎assets/charts/control-plane/kube-apiserver/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apiserver:
99
aggregationCaCert:
1010
aggregationClientCert:
1111
aggregationClientKey:
12-
image: k8s.gcr.io/kube-apiserver:v1.18.6
12+
image: k8s.gcr.io/kube-apiserver:v1.18.8
1313
cloudProvider:
1414
etcdServers:
1515
aggregationFlags:

‎assets/charts/control-plane/kubelet/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
image: quay.io/poseidon/kubelet:v1.18.6
1+
image: quay.io/poseidon/kubelet:v1.18.8
22
clusterDNS: 10.0.0.10
33
clusterDomain: cluster.local

‎assets/charts/control-plane/kubernetes/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ controllerManager:
22
serviceAccountKey:
33
caCert:
44
caKey:
5-
image: k8s.gcr.io/kube-controller-manager:v1.18.6
5+
image: k8s.gcr.io/kube-controller-manager:v1.18.8
66
cloudProvider:
77
serviceCIDR: 10.0.0.0/24
88
podCIDR: 10.2.0.0/16
99
controlPlaneReplicas: 1
1010
trustedCertsDir: /usr/share/ca-certificates
1111
kubeProxy:
12-
image: k8s.gcr.io/kube-proxy:v1.18.6
12+
image: k8s.gcr.io/kube-proxy:v1.18.8
1313
podCIDR: 10.2.0.0/16
1414
trustedCertsDir: /usr/share/ca-certificates
1515
kubeScheduler:
16-
image: k8s.gcr.io/kube-scheduler:v1.18.6
16+
image: k8s.gcr.io/kube-scheduler:v1.18.8
1717
controlPlaneReplicas: 1
1818
kubeConfigInCluster:
1919
server:

‎assets/terraform-modules/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ storage:
124124
contents:
125125
inline: |
126126
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
127-
KUBELET_IMAGE_TAG=v1.18.6
127+
KUBELET_IMAGE_TAG=v1.18.8
128128
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
129129
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
130130
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"
@@ -146,7 +146,7 @@ storage:
146146
# Wrapper for bootkube start
147147
set -e
148148
# Pre-pull kubelet image because when it is later pulled but takes too long it times out
149-
docker pull quay.io/poseidon/kubelet:v1.18.6
149+
docker pull quay.io/poseidon/kubelet:v1.18.8
150150
# Move experimental manifests
151151
[ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-*
152152
exec /usr/bin/rkt run \

‎assets/terraform-modules/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ storage:
103103
contents:
104104
inline: |
105105
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
106-
KUBELET_IMAGE_TAG=v1.18.6
106+
KUBELET_IMAGE_TAG=v1.18.8
107107
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
108108
NODE_LABELS="node.kubernetes.io/node,${node_labels}"
109109
NODE_TAINTS="${taints}"
@@ -137,7 +137,7 @@ storage:
137137
--volume config,kind=host,source=/etc/kubernetes \
138138
--mount volume=config,target=/etc/kubernetes \
139139
--insecure-options=image \
140-
docker://quay.io/poseidon/kubelet:v1.18.6 \
140+
docker://quay.io/poseidon/kubelet:v1.18.8 \
141141
--net=host \
142142
--dns=host \
143143
-- \

‎assets/terraform-modules/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ storage:
126126
contents:
127127
inline: |
128128
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
129-
KUBELET_IMAGE_TAG=v1.18.6
129+
KUBELET_IMAGE_TAG=v1.18.8
130130
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
131131
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
132132
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"

‎assets/terraform-modules/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ storage:
100100
contents:
101101
inline: |
102102
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
103-
KUBELET_IMAGE_TAG=v1.18.6
103+
KUBELET_IMAGE_TAG=v1.18.8
104104
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
105105
NODE_LABELS="node.kubernetes.io/node"
106106
- path: /etc/sysctl.d/max-user-watches.conf
@@ -120,7 +120,7 @@ storage:
120120
--volume config,kind=host,source=/etc/kubernetes \
121121
--mount volume=config,target=/etc/kubernetes \
122122
--insecure-options=image \
123-
docker://quay.io/poseidon/kubelet:v1.18.6 \
123+
docker://quay.io/poseidon/kubelet:v1.18.8 \
124124
--net=host \
125125
--dns=host \
126126
-- \

‎assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ storage:
133133
contents:
134134
inline: |
135135
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
136-
KUBELET_IMAGE_TAG=v1.18.6
136+
KUBELET_IMAGE_TAG=v1.18.8
137137
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
138138
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
139139
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"
@@ -161,7 +161,7 @@ storage:
161161
# Wrapper for bootkube start
162162
set -e
163163
# Pre-pull kubelet image because when it is later pulled but takes too long it times out
164-
docker pull quay.io/poseidon/kubelet:v1.18.6
164+
docker pull quay.io/poseidon/kubelet:v1.18.8
165165
# Move experimental manifests
166166
[ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-*
167167
exec /usr/bin/rkt run \

‎assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ storage:
9292
contents:
9393
inline: |
9494
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
95-
KUBELET_IMAGE_TAG=v1.18.6
95+
KUBELET_IMAGE_TAG=v1.18.8
9696
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
9797
NODE_LABELS="${join(",", [for k, v in kubelet_labels : "${k}=${v}"])}"
9898
- path: /etc/hostname

‎assets/terraform-modules/bootkube/variables.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ variable "container_images" {
9999
calico_cni = "calico/cni:v3.15.2"
100100
calico_controllers = "calico/kube-controllers:v3.15.2"
101101
flexvol_driver_image = "calico/pod2daemon-flexvol:v3.15.2"
102-
kubelet_image = "quay.io/poseidon/kubelet:v1.18.6"
102+
kubelet_image = "quay.io/poseidon/kubelet:v1.18.8"
103103
coredns = "coredns/coredns:coredns-"
104104
pod_checkpointer = "kinvolk/pod-checkpointer:d1c58443fe7d7d33aa5bf7d80d65d299be6e5847"
105-
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.6"
106-
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.6"
107-
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.6"
108-
kube_proxy = "k8s.gcr.io/kube-proxy:v1.18.6"
105+
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.8"
106+
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.8"
107+
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.8"
108+
kube_proxy = "k8s.gcr.io/kube-proxy:v1.18.8"
109109
}
110110
}
111111

0 commit comments

Comments
 (0)