CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Container Linux version shown in docs 

* Be sure docs and examples list Container Linux versions that
have been patched for Meltdown just in case someone copy-pastes
or sees them as recent versions
This commit is contained in:
Dalton Hubble 2018-01-06 14:58:38 -08:00
parent 51a5f64024
commit 7a0a60708e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -49,7 +49,7 @@ module "google-cloud-yavin" {
region = "us-central1" region = "us-central1"
dns_zone = "example.com" dns_zone = "example.com"
dns_zone_name = "example-zone" dns_zone_name = "example-zone"
os_image = "coreos-stable-1576-4-0-v20171206" os_image = "coreos-stable-1576-5-0-v20180105"
cluster_name = "yavin" cluster_name = "yavin"
controller_count = 1 controller_count = 1

2
docs/addons/cluo.md
View File

@ -18,7 +18,7 @@ kubectl apply -f addons/cluo -R
$ kubectl get nodes --show-labels $ kubectl get nodes --show-labels
... ...
container-linux-update.v1.coreos.com/group=stable container-linux-update.v1.coreos.com/group=stable
container-linux-update.v1.coreos.com/version=1576.4.0 container-linux-update.v1.coreos.com/version=1576.5.0
``` ```
`update-operator` ensures one node reboots at a time and that pods are drained prior to reboot. `update-operator` ensures one node reboots at a time and that pods are drained prior to reboot.

4
docs/bare-metal.md
View File

@ -162,7 +162,7 @@ module "bare-metal-mercury" {
# install # install
matchbox_http_endpoint = "http://matchbox.example.com" matchbox_http_endpoint = "http://matchbox.example.com"
container_linux_channel = "stable" container_linux_channel = "stable"
container_linux_version = "1576.4.0" container_linux_version = "1576.5.0"
ssh_authorized_key = "ssh-rsa AAAAB3Nz..." ssh_authorized_key = "ssh-rsa AAAAB3Nz..."
# cluster # cluster
@ -332,7 +332,7 @@ Learn about [version pinning](concepts.md#versioning), maintenance, and [addons]
|:-----|:------------|:--------| |:-----|:------------|:--------|
| matchbox_http_endpoint | Matchbox HTTP read-only endpoint | http://matchbox.example.com:8080 | | matchbox_http_endpoint | Matchbox HTTP read-only endpoint | http://matchbox.example.com:8080 |
| container_linux_channel | Container Linux channel | stable, beta, alpha | | container_linux_channel | Container Linux channel | stable, beta, alpha |
| container_linux_version | Container Linux version of the kernel/initrd to PXE and the image to install | 1576.4.0 | | container_linux_version | Container Linux version of the kernel/initrd to PXE and the image to install | 1576.5.0 |
| cluster_name | Cluster name | mercury | | cluster_name | Cluster name | mercury |
| k8s_domain_name | FQDN resolving to the controller(s) nodes. Workers and kubectl will communicate with this endpoint | "myk8s.example.com" | | k8s_domain_name | FQDN resolving to the controller(s) nodes. Workers and kubectl will communicate with this endpoint | "myk8s.example.com" |
| ssh_authorized_key | SSH public key for ~/.ssh/authorized_keys | "ssh-rsa AAAAB3Nz..." | | ssh_authorized_key | SSH public key for ~/.ssh/authorized_keys | "ssh-rsa AAAAB3Nz..." |

4
docs/google-cloud.md
View File

@ -80,7 +80,7 @@ module "google-cloud-yavin" {
region = "us-central1" region = "us-central1"
dns_zone = "example.com" dns_zone = "example.com"
dns_zone_name = "example-zone" dns_zone_name = "example-zone"
os_image = "coreos-stable-1576-4-0-v20171206" os_image = "coreos-stable-1576-5-0-v20180105"
cluster_name = "yavin" cluster_name = "yavin"
controller_count = 1 controller_count = 1
@ -197,7 +197,7 @@ Learn about [version pinning](concepts.md#versioning), maintenance, and [addons]
| dns_zone | Google Cloud DNS zone | "google-cloud.example.com" | | dns_zone | Google Cloud DNS zone | "google-cloud.example.com" |
| dns_zone_name | Google Cloud DNS zone name | "example-zone" | | dns_zone_name | Google Cloud DNS zone name | "example-zone" |
| ssh_authorized_key | SSH public key for ~/.ssh_authorized_keys | "ssh-rsa AAAAB3NZ..." | | ssh_authorized_key | SSH public key for ~/.ssh_authorized_keys | "ssh-rsa AAAAB3NZ..." |
| os_image | OS image for compute instances | "coreos-stable-1576-4-0-v20171206" | | os_image | OS image for compute instances | "coreos-stable-1576-5-0-v20180105" |
| asset_dir | Path to a directory where generated assets should be placed (contains secrets) | "/home/user/.secrets/clusters/yavin" | | asset_dir | Path to a directory where generated assets should be placed (contains secrets) | "/home/user/.secrets/clusters/yavin" |
Check the list of valid [regions](https://cloud.google.com/compute/docs/regions-zones/regions-zones) and list Container Linux [images](https://cloud.google.com/compute/docs/images) with `gcloud compute images list | grep coreos`. Check the list of valid [regions](https://cloud.google.com/compute/docs/regions-zones/regions-zones) and list Container Linux [images](https://cloud.google.com/compute/docs/images) with `gcloud compute images list | grep coreos`.

2
docs/index.md
View File

@ -49,7 +49,7 @@ module "google-cloud-yavin" {
region = "us-central1" region = "us-central1"
dns_zone = "example.com" dns_zone = "example.com"
dns_zone_name = "example-zone" dns_zone_name = "example-zone"
os_image = "coreos-stable-1576-4-0-v20171206" os_image = "coreos-stable-1576-5-0-v20180105"
cluster_name = "yavin" cluster_name = "yavin"
controller_count = 1 controller_count = 1