From 6e2daded02b5d20dd7c889de330c20af9867b1a7 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 2 Aug 2024 20:45:37 -0700 Subject: [PATCH] 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 --- CHANGES.md | 2 ++ aws/fedora-coreos/kubernetes/bootstrap.tf | 2 -- aws/fedora-coreos/kubernetes/variables.tf | 12 ------------ aws/flatcar-linux/kubernetes/bootstrap.tf | 2 -- aws/flatcar-linux/kubernetes/variables.tf | 12 ------------ azure/fedora-coreos/kubernetes/bootstrap.tf | 2 -- azure/fedora-coreos/kubernetes/variables.tf | 12 ------------ azure/flatcar-linux/kubernetes/bootstrap.tf | 2 -- azure/flatcar-linux/kubernetes/variables.tf | 12 ------------ bare-metal/fedora-coreos/kubernetes/bootstrap.tf | 2 -- bare-metal/fedora-coreos/kubernetes/variables.tf | 12 ------------ bare-metal/flatcar-linux/kubernetes/bootstrap.tf | 2 -- bare-metal/flatcar-linux/kubernetes/variables.tf | 12 ------------ digital-ocean/fedora-coreos/kubernetes/bootstrap.tf | 8 +++----- digital-ocean/fedora-coreos/kubernetes/variables.tf | 12 ------------ digital-ocean/flatcar-linux/kubernetes/bootstrap.tf | 8 +++----- digital-ocean/flatcar-linux/kubernetes/variables.tf | 12 ------------ google-cloud/fedora-coreos/kubernetes/bootstrap.tf | 2 -- google-cloud/fedora-coreos/kubernetes/variables.tf | 13 ------------- google-cloud/flatcar-linux/kubernetes/bootstrap.tf | 2 -- google-cloud/flatcar-linux/kubernetes/variables.tf | 12 ------------ 21 files changed, 8 insertions(+), 147 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index aa3e607c..25cd17f0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/aws/fedora-coreos/kubernetes/bootstrap.tf b/aws/fedora-coreos/kubernetes/bootstrap.tf index a018652c..ca307ca6 100644 --- a/aws/fedora-coreos/kubernetes/bootstrap.tf +++ b/aws/fedora-coreos/kubernetes/bootstrap.tf @@ -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 } diff --git a/aws/fedora-coreos/kubernetes/variables.tf b/aws/fedora-coreos/kubernetes/variables.tf index 3b8a10ac..f54506b5 100644 --- a/aws/fedora-coreos/kubernetes/variables.tf +++ b/aws/fedora-coreos/kubernetes/variables.tf @@ -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)" diff --git a/aws/flatcar-linux/kubernetes/bootstrap.tf b/aws/flatcar-linux/kubernetes/bootstrap.tf index a018652c..ca307ca6 100644 --- a/aws/flatcar-linux/kubernetes/bootstrap.tf +++ b/aws/flatcar-linux/kubernetes/bootstrap.tf @@ -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 } diff --git a/aws/flatcar-linux/kubernetes/variables.tf b/aws/flatcar-linux/kubernetes/variables.tf index fcf55277..9c267385 100644 --- a/aws/flatcar-linux/kubernetes/variables.tf +++ b/aws/flatcar-linux/kubernetes/variables.tf @@ -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)" diff --git a/azure/fedora-coreos/kubernetes/bootstrap.tf b/azure/fedora-coreos/kubernetes/bootstrap.tf index 285ced2f..bbd2b854 100644 --- a/azure/fedora-coreos/kubernetes/bootstrap.tf +++ b/azure/fedora-coreos/kubernetes/bootstrap.tf @@ -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 } diff --git a/azure/fedora-coreos/kubernetes/variables.tf b/azure/fedora-coreos/kubernetes/variables.tf index d0240c06..decf59b8 100644 --- a/azure/fedora-coreos/kubernetes/variables.tf +++ b/azure/fedora-coreos/kubernetes/variables.tf @@ -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'])" diff --git a/azure/flatcar-linux/kubernetes/bootstrap.tf b/azure/flatcar-linux/kubernetes/bootstrap.tf index 285ced2f..bbd2b854 100644 --- a/azure/flatcar-linux/kubernetes/bootstrap.tf +++ b/azure/flatcar-linux/kubernetes/bootstrap.tf @@ -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 } diff --git a/azure/flatcar-linux/kubernetes/variables.tf b/azure/flatcar-linux/kubernetes/variables.tf index 69350813..dd8d6b30 100644 --- a/azure/flatcar-linux/kubernetes/variables.tf +++ b/azure/flatcar-linux/kubernetes/variables.tf @@ -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" diff --git a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf index c18b903e..ee558f8b 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf @@ -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 } diff --git a/bare-metal/fedora-coreos/kubernetes/variables.tf b/bare-metal/fedora-coreos/kubernetes/variables.tf index 80d1d8e8..335e8ca4 100644 --- a/bare-metal/fedora-coreos/kubernetes/variables.tf +++ b/bare-metal/fedora-coreos/kubernetes/variables.tf @@ -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" { diff --git a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf index 994d3721..65555ab3 100644 --- a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf +++ b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf @@ -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 } diff --git a/bare-metal/flatcar-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf index 48a65054..7e7a6f55 100644 --- a/bare-metal/flatcar-linux/kubernetes/variables.tf +++ b/bare-metal/flatcar-linux/kubernetes/variables.tf @@ -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 = <