feat(infrastructure-templates): accepts tags from variable sets, and

accomodates updates in terraform/modules

Author: nxtcoder17

examples-infra/test-aws-dev-cluster/kubernetes-backend.tf

@@ -0,0 +1,7 @@
+terraform {
+  backend "kubernetes" {
+    namespace     = "default"
+    secret_suffix = "state"
+    config_path   = "~/.kube/configs/kloudlite-dev.yml"
+  }
+}

examples-infra/test-aws-dev-cluster/varfile.template.yml

@@ -8,7 +8,6 @@ aws_assume_role:
   enabled: true
   role_arn: "${AWS_ASSUME_ROLE_ARN}"
   external_id: "${AWS_ASSUME_ROLE_PARAM_EXTERNAL_ID}"
-#
 
 k3s_masters:
   image_id: ami-06d146e85d1709abb
@@ -99,6 +98,11 @@ kloudlite_params:
   install_crds: true
   install_csi_driver: true
   install_operators: true
+  agent_vars:
+    cluster_token: "asdfafa"
+    cluster_name: "tetaa"
+    account_name: "asdfasfasf"
+    message_office_grpc_addr: "message-office:443"
 
 extra_server_args:
   - --snapshotter

examples-infra/test-aws-dev-cluster/variables.tf

@@ -2,6 +2,7 @@ variable "aws_access_key" {
   description = "AWS Access Key"
   type        = string
 }
+
 variable "aws_secret_key" {
   description = "AWS Secret Key"
   type        = string
@@ -13,5 +14,4 @@ variable "aws_assume_role" {
     role_arn    = string
     external_id = optional(string, null)
   })
-}
-
+}

infrastructure-templates/dns-records-management/variable-cloudflare-dns.tf

@@ -14,32 +14,23 @@ variable "cloudflare_zone_id" {
   type        = string
 }
 
-variable "A_records" {
-  description = "DNS A records to add. It is a map of IP => { value: domain name }"
-  type        = map(object({
-    value = string
-    ttl   = optional(number, 120),
+variable "DNS_records" {
+  description = "DNS Records to add"
+  type = list(object({
+    record_type = string
+    domain      = string
+    value       = string
+    ttl         = optional(number, 120)
   }))
-}
-
-variable "TXT_records" {
-  description = "DNS TXT records to add, It is map of key => { value: answer }"
-  type        = map(object({
-    value = string
-    ttl   = optional(number, 120),
-  }))
-}
 
-variable "CNAME_records" {
-  description = "DNS CNAME records to add, it is a map of domain => { value: cname }"
-  type        = map(object({
-    value = string
-    ttl   = optional(number, 120),
-  }))
+  validation {
+    error_message = "record_type should be a valid DNS record type"
+    condition     = alltrue([for item in var.DNS_records : contains(["A", "MX", "CNAME", "TXT"], item.record_type)])
+  }
 }
 
 variable "use_cloudflare_proxy" {
   description = "should we use cloudflare proxy for provided domain"
   type        = bool
   default     = false
-g
+}

infrastructure-templates/kl-target-cluster-aws-only-masters/main.tf

@@ -8,4 +8,5 @@ module "kl-master-nodes-on-aws" {
   save_ssh_key_to_path      = var.save_ssh_key_to_path
   save_kubeconfig_to_path   = var.save_kubeconfig_to_path
   extra_server_args         = var.extra_server_args
+  tags                      = var.tags
 }

infrastructure-templates/kl-target-cluster-aws-only-masters/outputs.tf

@@ -19,4 +19,8 @@ output "k3s_agent_token" {
 output "kubeconfig" {
   sensitive = true
   value     = module.kl-master-nodes-on-aws.kubeconfig
+}
+
+output "kloudlite-k3s-params" {
+  value = module.kl-master-nodes-on-aws.k3s-params
 }

infrastructure-templates/kl-target-cluster-aws-only-masters/state-backend.tf.tpl

@@ -1,9 +1,26 @@
+#terraform {
+#  required_version = ">= 1.2.0"
+#
+#  backend "s3" {
+#    bucket = "${AWS_S3_BUCKET_NAME}"
+#    key    = "${AWS_S3_BUCKET_FILEPATH}"
+#    region = "${AWS_S3_BUCKET_REGION}"
+#  }
+#}
+
 terraform {
   required_version = ">= 1.2.0"
 
-  backend "s3" {
-    bucket = "${AWS_S3_BUCKET_NAME}"
-    key    = "${AWS_S3_BUCKET_FILEPATH}"
-    region = "${AWS_S3_BUCKET_REGION}"
+  backend "kubernetes" {
+    # read more at https://developer.hashicorp.com/terraform/language/settings/backends/kubernetes#configuration-variables
+    secret_suffix = "state"
+
+    # when running on a kubernetes cluster, specify env-vars:
+    #   - KUBE_IN_CLUSTER_CONFIG="true"
+    #   - KUBE_NAMESPACE="some namespace"
+
+    # when running on local machine, uncomment the following, and pass appropriate values
+    # namespace   = "default"
+    # config_path = "~/.kube/configs/kloudlite-dev.yml"
   }
-}
+}

infrastructure-templates/kl-target-cluster-aws-only-masters/variables-kl-master-nodes-on-aws.tf

@@ -122,3 +122,10 @@ variable "save_kubeconfig_to_path" {
   type        = string
   default     = ""
 }
+
+variable "tags" {
+  description = "a map of key values , that will be attached to cloud provider resources, for easier referencing"
+  type        = map(string)
+  default     = {}
+}
+

infrastructure-templates/kl-target-cluster-aws-only-workers/main.tf

@@ -9,4 +9,5 @@ module "kl-worker-nodes-on-aws" {
   tracker_id                 = "${var.tracker_id}-workers"
   extra_agent_args           = var.extra_agent_args
   save_ssh_key_to_path       = var.save_ssh_key_to_path
+  tags                       = var.tags
 }

infrastructure-templates/kl-target-cluster-aws-only-workers/state-backend.tf.tpl

@@ -1,9 +1,26 @@
+#terraform {
+#  required_version = ">= 1.2.0"
+#
+#  backend "s3" {
+#    bucket = "${AWS_S3_BUCKET_NAME}"
+#    key    = "${AWS_S3_BUCKET_FILEPATH}"
+#    region = "${AWS_S3_BUCKET_REGION}"
+#  }
+#}
+
 terraform {
   required_version = ">= 1.2.0"
 
-  backend "s3" {
-    bucket = "${AWS_S3_BUCKET_NAME}"
-    key    = "${AWS_S3_BUCKET_FILEPATH}"
-    region = "${AWS_S3_BUCKET_REGION}"
+  backend "kubernetes" {
+    # read more at https://developer.hashicorp.com/terraform/language/settings/backends/kubernetes#configuration-variables
+    secret_suffix = "state"
+
+    # when running on a kubernetes cluster, specify env-vars:
+    #   - KUBE_IN_CLUSTER_CONFIG="true"
+    #   - KUBE_NAMESPACE="some namespace"
+
+    # when running on local machine, uncomment the following, and pass appropriate values
+    # namespace   = "default"
+    # config_path = "~/.kube/configs/kloudlite-dev.yml"
   }
-}
+}