fix symlinks issues and cluster autoscaler defaults override

Author: robo-cap

module-cluster.tf

@@ -131,10 +131,6 @@ module "cluster" {
     },
     local.service_lb_freeform_tags,
   )
-
-  providers = {
-    oci.home = oci.home
-  }
 }
 
 output "cluster_id" {

module-network.tf

@@ -137,10 +137,6 @@ module "network" {
   vcn_cidrs                    = local.vcn_cidrs
   vcn_id                       = local.vcn_id
   worker_is_public             = var.worker_is_public
-
-  providers = {
-    oci.home = oci.home
-  }
 }
 
 # VCN

modules/cluster/versions.tf

@@ -0,0 +1,13 @@
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.2.0"
+
+  required_providers {
+    oci = {
+      source  = "oracle/oci"
+      version = ">= 4.119.0"
+    }
+  }
+}

modules/cluster/versions.tf

@@ -63,16 +63,7 @@ data "helm_template" "cluster_autoscaler" {
   }
 
   dynamic "set" {
-    for_each = local.cluster_autoscaler_defaults
-    iterator = helm_value
-    content {
-      name  = helm_value.key
-      value = helm_value.value
-    }
-  }
-
-  dynamic "set" {
-    for_each = var.cluster_autoscaler_helm_values
+    for_each = merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values)
     iterator = helm_value
     content {
       name  = helm_value.key

modules/extensions/autoscaler.tf

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 Oracle and/or its affiliates
+
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.2.0"
+
+  required_providers {
+    oci = {
+      configuration_aliases = [oci.home]
+      source  = "oracle/oci"
+      version = ">= 4.119.0"
+    }
+  }
+}

modules/iam/versions.tf

@@ -0,0 +1,13 @@
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.2.0"
+
+  required_providers {
+    oci = {
+      source  = "oracle/oci"
+      version = ">= 4.119.0"
+    }
+  }
+}