From 7f7bc960a628c09914532391865753a57c85c965 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 19 Mar 2018 00:06:37 -0700 Subject: [PATCH] Set default Google Cloud os_image to coreos-stable --- CHANGES.md | 1 + docs/aws.md | 2 +- docs/digital-ocean.md | 2 +- docs/google-cloud.md | 4 ++-- google-cloud/container-linux/kubernetes/variables.tf | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index aff9b64e..6e9d8f5d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,7 @@ Notable changes between versions. #### Google Cloud * [Require](https://typhoon.psdn.io/topics/maintenance/#terraform-provider-ct-v021) updating `terraform-provider-ct` plugin from v0.2.0 to [v0.2.1](https://github.com/coreos/terraform-provider-ct/releases/tag/v0.2.1) (action required!) +* Relax `os_image` to optional. Default to "coreos-stable". #### Addons diff --git a/docs/aws.md b/docs/aws.md index 7499291f..3ce704f8 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -225,7 +225,6 @@ Learn about [maintenance](topics/maintenance.md) and [addons](addons/overview.md | dns_zone | AWS Route53 DNS zone | "aws.example.com" | | dns_zone_id | AWS Route53 DNS zone id | "Z3PAABBCFAKEC0" | | ssh_authorized_key | SSH public key for ~/.ssh_authorized_keys | "ssh-rsa AAAAB3NZ..." | -| os_channel | Container Linux AMI channel | stable, beta, alpha | | asset_dir | Path to a directory where generated assets should be placed (contains secrets) | "/home/user/.secrets/clusters/tempest" | #### DNS Zone @@ -253,6 +252,7 @@ Reference the DNS zone id with `"${aws_route53_zone.zone-for-clusters.zone_id}"` | controller_type | Controller EC2 instance type | "t2.small" | "t2.medium" | | worker_count | Number of workers | 1 | 3 | | worker_type | Worker EC2 instance type | "t2.small" | "t2.medium" | +| os_channel | Container Linux AMI channel | stable | stable, beta, alpha | | disk_size | Size of the EBS volume in GB | "40" | "100" | | networking | Choice of networking provider | "calico" | "calico" or "flannel" | | network_mtu | CNI interface MTU (calico only) | 1480 | 8981 | diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 782fb451..522f86a3 100644 --- a/docs/digital-ocean.md +++ b/docs/digital-ocean.md @@ -260,11 +260,11 @@ Digital Ocean requires the SSH public key be uploaded to your account, so you ma | Name | Description | Default | Example | |:-----|:------------|:--------|:--------| -| image | OS image for droplets | "coreos-stable" | coreos-stable, coreos-beta, coreos-alpha | | controller_count | Number of controllers (i.e. masters) | 1 | 1 | | controller_type | Digital Ocean droplet size | s-2vcpu-2gb | s-2vcpu-2gb, s-2vcpu-4gb, s-4vcpu-8gb, ... | | worker_count | Number of workers | 1 | 3 | | worker_type | Digital Ocean droplet size | s-1vcpu-1gb | s-1vcpu-1gb, s-1vcpu-2gb, s-2vcpu-2gb, ... | +| image | OS image for droplets | "coreos-stable" | coreos-stable, coreos-beta, coreos-alpha | | networking | Choice of networking provider | "flannel" | "flannel" | | pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | | service_cidr | CIDR range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 449ed1eb..93c673b4 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -228,7 +228,6 @@ Learn about [maintenance](topics/maintenance.md) and [addons](addons/overview.md | dns_zone | Google Cloud DNS zone | "google-cloud.example.com" | | dns_zone_name | Google Cloud DNS zone name | "example-zone" | | ssh_authorized_key | SSH public key for ~/.ssh_authorized_keys | "ssh-rsa AAAAB3NZ..." | -| os_image | OS image for compute instances | "coreos-stable" | | 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`. @@ -254,9 +253,10 @@ resource "google_dns_managed_zone" "zone-for-clusters" { | Name | Description | Default | Example | |:-----|:------------|:--------|:--------| -| machine_type | Machine type for compute instances | "n1-standard-1" | See below | | controller_count | Number of controllers (i.e. masters) | 1 | 1 | | worker_count | Number of workers | 1 | 3 | +| machine_type | Machine type for compute instances | "n1-standard-1" | See below | +| os_image | OS image for compute instances | "coreos-stable" | "coreos-stable-1632-3-0-v20180215" | | worker_preemptible | If enabled, Compute Engine will terminate workers randomly within 24 hours | false | true | | networking | Choice of networking provider | "calico" | "calico" or "flannel" | | pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/container-linux/kubernetes/variables.tf index 76183cf1..d536a5ca 100644 --- a/google-cloud/container-linux/kubernetes/variables.tf +++ b/google-cloud/container-linux/kubernetes/variables.tf @@ -31,6 +31,7 @@ variable "machine_type" { variable "os_image" { type = "string" + default = "coreos-stable" description = "OS image from which to initialize the disk (see `gcloud compute images list`)" }