complete stack fmt

Signed-off-by: junior <[email protected]>

Author: junior

deploy/complete/terraform/mushop-oci-services.tf

@@ -115,13 +115,13 @@ resource "kubernetes_service_account" "wallet_extractor_sa" {
 }
 resource "kubernetes_secret" "wallet_extractor_sa" {
   metadata {
-    name = "wallet-extractor-sa-token"
+    name      = "wallet-extractor-sa-token"
     namespace = kubernetes_namespace.mushop_namespace.id
     annotations = {
       "kubernetes.io/service-account.name" = kubernetes_service_account.wallet_extractor_sa.0.metadata.0.name
     }
   }
-  type                           = "kubernetes.io/service-account-token"
+  type = "kubernetes.io/service-account-token"
 
   count = var.mushop_mock_mode_all ? 0 : 1
 }

deploy/complete/terraform/mushop-utilities.tf

@@ -201,7 +201,7 @@ locals {
   # Helm repos
   helm_repository = {
     ingress_nginx  = "https://kubernetes.github.io/ingress-nginx"
-    jetstack       = "https://charts.jetstack.io"                        # cert-manager
+    jetstack       = "https://charts.jetstack.io" # cert-manager
     grafana        = "https://grafana.github.io/helm-charts"
     prometheus     = "https://prometheus-community.github.io/helm-charts"
     metrics_server = "https://kubernetes-sigs.github.io/metrics-server"

deploy/complete/terraform/oke-datasources.tf

@@ -7,7 +7,7 @@ data "oci_core_images" "node_pool_images" {
   compartment_id           = local.oke_compartment_ocid
   operating_system         = var.image_operating_system
   operating_system_version = var.image_operating_system_version
-  shape                    = var.node_pool_shape
+  shape                    = var.node_pool_instance_shape.instanceShape
   sort_by                  = "TIMECREATED"
   sort_order               = "DESC"
 }
@@ -19,7 +19,7 @@ data "oci_containerengine_node_pool_option" "oke" {
   node_pool_option_id = "all"
 }
 data "oci_containerengine_clusters" "oke" {
-    compartment_id = local.oke_compartment_ocid
+  compartment_id = local.oke_compartment_ocid
 }
 
 # Gets a list of Availability Domains

deploy/complete/terraform/oke.tf

@@ -108,8 +108,8 @@ resource "tls_private_key" "oke_worker_node_ssh_key" {
 locals {
   cluster_k8s_latest_version   = reverse(sort(data.oci_containerengine_cluster_option.oke.kubernetes_versions))[0]
   node_pool_k8s_latest_version = reverse(sort(data.oci_containerengine_node_pool_option.oke.kubernetes_versions))[0]
-  deployed_k8s_version = var.create_new_oke_cluster ? (var.k8s_version == "Latest") ? local.cluster_k8s_latest_version : var.k8s_version :[
-    for x in data.oci_containerengine_clusters.oke.clusters : x.kubernetes_version if x.id == var.existent_oke_cluster_id][0]
+  deployed_k8s_version = var.create_new_oke_cluster ? (var.k8s_version == "Latest") ? local.cluster_k8s_latest_version : var.k8s_version : [
+  for x in data.oci_containerengine_clusters.oke.clusters : x.kubernetes_version if x.id == var.existent_oke_cluster_id][0]
 }
 
 # Checks if is using Flexible Compute Shapes

deploy/complete/terraform/terraform.tfvars.example

@@ -45,9 +45,11 @@ existent_oke_nodepool_id_for_autoscaler = "" # e.g.: ocid1.nodepool.oc1...
 
 # OKE Worker Nodes (Compute)
 num_pool_workers                          = 3 # If autoscaler is enabled, uses the value from cluster_autoscaler_min_nodes for the initial node pool number of nodes
-node_pool_shape                           = "VM.Standard.E3.Flex"
-node_pool_node_shape_config_ocpus         = 1
-node_pool_node_shape_config_memory_in_gbs = 16
+node_pool_instance_shape                  = {
+    "instanceShape" = "VM.Standard.E4.Flex"
+    "ocpus"         = 2
+    "memory"        = 16
+}
 generate_public_ssh_key                   = true # if true, auto generate public and private keys and assign to the node pool.
 public_ssh_key                            = ""   # if generate_public_ssh_key=true, public_ssh_key is ignored. if generate_public_ssh_key=false, assign public_ssh_key, that can be nothing if ""