Merge pull request #8 from streamnsight/main

1.27 support

Author: streamnsight

add_on_k8s_autoscaler.tf

@@ -3,15 +3,15 @@
 # 
 
 locals {
-  cluster_autoscaler_supported_k8s_versions           = { "1.23" = "1.23.0-4", "1.24" = "1.24.0-5", "1.25" = "1.25.0-6", "1.26" = "1.25.0-6" } # There's no API to get that list. Need to be updated manually
+  cluster_autoscaler_supported_k8s_versions           = { "1.23" = "1.23.0-4", "1.24" = "1.24.0-5", "1.25" = "1.25.0-6", "1.26" = "1.25.0-6", "1.27" = "1.27.2-9" } # There's no API to get that list. Need to be updated manually
   cluster_autoscaler_image_version                    = lookup(local.cluster_autoscaler_supported_k8s_versions, local.k8s_major_minor_version, reverse(values(local.cluster_autoscaler_supported_k8s_versions))[0])
   cluster_autoscaler_image                            = "iad.ocir.io/oracle/oci-cluster-autoscaler:${local.cluster_autoscaler_image_version}"
   cluster_autoscaler_log_level_verbosity              = 4
   cluster_autoscaler_max_node_provision_time          = "${var.cluster_autoscaler_max_node_provision_time}m"
   cluster_autoscaler_scale_down_delay_after_add       = "${var.cluster_autoscaler_scale_down_delay_after_add}m"
   cluster_autoscaler_scale_down_unneeded_time         = "${var.cluster_autoscaler_scale_down_unneeded_time}m"
   cluster_autoscaler_unremovable_node_recheck_timeout = "${var.cluster_autoscaler_unremovable_node_recheck_timeout}m"
-  cluster_autoscaler_cloud_provider                   = tonumber(local.k8s_minor_version) <= 23 ? "oci" : "oci-oke"
+  cluster_autoscaler_cloud_provider                   = tonumber(local.k8s_minor_version) <= 23 || tonumber(local.k8s_minor_version) > 1.26 ? "oci" : "oci-oke"
   cluster_autoscaler_enabled                          = contains(keys(local.cluster_autoscaler_supported_k8s_versions), local.k8s_major_minor_version) ? (var.np1_enable_autoscaler || var.np2_enable_autoscaler || var.np3_enable_autoscaler) : false
   k8s_major_minor_version                             = regex("\\d+(?:\\.(?:\\d+|x)(?:))", local.kubernetes_version)
   k8s_minor_version                                   = regex("^\\d+", replace(local.kubernetes_version, "v1.", ""))

tests/A1_full_1np.tfvars

@@ -27,7 +27,7 @@ node_pool_count = 1
 # np1_subnet=
 np1_node_count = 1
 np1_node_shape = "VM.Standard.E3.Flex"
-np1_image_id   = "ocid1.image.oc1.us-sanjose-1.aaaaaaaaysxt7adhnhzammcd7qmk423vtrl562lzufquxedyjqp63u4meg7a"
+np1_image_id   = "ocid1.image.oc1.us-sanjose-1.aaaaaaaakubmcc6hyjem4wdrqxv3gmwppglxkuhcstbzgfhvn554p25vbb4a"
 # np1_add_tag=
 # np1_tag=
 np1_ocpus                = 2
@@ -39,7 +39,7 @@ np1_autoscaler_max_nodes = 3
 np2_create_new_subnet = true
 np2_node_count        = 0
 np2_node_shape        = ""
-np2_image_id          = "ocid1.image.oc1.us-sanjose-1.aaaaaaaanoevcbgqidanfngql2judmt35azqzlwjkq7oqnvjp6qujyrvqqia"
+np2_image_id          = "ocid1.image.oc1.us-sanjose-1.aaaaaaaakubmcc6hyjem4wdrqxv3gmwppglxkuhcstbzgfhvn554p25vbb4a"
 np2_ha                = true
 # np2_availability_domain="UWQV:US-ASHBURN-AD-2"
 # np2_ocpus     = 4

tests/A2_full_3np.tfvars

@@ -27,7 +27,7 @@ node_pool_count = 3
 # np1_subnet=
 np1_node_count = 1
 np1_node_shape = "VM.Standard.E3.Flex"
-np1_image_id   = "ocid1.image.oc1.us-sanjose-1.aaaaaaaaysxt7adhnhzammcd7qmk423vtrl562lzufquxedyjqp63u4meg7a"
+np1_image_id   = "ocid1.image.oc1.us-sanjose-1.aaaaaaaakubmcc6hyjem4wdrqxv3gmwppglxkuhcstbzgfhvn554p25vbb4a"
 # np1_add_tag=
 # np1_tag=
 np1_ocpus                = 2
@@ -39,7 +39,7 @@ np1_autoscaler_max_nodes = 3
 np2_create_new_subnet = true
 np2_node_count        = 1
 np2_node_shape        = "VM.Standard.E3.Flex"
-np2_image_id          = "ocid1.image.oc1.us-sanjose-1.aaaaaaaaysxt7adhnhzammcd7qmk423vtrl562lzufquxedyjqp63u4meg7a"
+np2_image_id          = "ocid1.image.oc1.us-sanjose-1.aaaaaaaakubmcc6hyjem4wdrqxv3gmwppglxkuhcstbzgfhvn554p25vbb4a"
 np2_ha                = true
 # np2_availability_domain="UWQV:US-ASHBURN-AD-2"
 np2_ocpus     = 1
@@ -58,7 +58,7 @@ np3_memory_gb = 4
 np3_enable_autoscaler=false
 # np3_autoscaler_min_nodes=0
 # np3_autoscaler_max_nodes=3
-np3_image_id="ocid1.image.oc1.us-sanjose-1.aaaaaaaaysxt7adhnhzammcd7qmk423vtrl562lzufquxedyjqp63u4meg7a"
+np3_image_id="ocid1.image.oc1.us-sanjose-1.aaaaaaaakubmcc6hyjem4wdrqxv3gmwppglxkuhcstbzgfhvn554p25vbb4a"
 # np3_add_tag=
 # np3_tag=
 # allow_deploy_private_lb = false