Revert "Merge pull request #1405 from kinvolk/imran/baremetal-node-sp…

…ecific-labels" This reverts commit a495c72, reversing changes made to 0736a32. Signed-off-by: Imran Pochi <imran@kinvolk.io>
kinvolk · Mar 11, 2021 · 860af3d · 860af3d
1 parent 516dd41
commit 860af3d
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 198 deletions.
diff --git a/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/controller.tf b/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/controller.tf
@@ -9,7 +9,6 @@ module "controller" {
   ssh_keys               = var.ssh_keys
   apiserver              = format("%s.%s", var.cluster_name, var.k8s_domain_name)
   ca_cert                = module.bootkube.ca_cert
-  kubelet_labels         = lookup(var.node_specific_labels, var.controller_names[count.index], {})
   clc_snippets           = lookup(var.clc_snippets, var.controller_names[count.index], [])
   set_standard_hostname  = true
 }
diff --git a/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/variables.tf b/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/variables.tf
@@ -203,9 +203,3 @@ variable "install_to_smallest_disk" {
   type        = bool
   default     = false
 }
-
-variable "node_specific_labels" {
-  type        = map(map(string))
-  description = "Map of node specific labels map."
-  default     = {}
-}
diff --git a/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/worker.tf b/assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/worker.tf
@@ -7,7 +7,7 @@ module "worker" {
   cluster_domain_suffix  = var.cluster_domain_suffix
   ca_cert                = module.bootkube.ca_cert
   apiserver              = format("%s.%s", var.cluster_name, var.k8s_domain_name)
-  kubelet_labels         = merge(lookup(var.node_specific_labels, var.worker_names[count.index], {}), var.labels)
+  kubelet_labels         = var.labels
   cluster_name           = var.cluster_name
   clc_snippets           = lookup(var.clc_snippets, var.worker_names[count.index], [])
   set_standard_hostname  = true

diff --git a/assets/terraform-modules/controller/main.tf b/assets/terraform-modules/controller/main.tf
@@ -47,10 +47,10 @@ data "ct_config" "config" {
     kubelet_image_tag         = var.kubelet_image_tag
     kubelet_docker_extra_args = []
     hostname                  = var.set_standard_hostname == true ? "${var.cluster_name}-controller-${var.count_index}" : ""
-    kubelet_labels = merge(var.kubelet_labels, {
+    kubelet_labels = {
       "node.kubernetes.io/master"     = "",
       "node.kubernetes.io/controller" = "true",
-    })
+    }
     kubelet_taints = {
       "node-role.kubernetes.io/master" = ":NoSchedule"
     }

diff --git a/assets/terraform-modules/controller/variables.tf b/assets/terraform-modules/controller/variables.tf
@@ -83,9 +83,3 @@ variable "set_standard_hostname" {
   description = "Sets the hostname if true. Hostname is set as <cluster_name>-controller-<count_index>"
   default     = false
 }
-
-variable "kubelet_labels" {
-  type        = map(string)
-  description = "Node labels passed to kubelet --node-labels flag. E.g. { { \"node.kubernetes.io/node\" = \"\" }"
-  default     = {}
-}
diff --git a/ci/baremetal/baremetal-cluster.lokocfg.envsubst b/ci/baremetal/baremetal-cluster.lokocfg.envsubst
@@ -41,20 +41,6 @@ cluster "bare-metal" {
     "roleofnode" = "testing",
   }
 
-  node_specific_labels = {
-    "node1" = {
-      "testkey": "testvalue"
-    }
-
-    "node2" = {
-      "ingressnode": "yes"
-    }
-
-    "node3" = {
-      "storagenode": "yes"
-    }
-  }
-
   conntrack_max_per_core = 65000
 
   install_to_smallest_disk = "true"

diff --git a/docs/configuration-reference/platforms/baremetal.md b/docs/configuration-reference/platforms/baremetal.md
diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go
diff --git a/pkg/platform/baremetal/baremetal.go b/pkg/platform/baremetal/baremetal.go
@@ -30,9 +30,6 @@ import (
 	"github.com/kinvolk/lokomotive/pkg/terraform"
 )
 
-// Labels represent the map of key value string pairs added the kubelet.
-type Labels map[string]string
-
 type config struct {
 	AssetDir                     string              `hcl:"asset_dir"`
 	CachedInstall                string              `hcl:"cached_install,optional"`
@@ -54,8 +51,7 @@ type config struct {
 	WorkerNames                  []string            `hcl:"worker_names"`
 	WorkerMacs                   []string            `hcl:"worker_macs"`
 	WorkerDomains                []string            `hcl:"worker_domains"`
-	Labels                       Labels              `hcl:"labels,optional"`
-	NodeSpecificLabels           map[string]Labels   `hcl:"node_specific_labels,optional"`
+	Labels                       map[string]string   `hcl:"labels,optional"`
 	OIDC                         *oidc.Config        `hcl:"oidc,block"`
 	EncryptPodTraffic            bool                `hcl:"encrypt_pod_traffic,optional"`
 	IgnoreX509CNCheck            bool                `hcl:"ignore_x509_cn_check,optional"`
@@ -224,8 +220,7 @@ func createTerraformConfigFile(cfg *config, terraformPath string) error {
 		WorkerDomains                string
 		DisableSelfHostedKubelet     bool
 		KubeAPIServerExtraFlags      []string
-		Labels                       Labels
-		NodeSpecificLabels           map[string]Labels
+		Labels                       map[string]string
 		EncryptPodTraffic            bool
 		IgnoreX509CNCheck            bool
 		ConntrackMaxPerCore          int
@@ -257,7 +252,6 @@ func createTerraformConfigFile(cfg *config, terraformPath string) error {
 		DisableSelfHostedKubelet:     cfg.DisableSelfHostedKubelet,
 		KubeAPIServerExtraFlags:      cfg.KubeAPIServerExtraFlags,
 		Labels:                       cfg.Labels,
-		NodeSpecificLabels:           cfg.NodeSpecificLabels,
 		EncryptPodTraffic:            cfg.EncryptPodTraffic,
 		IgnoreX509CNCheck:            cfg.IgnoreX509CNCheck,
 		ConntrackMaxPerCore:          cfg.ConntrackMaxPerCore,

diff --git a/pkg/platform/baremetal/template.go b/pkg/platform/baremetal/template.go
@@ -65,20 +65,6 @@ module "bare-metal-{{.ClusterName}}" {
   }
   {{- end}}
 
-  {{- if .NodeSpecificLabels}}
-  node_specific_labels = {
-    {{- range $nodeName, $mapOfLabels := .NodeSpecificLabels}}
-      {{- if $mapOfLabels }}
-        "{{$nodeName}}" = {
-          {{- range $key, $value := $mapOfLabels }}
-            "{{$key}}" = "{{$value}}",
-          {{- end }}
-        }
-      {{- end }}
-    {{- end }}
-  }
-  {{- end }}
-
   ignore_x509_cn_check   = {{.IgnoreX509CNCheck}}
   conntrack_max_per_core = {{.ConntrackMaxPerCore}}
 

diff --git a/test/components/kubernetes/baremetal_kubelet_labels_test.go b/test/components/kubernetes/baremetal_kubelet_labels_test.go