CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-17 01:51:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change container-linux module preference to Flatcar Linux

Browse Source 
* No change to Fedora CoreOS modules
* For Container Linx AWS and Azure, change the `os_image` default
from coreos-stable to flatcar-stable
* For Container Linux GCP and DigitalOcean, change `os_image` to
be required since users should upload a Flatcar Linux image and
set the variable
* For Container Linux bare-metal, recommend users change the
`os_channel` to Flatcar Linux. No actual module change.
This commit is contained in:
Dalton Hubble
2020-04-11 14:52:30 -07:00
parent 1627ecaf27
commit 76ab4c4c2a
17 changed files with 119 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
digital-ocean/container-linux/kubernetes/variables.tf
View File

@ -43,8 +43,7 @@ variable "worker_type" {
variable "os_image" {
type = string
description = "Container Linux image for instances (e.g. coreos-stable)"
default = "coreos-stable"
description = "Container Linux image for instances (e.g. coreos-stable, custom-image-id)"
}
variable "controller_snippets" {
@ -66,12 +65,6 @@ variable "ssh_fingerprints" {
description = "SSH public key fingerprints. (e.g. see `ssh-add -l -E md5`)"
}
variable "asset_dir" {
type = string
description = "Absolute path to a directory where generated assets should be placed (contains secrets)"
default = ""
}
variable "networking" {
type = string
description = "Choice of networking provider (flannel or calico)"
@ -107,6 +100,12 @@ variable "enable_aggregation" {
# unofficial, undocumented, unsupported
variable "asset_dir" {
type = string
description = "Absolute path to a directory where generated assets should be placed (contains secrets)"
default = ""
}
variable "cluster_domain_suffix" {
type = string
description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) "