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

Remove some seldom used variables and set reasonable 

* Set reasonable values and remove some variable clutter
* enable_reporting is only used with Calico and we can just default
to false, I doubt anyone uses Calico and cares much about reporting
metrics to upstream Calico
This commit is contained in:
Dalton Hubble 2024-08-02 20:45:37 -07:00
parent 83f1bd2373
commit 6e2daded02
No known key found for this signature in database
GPG Key ID: BD34C2E3EF32B7A0
21 changed files with 8 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -4,7 +4,9 @@ Notable changes between versions.
## Latest
* Remove `enable_aggregation` variable for Kubernetes Aggregation Layer, always set to true
* Remove `cluster_domain_suffix` variable, always use "cluster.local"
* Remove `enable_reporting` variable for analytics, always set to false
## v1.30.3

2
aws/fedora-coreos/kubernetes/bootstrap.tf
View File

@ -9,8 +9,6 @@ module "bootstrap" {
network_mtu = var.network_mtu
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components
}

12
aws/fedora-coreos/kubernetes/variables.tf
View File

@ -172,18 +172,6 @@ variable "worker_node_labels" {
# advanced
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "controller_arch" {
type = string
description = "Controller node(s) architecture (amd64 or arm64)"

2
aws/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -9,8 +9,6 @@ module "bootstrap" {
network_mtu = var.network_mtu
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components
}

12
aws/flatcar-linux/kubernetes/variables.tf
View File

@ -172,18 +172,6 @@ variable "worker_node_labels" {
# advanced
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "controller_arch" {
type = string
description = "Controller node(s) architecture (amd64 or arm64)"

2
azure/fedora-coreos/kubernetes/bootstrap.tf
View File

@ -14,8 +14,6 @@ module "bootstrap" {
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components
}

12
azure/fedora-coreos/kubernetes/variables.tf
View File

@ -152,18 +152,6 @@ variable "worker_node_labels" {
# advanced
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "daemonset_tolerations" {
type = list(string)
description = "List of additional taint keys kube-system DaemonSets should tolerate (e.g. ['custom-role', 'gpu-role'])"

2
azure/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -14,8 +14,6 @@ module "bootstrap" {
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components
}

12
azure/flatcar-linux/kubernetes/variables.tf
View File

@ -150,18 +150,6 @@ EOD
default = "10.3.0.0/16"
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "worker_node_labels" {
type = list(string)
description = "List of initial worker node labels"

2
bare-metal/fedora-coreos/kubernetes/bootstrap.tf
View File

@ -10,8 +10,6 @@ module "bootstrap" {
network_ip_autodetection_method = var.network_ip_autodetection_method
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
components = var.components
}

12
bare-metal/fedora-coreos/kubernetes/variables.tf
View File

@ -139,18 +139,6 @@ variable "kernel_args" {
default = []
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
# advanced
variable "components" {

2
bare-metal/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -10,8 +10,6 @@ module "bootstrap" {
network_ip_autodetection_method = var.network_ip_autodetection_method
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
components = var.components
}

12
bare-metal/flatcar-linux/kubernetes/variables.tf
View File

@ -144,18 +144,6 @@ variable "kernel_args" {
default = []
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "oem_type" {
type = string
description = <<EOD

8
digital-ocean/fedora-coreos/kubernetes/bootstrap.tf
View File

@ -11,10 +11,8 @@ module "bootstrap" {
network_encapsulation = "vxlan"
network_mtu = "1450"
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
components = var.components
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
components = var.components
}

12
digital-ocean/fedora-coreos/kubernetes/variables.tf
View File

@ -86,18 +86,6 @@ EOD
default = "10.3.0.0/16"
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
# advanced
variable "components" {

8
digital-ocean/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -11,10 +11,8 @@ module "bootstrap" {
network_encapsulation = "vxlan"
network_mtu = "1450"
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
components = var.components
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
components = var.components
}

12
digital-ocean/flatcar-linux/kubernetes/variables.tf
View File

@ -86,18 +86,6 @@ EOD
default = "10.3.0.0/16"
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
# advanced
variable "components" {

2
google-cloud/fedora-coreos/kubernetes/bootstrap.tf
View File

@ -9,8 +9,6 @@ module "bootstrap" {
network_mtu = 1440
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components

13
google-cloud/fedora-coreos/kubernetes/variables.tf
View File

@ -115,19 +115,6 @@ EOD
default = "10.3.0.0/16"
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "worker_node_labels" {
type = list(string)
description = "List of initial worker node labels"

2
google-cloud/flatcar-linux/kubernetes/bootstrap.tf
View File

@ -9,8 +9,6 @@ module "bootstrap" {
network_mtu = 1440
pod_cidr = var.pod_cidr
service_cidr = var.service_cidr
enable_reporting = var.enable_reporting
enable_aggregation = var.enable_aggregation
daemonset_tolerations = var.daemonset_tolerations
components = var.components

12
google-cloud/flatcar-linux/kubernetes/variables.tf
View File

@ -115,18 +115,6 @@ EOD
default = "10.3.0.0/16"
}
variable "enable_reporting" {
type = bool
description = "Enable usage or analytics reporting to upstreams (Calico)"
default = false
}
variable "enable_aggregation" {
type = bool
description = "Enable the Kubernetes Aggregation Layer"
default = true
}
variable "worker_node_labels" {
type = list(string)
description = "List of initial worker node labels"