From d02af3d40d1dcfc42d0d4a0400d52ee16d8575a2 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 29 Jan 2019 22:56:03 -0800 Subject: [PATCH] Update mkdocs-material from v3.2.0 to v3.3.0 * Fix minor docs typos and errors * Allow a transient verison of the six PyPi package, the docs build system can use the 0.12.0 (0.11.0 broke sync tools so pinning to 0.10.0 was previously needed) --- docs/addons/heapster.md | 2 +- docs/announce.md | 2 +- docs/atomic/digital-ocean.md | 2 +- docs/cl/aws.md | 2 +- docs/cl/azure.md | 2 +- docs/cl/digital-ocean.md | 2 +- docs/index.md | 4 ++-- requirements.txt | 3 +-- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/addons/heapster.md b/docs/addons/heapster.md index 7078bcf3..e1013544 100644 --- a/docs/addons/heapster.md +++ b/docs/addons/heapster.md @@ -1,6 +1,6 @@ # Heapster -[Heapster](https://kubernetes.io/docs/user-guide/monitoring/) collects data from apiservers and kubelets and exposes it through a REST API. This API powers the `kubectl top` command and Kubernetes dashboard graphs. +[Heapster](https://kubernetes.io/docs/user-guide/monitoring/) collects data from apiservers and kubelets and exposes it through a REST API. This API powers the `kubectl top` command. ## Create diff --git a/docs/announce.md b/docs/announce.md index c1988966..ab1467cb 100644 --- a/docs/announce.md +++ b/docs/announce.md @@ -18,7 +18,7 @@ Fedora Atomic is a container-optimized operating system designed for large-scale For newcomers, Typhoon is a free (cost and freedom) Kubernetes distribution providing upstream Kubernetes, declarative configuration via [Terraform](https://www.terraform.io/intro/index.html), and support for AWS, Google Cloud, DigitalOcean, and bare-metal. Typhoon clusters use a [self-hosted](https://github.com/kubernetes-incubator/bootkube) control plane, support [Calico](https://www.projectcalico.org/blog/) and [flannel](https://coreos.com/flannel/docs/latest/) CNI networking, and enable etcd TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/), and network policy. -Typhoon for Fedora Atomic reflects many of the same principles that created Typhoon for Container Linux. Clusters are declared using plain Terraform configs that can be versioned. In lieu of Ignition, instances are declaratively provisioned with Cloud-Init and kickstart (bare-metal only). TLS assets are generated. Hosts run only a kubelet service, other components are scheduled (i.e. self-hosted). The upstream hyperkube is used directly[^1]. And clusters are kept minimal by offering optional addons for [Ingress](https://typhoon.psdn.io/addons/ingress/), [Prometheus](https://typhoon.psdn.io/addons/prometheus/), and [Grafana](https://typhoon.psdn.io/addons/grafana/). Typhoon compliments and enhances Fedora Atomic as a choice of operating system for Kubernetes. +Typhoon for Fedora Atomic reflects many of the same principles that created Typhoon for Container Linux. Clusters are declared using plain Terraform configs that can be versioned. In lieu of Ignition, instances are declaratively provisioned with Cloud-Init and kickstart (bare-metal only). TLS assets are generated. Hosts run only a kubelet service, other components are scheduled (i.e. self-hosted). The upstream hyperkube is used directly[^1]. And clusters are kept minimal by offering optional addons for [Ingress](/addons/ingress/), [Prometheus](/addons/prometheus/), and [Grafana](/addons/grafana/). Typhoon compliments and enhances Fedora Atomic as a choice of operating system for Kubernetes. Meanwhile, Fedora Atomic adds some promising new low-level technologies: diff --git a/docs/atomic/digital-ocean.md b/docs/atomic/digital-ocean.md index bf9c18f1..db78c16e 100644 --- a/docs/atomic/digital-ocean.md +++ b/docs/atomic/digital-ocean.md @@ -204,9 +204,9 @@ Clusters create DNS A records `${cluster_name}.${dns_zone}` to resolve to contro You'll need a registered domain name or delegated subdomain in Digital Ocean Domains (i.e. DNS zones). You can set this up once and create many clusters with unique names. ```tf +# Declare a DigitalOcean record to also create a zone file resource "digitalocean_domain" "zone-for-clusters" { name = "do.example.com" - # Digital Ocean oddly requires an IP here. You may have to delete the A record it makes. :( ip_address = "8.8.8.8" } ``` diff --git a/docs/cl/aws.md b/docs/cl/aws.md index 7b1421de..d3a6eb5f 100644 --- a/docs/cl/aws.md +++ b/docs/cl/aws.md @@ -113,7 +113,7 @@ module "aws-tempest" { # optional worker_count = 2 - worker_type = "t2.medium" + worker_type = "t3.small" } ``` diff --git a/docs/cl/azure.md b/docs/cl/azure.md index bedf0082..6f8d9400 100644 --- a/docs/cl/azure.md +++ b/docs/cl/azure.md @@ -249,7 +249,7 @@ Reference the DNS zone with `"${azurerm_dns_zone.clusters.name}"` and its resour | controller_type | Machine type for controllers | "Standard_DS1_v2" | See below | | worker_type | Machine type for workers | "Standard_F1" | See below | | os_image | Channel for a Container Linux derivative | coreos-stable | coreos-stable, coreos-beta, coreos-alpha | -| disk_size | Size of the disk GB | "40" | "100" | +| disk_size | Size of the disk in GB | "40" | "100" | | worker_priority | Set priority to Low to use reduced cost surplus capacity, with the tradeoff that instances can be deallocated at any time | Regular | Low | | controller_clc_snippets | Controller Container Linux Config snippets | [] | [example](/advanced/customization/#usage) | | worker_clc_snippets | Worker Container Linux Config snippets | [] | [example](/advanced/customization/#usage) | diff --git a/docs/cl/digital-ocean.md b/docs/cl/digital-ocean.md index a28c4c90..a70704f7 100644 --- a/docs/cl/digital-ocean.md +++ b/docs/cl/digital-ocean.md @@ -214,9 +214,9 @@ Clusters create DNS A records `${cluster_name}.${dns_zone}` to resolve to contro You'll need a registered domain name or delegated subdomain in Digital Ocean Domains (i.e. DNS zones). You can set this up once and create many clusters with unique names. ```tf +# Declare a DigitalOcean record to also create a zone file resource "digitalocean_domain" "zone-for-clusters" { name = "do.example.com" - # Digital Ocean oddly requires an IP here. You may have to delete the A record it makes. :( ip_address = "8.8.8.8" } ``` diff --git a/docs/index.md b/docs/index.md index a4892674..f1d8ceed 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,8 +14,8 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.13.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, [Calico](https://www.projectcalico.org/) 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/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization -* Ready for Ingress, Prometheus, Grafana, CSI, or other [addons](https://typhoon.psdn.io/addons/overview/) +* Advanced features like [worker pools](advanced/worker-pools/), [preemptible](cl/google-cloud/#preemption) workers, and [snippets](advanced/customization/#container-linux) customization +* Ready for Ingress, Prometheus, Grafana, CSI, or other [addons](addons/overview/) ## Modules diff --git a/requirements.txt b/requirements.txt index 9fd00941..fc78f3c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ mkdocs==1.0.4 -mkdocs-material==3.2.0 +mkdocs-material==3.3.0 pygments==2.2.0 pymdown-extensions==5.0.0 -six==1.10.0