Revert "feat: add new tag to cloud providers"

This reverts commit 1303e2e668.

lib/aws/bootstrap/eks-master-cluster.j2.tf

@@ -6,9 +6,8 @@ locals {
 
 locals {
   tags_common = {
-    ClusterId = var.kubernetes_full_cluster_id
+    ClusterId = var.kubernetes_cluster_id
     ClusterName = var.kubernetes_cluster_name,
-    OrganizationId = var.organization_id,
     Region = var.region
     creationDate = time_static.on_cluster_create.rfc3339
     {% if resource_expiration_in_seconds is defined %}ttl = var.resource_expiration_in_seconds{% endif %}

lib/aws/bootstrap/tf-default-vars.j2.tf

@@ -111,12 +111,6 @@ variable "eks_k8s_versions" {
   type = map(string)
 }
 
-variable "kubernetes_full_cluster_id" {
-  description = "Kubernetes full cluster id"
-  default     = "{{ kubernetes_full_cluster_id }}"
-  type        = string
-}
-
 variable "kubernetes_cluster_id" {
   description = "Kubernetes cluster id"
   default     = "{{ kubernetes_cluster_id }}"

lib/digitalocean/bootstrap/ks-locals.j2.tf

@@ -1,8 +1,7 @@
 locals {
   tags_ks = {
-    ClusterId      = var.kubernetes_full_cluster_id
+    ClusterId      = var.kubernetes_cluster_id
     ClusterName    = var.kubernetes_cluster_name
-    OrganizationId = var.organization_id,
     Region         = var.region
     creationDate   = time_static.on_cluster_create.rfc3339
     {% if resource_expiration_in_seconds is defined %}ttl = var.resource_expiration_in_seconds{% endif %}

lib/digitalocean/bootstrap/tf-default-vars.j2.tf

@@ -64,12 +64,6 @@ variable "vpc_cidr_set" {
   type = string
 }
 
-variable "kubernetes_full_cluster_id" {
-  description = "Kubernetes full cluster id"
-  default     = "{{ kubernetes_full_cluster_id }}"
-  type        = string
-}
-
 variable "kubernetes_cluster_id" {
   description = "Kubernetes cluster name"
   default     = "{{ doks_cluster_id }}"

lib/scaleway/bootstrap/ks-locals.j2.tf

@@ -1,8 +1,7 @@
 locals {
   tags_ks = {
-    ClusterId      = var.kubernetes_full_cluster_id
+    ClusterId      = var.kubernetes_cluster_id
     ClusterName    = var.kubernetes_cluster_name
-    OrganizationId = var.organization_id,
     Region         = var.region
     creationDate   = time_static.on_cluster_create.rfc3339
     {% if resource_expiration_in_seconds is defined %}ttl = var.resource_expiration_in_seconds{% endif %}

lib/scaleway/bootstrap/tf-default-vars.j2.tf

@@ -69,12 +69,6 @@ variable "scaleway_secret_key" {
 
 # Kubernetes
 
-variable "kubernetes_full_cluster_id" {
-  description = "Kubernetes full cluster id"
-  default     = "{{ kubernetes_full_cluster_id }}"
-  type        = string
-}
-
 variable "kubernetes_cluster_id" {
   description = "Kubernetes cluster id"
   default     = "{{ kubernetes_cluster_id }}"

src/cloud_provider/aws/kubernetes/mod.rs

@@ -498,7 +498,6 @@ impl EKS {
         context.insert("eks_cidr_subnet", &eks_cidr_subnet);
         context.insert("kubernetes_cluster_name", &self.name());
         context.insert("kubernetes_cluster_id", self.id());
-        context.insert("kubernetes_full_cluster_id", self.context.cluster_id());
         context.insert("eks_region_cluster_id", region_cluster_id.as_str());
         context.insert("eks_worker_nodes", &self.nodes_groups);
         context.insert("eks_zone_a_subnet_blocks_private", &eks_zone_a_subnet_blocks_private);

src/cloud_provider/scaleway/kubernetes/mod.rs

@@ -468,7 +468,6 @@ impl Kapsule {
 
         // Kubernetes
         context.insert("test_cluster", &self.context.is_test_cluster());
-        context.insert("kubernetes_full_cluster_id", self.context().cluster_id());
         context.insert("kubernetes_cluster_id", self.id());
         context.insert("kubernetes_cluster_name", self.cluster_name().as_str());
         context.insert("kubernetes_cluster_version", self.version());