Skip to content

Commit bc7902f

Browse files
committed
1 parent 70bf39b commit bc7902f

File tree

45 files changed

+110
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+110
-110
lines changed

CHANGES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Notable changes between versions.
3030
* Add `worker_node_labels` map variable for per-worker node labels ([#663](https://github.com/poseidon/typhoon/pull/663))
3131
* Add `worker_node_taints` map variable for per-worker node taints ([#663](https://github.com/poseidon/typhoon/pull/663))
3232

33+
#### DigitalOcean
34+
35+
* Add support for Flatcar Container Linux ([#644](https://github.com/poseidon/typhoon/pull/644))
36+
3337
#### Google Cloud
3438

3539
* Fix `worker_node_labels` on Fedora CoreOS ([#651](https://github.com/poseidon/typhoon/pull/651))
3640
* Fix automatic worker node delete on shutdown on Fedora CoreOS ([#657](https://github.com/poseidon/typhoon/pull/657))
3741

38-
#### DigitalOcean
39-
40-
* Add support for Flatcar Container Linux ([#644](https://github.com/poseidon/typhoon/pull/644))
41-
4242
#### Addons
4343

4444
* Update nginx-ingress from v0.28.0 to [v0.30.0](https://github.com/kubernetes/ingress-nginx/releases/tag/nginx-0.30.0)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
1111

1212
## Features <a href="https://www.cncf.io/certification/software-conformance/"><img align="right" src="https://storage.googleapis.com/poseidon/certified-kubernetes.png"></a>
1313

14-
* Kubernetes v1.17.3 (upstream)
14+
* Kubernetes v1.17.4 (upstream)
1515
* Single or multi-master, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking
1616
* 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/)
1717
* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization
@@ -59,7 +59,7 @@ Define a Kubernetes cluster by using the Terraform module for your chosen platfo
5959

6060
```tf
6161
module "yavin" {
62-
source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.17.3"
62+
source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.17.4"
6363
6464
# Google Cloud
6565
cluster_name = "yavin"
@@ -98,9 +98,9 @@ In 4-8 minutes (varies by platform), the cluster will be ready. This Google Clou
9898
$ export KUBECONFIG=/home/user/.kube/configs/yavin-config
9999
$ kubectl get nodes
100100
NAME ROLES STATUS AGE VERSION
101-
yavin-controller-0.c.example-com.internal <none> Ready 6m v1.17.3
102-
yavin-worker-jrbf.c.example-com.internal <none> Ready 5m v1.17.3
103-
yavin-worker-mzdm.c.example-com.internal <none> Ready 5m v1.17.3
101+
yavin-controller-0.c.example-com.internal <none> Ready 6m v1.17.4
102+
yavin-worker-jrbf.c.example-com.internal <none> Ready 5m v1.17.4
103+
yavin-worker-mzdm.c.example-com.internal <none> Ready 5m v1.17.4
104104
```
105105

106106
List the pods.

aws/container-linux/kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
1111

1212
## Features <a href="https://www.cncf.io/certification/software-conformance/"><img align="right" src="https://storage.googleapis.com/poseidon/certified-kubernetes.png"></a>
1313

14-
* Kubernetes v1.17.3 (upstream)
14+
* Kubernetes v1.17.4 (upstream)
1515
* Single or multi-master, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking
1616
* 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/)
1717
* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot](https://typhoon.psdn.io/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization

aws/container-linux/kubernetes/bootstrap.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kubernetes assets (kubeconfig, manifests)
22
module "bootstrap" {
3-
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=804029edd5a6a5cf02e0db4919e7f2bb601d0089"
3+
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=73784c1b2c791d9ba586a1478979ac34dd324dad"
44

55
cluster_name = var.cluster_name
66
api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)]

aws/container-linux/kubernetes/cl/controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ systemd:
9191
--mount volume=var-log,target=/var/log \
9292
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \
9393
--mount volume=opt-cni-bin,target=/opt/cni/bin \
94-
docker://k8s.gcr.io/hyperkube:v1.17.3 \
94+
docker://k8s.gcr.io/hyperkube:v1.17.4 \
9595
--exec=/usr/local/bin/kubelet -- \
9696
--anonymous-auth=false \
9797
--authentication-token-webhook \
@@ -136,7 +136,7 @@ systemd:
136136
--volume script,kind=host,source=/opt/bootstrap/apply \
137137
--mount volume=script,target=/apply \
138138
--insecure-options=image \
139-
docker://k8s.gcr.io/hyperkube:v1.17.3 \
139+
docker://k8s.gcr.io/hyperkube:v1.17.4 \
140140
--net=host \
141141
--dns=host \
142142
--exec=/apply

aws/container-linux/kubernetes/workers/cl/worker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ systemd:
6464
--mount volume=var-log,target=/var/log \
6565
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \
6666
--mount volume=opt-cni-bin,target=/opt/cni/bin \
67-
docker://k8s.gcr.io/hyperkube:v1.17.3 \
67+
docker://k8s.gcr.io/hyperkube:v1.17.4 \
6868
--exec=/usr/local/bin/kubelet -- \
6969
--anonymous-auth=false \
7070
--authentication-token-webhook \
@@ -128,7 +128,7 @@ storage:
128128
--volume config,kind=host,source=/etc/kubernetes \
129129
--mount volume=config,target=/etc/kubernetes \
130130
--insecure-options=image \
131-
docker://k8s.gcr.io/hyperkube:v1.17.3 \
131+
docker://k8s.gcr.io/hyperkube:v1.17.4 \
132132
--net=host \
133133
--dns=host \
134134
-- \

aws/fedora-coreos/kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster
1111

1212
## Features <a href="https://www.cncf.io/certification/software-conformance/"><img align="right" src="https://storage.googleapis.com/poseidon/certified-kubernetes.png"></a>
1313

14-
* Kubernetes v1.17.3 (upstream)
14+
* Kubernetes v1.17.4 (upstream)
1515
* Single or multi-master, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking
1616
* 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/)
1717
* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot](https://typhoon.psdn.io/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization

aws/fedora-coreos/kubernetes/bootstrap.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kubernetes assets (kubeconfig, manifests)
22
module "bootstrap" {
3-
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=804029edd5a6a5cf02e0db4919e7f2bb601d0089"
3+
source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=73784c1b2c791d9ba586a1478979ac34dd324dad"
44

55
cluster_name = var.cluster_name
66
api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)]

aws/fedora-coreos/kubernetes/fcc/controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ systemd:
7979
--volume /var/log:/var/log \
8080
--volume /var/run/lock:/var/run/lock:z \
8181
--volume /opt/cni/bin:/opt/cni/bin:z \
82-
k8s.gcr.io/hyperkube:v1.17.3 kubelet \
82+
k8s.gcr.io/hyperkube:v1.17.4 kubelet \
8383
--anonymous-auth=false \
8484
--authentication-token-webhook \
8585
--authorization-mode=Webhook \
@@ -123,7 +123,7 @@ systemd:
123123
--volume /opt/bootstrap/assets:/assets:ro,Z \
124124
--volume /opt/bootstrap/apply:/apply:ro,Z \
125125
--entrypoint=/apply \
126-
k8s.gcr.io/hyperkube:v1.17.3
126+
k8s.gcr.io/hyperkube:v1.17.4
127127
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
128128
ExecStartPost=-/usr/bin/podman stop bootstrap
129129
storage:

aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ systemd:
4949
--volume /var/log:/var/log \
5050
--volume /var/run/lock:/var/run/lock:z \
5151
--volume /opt/cni/bin:/opt/cni/bin:z \
52-
k8s.gcr.io/hyperkube:v1.17.3 kubelet \
52+
k8s.gcr.io/hyperkube:v1.17.4 kubelet \
5353
--anonymous-auth=false \
5454
--authentication-token-webhook \
5555
--authorization-mode=Webhook \
@@ -87,7 +87,7 @@ systemd:
8787
Type=oneshot
8888
RemainAfterExit=true
8989
ExecStart=/bin/true
90-
ExecStop=/bin/bash -c '/usr/bin/podman run --volume /etc/kubernetes:/etc/kubernetes:ro,z k8s.gcr.io/hyperkube:v1.17.3 kubectl --kubeconfig=/etc/kubernetes/kubeconfig delete node $HOSTNAME'
90+
ExecStop=/bin/bash -c '/usr/bin/podman run --volume /etc/kubernetes:/etc/kubernetes:ro,z k8s.gcr.io/hyperkube:v1.17.4 kubectl --kubeconfig=/etc/kubernetes/kubeconfig delete node $HOSTNAME'
9191
[Install]
9292
WantedBy=multi-user.target
9393
storage:

0 commit comments

Comments
 (0)