Revert "Revert "feat: add new tag to cloud providers""

This reverts commit f93a07b2dd.

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

@@ -6,8 +6,9 @@ locals {
 
 locals {
   tags_common = {
-    ClusterId = var.kubernetes_cluster_id
+    ClusterId = var.kubernetes_full_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,6 +111,12 @@ 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 }}"