fix: missing preferred_cni input variable in submodule clusters

hyder · hyder · commit 871561959741 · 2023-06-30T17:29:51.000+10:00
Signed-off-by: Ali Mukadam &lt;ali.mukadam@oracle.com&gt;
diff --git a/main.tf b/main.tf
@@ -25,8 +25,8 @@ module "clusters" {
 
   clusters = var.managed_clusters
 
-  oke_control_plane = var.oke_control_plane
-
+  oke_control_plane         = var.oke_control_plane
+  preferred_cni             = var.preferred_cni
   cloudinit_nodepool_common = var.cloudinit_nodepool_common
 
   nodepools = var.nodepools
@@ -74,7 +74,7 @@ module "verrazzano" {
   source = "./modules/verrazzano"
 
   label_prefix = var.label_prefix
-  
+
   bastion_ip = module.admin.bastion_public_ip
 
   operator_ip = module.admin.operator_private_ip
diff --git a/modules/clusters/europe.tf b/modules/clusters/europe.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "frankfurt"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("frankfurt")), "pods")
@@ -143,7 +143,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "amsterdam"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("amsterdam")), "pods")
@@ -230,7 +230,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "madrid"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("madrid")), "pods")
@@ -316,7 +316,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "milan"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("milan")), "pods")
@@ -402,7 +402,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "stockholm"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("stockholm")), "pods")
@@ -488,7 +488,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "zurich"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("zurich")), "pods")
diff --git a/modules/clusters/france.tf b/modules/clusters/france.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "paris"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("paris")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "marseille"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("marseille")), "pods")
diff --git a/modules/clusters/india.tf b/modules/clusters/india.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "hyderabad"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("hyderabad")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "mumbai"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("mumbai")), "pods")
diff --git a/modules/clusters/japan.tf b/modules/clusters/japan.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "osaka"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("osaka")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "tokyo"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("tokyo")), "pods")
diff --git a/modules/clusters/korea.tf b/modules/clusters/korea.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "chuncheon"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("chuncheon")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "seoul"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("seoul")), "pods")
diff --git a/modules/clusters/latam.tf b/modules/clusters/latam.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "queretaro"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("queretaro")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "santiago"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("santiago")), "pods")
diff --git a/modules/clusters/middleeast.tf b/modules/clusters/middleeast.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "jeddah"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("jeddah")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "jerusalem"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("jerusalem")), "pods")
diff --git a/modules/clusters/singapore.tf b/modules/clusters/singapore.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "singapore"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("singapore")), "pods")
diff --git a/modules/clusters/uae.tf b/modules/clusters/uae.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "dubai"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("dubai")), "pods")
@@ -141,7 +141,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "abudhabi"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("abudhabi")), "pods")
diff --git a/modules/clusters/uk.tf b/modules/clusters/uk.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "london"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("london")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "newport"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("newport")), "pods")
diff --git a/modules/clusters/usa.tf b/modules/clusters/usa.tf
@@ -56,7 +56,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "ashburn"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("ashburn")), "pods")
@@ -142,7 +142,7 @@
 #   allow_worker_ssh_access     = false
 #   cluster_name                = "phoenix"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("phoenix")), "pods")
@@ -228,7 +228,7 @@
 #   allow_worker_ssh_access     = true
 #   cluster_name                = "sanjose"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("sanjose")), "pods")
@@ -314,7 +314,7 @@
 #   allow_worker_ssh_access     = true
 #   cluster_name                = "chicago"
 #   control_plane_type          = var.oke_control_plane
-#   cni_type                           = var.preferred_cni
+#   cni_type                    = var.preferred_cni
 #   control_plane_allowed_cidrs = ["0.0.0.0/0"]
 #   kubernetes_version          = var.kubernetes_version
 #   pods_cidr                   = lookup(lookup(var.cidrs, lower("chicago")), "pods")
diff --git a/modules/clusters/variables.tf b/modules/clusters/variables.tf
@@ -51,6 +51,10 @@ variable "oke_control_plane" {
   type = string
 }
 
+variable "preferred_cni" {
+  type = string
+}
+
 variable "nodepools" {
   type = any
 }
