Update k8s.tf and network.tf

gitbarnabedikartola · Jan 13, 2024 · 9fa8ac5 · 9fa8ac5
1 parent f3c6c11
commit 9fa8ac5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 42 deletions.
diff --git a/cluster/k8s.tf b/cluster/k8s.tf
@@ -33,7 +33,15 @@ resource "oci_containerengine_node_pool" "k8s_node_pool" {
   name               = "k8s-node-pool"
   node_config_details {
     placement_configs {
-      availability_domain = data.oci_identity_availability_domains.ads.availability_domains[var.availability_domain].name
+      availability_domain = data.oci_identity_availability_domains.ads.availability_domains[0].name
+      subnet_id           = var.vcn_private_subnet_id
+    }
+    placement_configs {
+      availability_domain = data.oci_identity_availability_domains.ads.availability_domains[1].name
+      subnet_id           = var.vcn_private_subnet_id
+    }
+    placement_configs {
+      availability_domain = data.oci_identity_availability_domains.ads.availability_domains[2].name
       subnet_id           = var.vcn_private_subnet_id
     }
     size = var.node_size

diff --git a/cluster/variables.tf b/cluster/variables.tf
@@ -19,9 +19,6 @@ variable "ocpus_per_node" {
 variable "image_id" {
 }
 
-variable "availability_domain" {
-}
-
 variable "ssh_public_key" {
 }
 

diff --git a/network/network.tf b/network/network.tf
@@ -13,7 +13,7 @@ resource "oci_core_security_list" "private_subnet_sl" {
 
   ingress_security_rules {
     stateless   = false
-    source      = "10.0.0.0/16"
+    source      = "0.0.0.0/0"
     source_type = "CIDR_BLOCK"
     protocol    = "all"
   }
@@ -34,43 +34,43 @@ resource "oci_core_security_list" "public_subnet_sl" {
 
   ingress_security_rules {
     stateless   = false
-    source      = "10.0.0.0/16"
+    source      = "0.0.0.0/0"
     source_type = "CIDR_BLOCK"
     protocol    = "all"
   }
 
-  ingress_security_rules {
-    stateless   = false
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    protocol    = "6"
-    tcp_options {
-      min = 6443
-      max = 6443
-    }
-  }
+#   ingress_security_rules {
+#     stateless   = false
+#     source      = "0.0.0.0/0"
+#     source_type = "CIDR_BLOCK"
+#     protocol    = "6"
+#     tcp_options {
+#       min = 6443
+#       max = 6443
+#     }
+#   }
 
-  ingress_security_rules {
-    stateless   = false
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    protocol    = "6"
-    tcp_options {
-      min = 80
-      max = 80
-    }
-  }
+#   ingress_security_rules {
+#     stateless   = false
+#     source      = "0.0.0.0/0"
+#     source_type = "CIDR_BLOCK"
+#     protocol    = "6"
+#     tcp_options {
+#       min = 80
+#       max = 80
+#     }
+#   }
 
-  ingress_security_rules {
-    stateless   = false
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    protocol    = "6"
-    tcp_options {
-      min = 443
-      max = 443
-    }
-  }
+#   ingress_security_rules {
+#     stateless   = false
+#     source      = "0.0.0.0/0"
+#     source_type = "CIDR_BLOCK"
+#     protocol    = "6"
+#     tcp_options {
+#       min = 443
+#       max = 443
+#     }
+#   }
 }
 
 resource "oci_core_subnet" "vcn_private_subnet" {

diff --git a/terrafile.tf b/terrafile.tf
@@ -41,7 +41,6 @@ module "cluster" {
   memory_in_gbs_per_node            = var.memory_in_gbs_per_node
   ocpus_per_node                    = var.ocpus_per_node
   image_id                          = var.image_id
-  availability_domain               = var.availability_domain
   ssh_public_key                    = var.ssh_public_key
   public_subnet_id                  = module.network.public_subnet_id
   vcn_id                            = module.vcn.vcn_id

diff --git a/variables.tf b/variables.tf
@@ -10,11 +10,6 @@ variable "region" {
   default = "us-ashburn-1"  
 }
 
-variable "availability_domain" {
-  type    = number
-  default = 0
-}
-
 # ---------->VM's----------
 
 variable "shape" {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,9 +19,6 @@ variable "ocpus_per_node" { @@
     variable "image_id" {
     }
-    variable "availability_domain" {
-    }
     variable "ssh_public_key" {
     }
@@ Expand Down @@