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

Update to Kubernetes v1.19.4 and AKS to v1.18.10 #1189

Merged
merged 2 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.2
appVersion: v1.19.3
appVersion: v1.19.4
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kube-apiserver/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/kube-apiserver:v1.19.3
image: k8s.gcr.io/kube-apiserver:v1.19.4
cloudProvider:
etcdServers:
aggregationFlags:
Expand Down
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kubelet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.2
appVersion: v1.19.3
appVersion: v1.19.4
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kubelet/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: quay.io/poseidon/kubelet:v1.19.3
image: quay.io/poseidon/kubelet:v1.19.4
clusterDNS: 10.0.0.10
clusterDomain: cluster.local
enableTLSBootstrap: true
2 changes: 1 addition & 1 deletion assets/charts/control-plane/kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.2
appVersion: v1.19.3
appVersion: v1.19.4
6 changes: 3 additions & 3 deletions assets/charts/control-plane/kubernetes/values.yaml
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.19.3
image: k8s.gcr.io/kube-controller-manager:v1.19.4
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.19.3
image: k8s.gcr.io/kube-proxy:v1.19.4
podCIDR: 10.2.0.0/16
trustedCertsDir: /usr/share/ca-certificates
kubeScheduler:
image: k8s.gcr.io/kube-scheduler:v1.19.3
image: k8s.gcr.io/kube-scheduler:v1.19.4
controlPlaneReplicas: 1
kubeConfigInCluster:
server:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"
- path: /etc/kubernetes/etcd.env
Expand Down Expand Up @@ -187,7 +187,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.19.3
docker pull quay.io/poseidon/kubelet:v1.19.4
# 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 docker run \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
NODE_LABELS="${join(",", [for k, v in node_labels : "${k}=${v}"])}"
NODE_TAINTS="${join(",", [for k, v in taints : "${k}=${v}"])}"
- path: /etc/sysctl.d/max-user-watches.conf
Expand Down
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.19.3
KUBELET_IMAGE_TAG=v1.19.4
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 @@ -100,7 +100,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
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.19.3 \
docker://quay.io/poseidon/kubelet:v1.19.4 \
--net=host \
--dns=host \
-- \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"
- path: /etc/kubernetes/etcd.env
Expand Down Expand Up @@ -198,7 +198,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.19.3
docker pull quay.io/poseidon/kubelet:v1.19.4
# 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 docker 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=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
NODE_LABELS="${join(",", [for k, v in kubelet_labels : "${k}=${v}"])}"
- path: /etc/hostname
filesystem: root
Expand Down
10 changes: 5 additions & 5 deletions assets/terraform-modules/bootkube/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ variable "container_images" {
calico_cni = "calico/cni:v3.16.4"
calico_controllers = "calico/kube-controllers:v3.16.4"
flexvol_driver_image = "calico/pod2daemon-flexvol:v3.16.4"
kubelet_image = "quay.io/poseidon/kubelet:v1.19.3"
kubelet_image = "quay.io/poseidon/kubelet:v1.19.4"
coredns = "coredns/coredns:coredns-"
pod_checkpointer = "kinvolk/pod-checkpointer:d1c58443fe7d7d33aa5bf7d80d65d299be6e5847"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.19.3"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.19.3"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.19.3"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.19.3"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.19.4"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.19.4"
kube_scheduler = "k8s.gcr.io/kube-scheduler:v1.19.4"
kube_proxy = "k8s.gcr.io/kube-proxy:v1.19.4"
}
}

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://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
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 @@ -96,7 +96,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
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.19.3 \
docker://quay.io/poseidon/kubelet:v1.19.4 \
--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://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
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.19.3
docker pull quay.io/poseidon/kubelet:v1.19.4
# 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 @@ -103,7 +103,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3
KUBELET_IMAGE_TAG=v1.19.4
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.19.3 \
docker://quay.io/poseidon/kubelet:v1.19.4 \
--net=host \
--dns=host \
-- \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3-${os_arch}
KUBELET_IMAGE_TAG=v1.19.4-${os_arch}
NODE_LABELS="node.kubernetes.io/master,node.kubernetes.io/controller=true"
NODE_TAINTS="node-role.kubernetes.io/master=:NoSchedule"
- path: /etc/kubernetes/etcd.env
Expand Down Expand Up @@ -238,7 +238,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.19.3-${os_arch}
docker pull quay.io/poseidon/kubelet:v1.19.4-${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 docker run \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/poseidon/kubelet
KUBELET_IMAGE_TAG=v1.19.3-${os_arch}
KUBELET_IMAGE_TAG=v1.19.4-${os_arch}
NODE_LABELS="${join(",", [for k, v in node_labels : "${k}=${v}"])}"
BGP_NODE_LABELS="${bgp_node_labels}"
NODE_TAINTS="${join(",", [for k, v in taints : "${k}=${v}"])}"
Expand Down
Loading