CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-23 10:41:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Kubernetes from v1.21.1 to v1.21.2

Browse Source 
* https://github.com/kubernetes/kubernetes/releases/tag/v1.21.2
This commit is contained in:
Dalton Hubble
2021-06-17 16:15:20 -07:00
parent e8513e58bb
commit 0b276b6b7e
57 changed files with 147 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
google-cloud/flatcar-linux/kubernetes/README.md
View File

@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
## Features <a href="https://www.cncf.io/certification/software-conformance/"><img align="right" src="https://storage.googleapis.com/poseidon/certified-kubernetes.png"></a>
* Kubernetes v1.21.1 (upstream)
* Kubernetes v1.21.2 (upstream)
* Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/flatcar-linux/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization

2
google-cloud/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -1,6 +1,6 @@
# Kubernetes assets (kubeconfig, manifests)
module "bootstrap" {
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=33a85e660370856f383d7df22e663c3a76ceef35"
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=e1543746cb059ef0f0ba9c623182f79e9a1ef1ac"
cluster_name = var.cluster_name
api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)]

4
google-cloud/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -55,7 +55,7 @@ systemd:
After=docker.service
Wants=rpc-statd.service
[Service]
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.1
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.2
ExecStartPre=/bin/mkdir -p /etc/cni/net.d
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /opt/cni/bin
@ -115,7 +115,7 @@ systemd:
Type=oneshot
RemainAfterExit=true
WorkingDirectory=/opt/bootstrap
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.1
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.2
ExecStart=/usr/bin/docker run \
-v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \
-v /opt/bootstrap/assets:/assets:ro \

4
google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml
View File

@ -27,7 +27,7 @@ systemd:
After=docker.service
Wants=rpc-statd.service
[Service]
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.1
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.2
ExecStartPre=/bin/mkdir -p /etc/cni/net.d
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /opt/cni/bin
@ -90,7 +90,7 @@ systemd:
[Unit]
Description=Delete Kubernetes node on shutdown
[Service]
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.1
Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.21.2
Type=oneshot
RemainAfterExit=true
ExecStart=/bin/true