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

Update Kubernetes version to v1.18.8 #861

Merged
merged 1 commit into from
Aug 26, 2020
Merged

Update Kubernetes version to v1.18.8 #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kube-apiserver/values.yaml
View file
Open in desktop
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.6
image: k8s.gcr.io/kube-apiserver:v1.18.8
cloudProvider:
etcdServers:
aggregationFlags:
Expand Down
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kubelet/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image: quay.io/poseidon/kubelet:v1.18.6
image: quay.io/poseidon/kubelet:v1.18.8
clusterDNS: 10.0.0.10
clusterDomain: cluster.local
6 changes: 3 additions & 3 deletions assets/charts/control-plane/kubernetes/values.yaml
View file
Open in desktop
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.6
image: k8s.gcr.io/kube-controller-manager:v1.18.8
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.6
image: k8s.gcr.io/kube-proxy:v1.18.8
podCIDR: 10.2.0.0/16
trustedCertsDir: /usr/share/ca-certificates
kubeScheduler:
image: k8s.gcr.io/kube-scheduler:v1.18.6
image: k8s.gcr.io/kube-scheduler:v1.18.8
controlPlaneReplicas: 1
kubeConfigInCluster:
server:
Expand Down
4 changes: 2 additions & 2 deletions assets/terraform-modules/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 @@ -146,7 +146,7 @@ storage:
# Wrapper for bootkube start
set -e
# Pre-pull kubelet image because when it is later pulled but takes too long it times out
docker pull quay.io/poseidon/kubelet:v1.18.6
docker pull quay.io/poseidon/kubelet:v1.18.8
# 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 assets/terraform-modules/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node,${node_labels}"
NODE_TAINTS="${taints}"
Expand Down Expand Up @@ -137,7 +137,7 @@ storage:
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
--insecure-options=image \
docker://quay.io/poseidon/kubelet:v1.18.6 \
docker://quay.io/poseidon/kubelet:v1.18.8 \
--net=host \
--dns=host \
-- \
Expand Down
2 changes: 1 addition & 1 deletion assets/terraform-modules/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 assets/terraform-modules/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node"
- path: /etc/sysctl.d/max-user-watches.conf
Expand All @@ -120,7 +120,7 @@ storage:
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
--insecure-options=image \
docker://quay.io/poseidon/kubelet:v1.18.6 \
docker://quay.io/poseidon/kubelet:v1.18.8 \
--net=host \
--dns=host \
-- \
Expand Down
4 changes: 2 additions & 2 deletions assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 @@ -161,7 +161,7 @@ storage:
# Wrapper for bootkube start
set -e
# Pre-pull kubelet image because when it is later pulled but takes too long it times out
docker pull quay.io/poseidon/kubelet:v1.18.6
docker pull quay.io/poseidon/kubelet:v1.18.8
# 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 assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="${join(",", [for k, v in kubelet_labels : "${k}=${v}"])}"
- path: /etc/hostname
Expand Down
10 changes: 5 additions & 5 deletions assets/terraform-modules/bootkube/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ variable "container_images" {
calico_cni = "calico/cni:v3.15.2"
calico_controllers = "calico/kube-controllers:v3.15.2"
flexvol_driver_image = "calico/pod2daemon-flexvol:v3.15.2"
kubelet_image = "quay.io/poseidon/kubelet:v1.18.6"
kubelet_image = "quay.io/poseidon/kubelet:v1.18.8"
coredns = "coredns/coredns:coredns-"
pod_checkpointer = "kinvolk/pod-checkpointer:d1c58443fe7d7d33aa5bf7d80d65d299be6e5847"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.6"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.6"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.6"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.18.6"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.18.8"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.8"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.18.8"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.18.8"
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/terraform-modules/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 assets/terraform-modules/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node"
- path: /etc/sysctl.d/max-user-watches.conf
Expand All @@ -116,7 +116,7 @@ storage:
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
--insecure-options=image \
docker://quay.io/poseidon/kubelet:v1.18.6 \
docker://quay.io/poseidon/kubelet:v1.18.8 \
--net=host \
--dns=host \
-- \
Expand Down
4 changes: 2 additions & 2 deletions assets/terraform-modules/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 kubelet image because when it is later pulled but takes too long it times out
docker pull quay.io/poseidon/kubelet:v1.18.6
docker pull quay.io/poseidon/kubelet:v1.18.8
# 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 assets/terraform-modules/kvm-libvirt/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6
KUBELET_IMAGE_TAG=v1.18.8
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 @@ -142,7 +142,7 @@ storage:
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
--insecure-options=image \
docker://quay.io/poseidon/kubelet:v1.18.6 \
docker://quay.io/poseidon/kubelet:v1.18.8 \
--net=host \
--dns=host \
-- \
Expand Down
4 changes: 2 additions & 2 deletions assets/terraform-modules/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6-${os_arch}
KUBELET_IMAGE_TAG=v1.18.8-${os_arch}
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 @@ -194,7 +194,7 @@ storage:
# Wrapper for bootkube start
set -e
# Pre-pull kubelet image because when it is later pulled but takes too long it times out
docker pull quay.io/poseidon/kubelet:v1.18.6-${os_arch}
docker pull quay.io/poseidon/kubelet:v1.18.8-${os_arch}
# 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 assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.18.6-${os_arch}
KUBELET_IMAGE_TAG=v1.18.8-${os_arch}
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
NODE_LABELS="node.kubernetes.io/node,${node_labels}"
BGP_NODE_LABELS="${bgp_node_labels}"
Expand All @@ -304,7 +304,7 @@ storage:
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
--insecure-options=image \
docker://quay.io/poseidon/kubelet:v1.18.6-${os_arch} \
docker://quay.io/poseidon/kubelet:v1.18.8-${os_arch} \
--net=host \
--dns=host \
-- \
Expand Down
32 changes: 16 additions & 16 deletions pkg/assets/generated_assets.go
View file
Open in desktop

Large diffs are not rendered by default.