updates OKE ver and provider (#746)

* updates OKE ver and provider

Author: gotsysdba

grabdish/terraform/.gitignore

@@ -0,0 +1,4 @@
+.terraform.lock.hcl
+.terraform/
+terraform.tfstate
+terraform.tfstate.backup

grabdish/terraform/containerengine.tf

@@ -1,13 +1,13 @@
 resource "oci_containerengine_cluster" "okell_cluster" {
   #Required
-  compartment_id     = var.ociCompartmentOcid
+  compartment_id = var.ociCompartmentOcid
   endpoint_config {
     is_public_ip_enabled = "true"
     nsg_ids = [
     ]
     subnet_id = oci_core_subnet.endpoint_Subnet.id
   }
-  kubernetes_version = "v1.26.2"
+  kubernetes_version = var.kubernetes_version
   name               = "grabdish"
   vcn_id             = oci_core_vcn.okell_vcn.id
   #Optional
@@ -34,20 +34,20 @@ resource "oci_containerengine_node_pool" "okell_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.okell_cluster.id
   compartment_id     = var.ociCompartmentOcid
-  kubernetes_version = "v1.26.2"
+  kubernetes_version = var.kubernetes_version
   name               = "Pool"
-#  node_shape="VM.Standard2.4"
-#  node_shape         = "VM.Standard.B2.1"
-  node_shape         = "VM.Standard.E2.1"
-#  node_shape         = "VM.Standard2.2"
+  #  node_shape="VM.Standard2.4"
+  #  node_shape         = "VM.Standard.B2.1"
+  node_shape = "VM.Standard.E2.1"
+  #  node_shape         = "VM.Standard2.2"
   #subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
   #Optional
   node_config_details {
     placement_configs {
       availability_domain = data.oci_identity_availability_domain.ad1.name
       subnet_id           = oci_core_subnet.nodePool_Subnet.id
     }
-/*    placement_configs {
+    /*    placement_configs {
       availability_domain = data.oci_identity_availability_domain.ad2.name
       subnet_id           = oci_core_subnet.nodePool_Subnet.id
     }
@@ -76,8 +76,8 @@ data "oci_containerengine_node_pool_option" "okell_node_pool_option" {
   node_pool_option_id = "all"
 }
 locals {
-  all_sources = data.oci_containerengine_node_pool_option.okell_node_pool_option.sources
-  oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
+  all_sources         = data.oci_containerengine_node_pool_option.okell_node_pool_option.sources
+  oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*", source.source_name)) > 0]
 }
 /*
 output "cluster_kubernetes_versions" {
@@ -107,4 +107,4 @@ variable "InstanceImageOCID" {
     uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
   }
 }
-*/
+*/

grabdish/terraform/core.tf

@@ -2,12 +2,12 @@ resource "oci_core_vcn" "okell_vcn" {
   cidr_block     = "10.0.0.0/16"
   compartment_id = var.ociCompartmentOcid
   display_name   = "grabdish"
-  dns_label    = "grabdish"
+  dns_label      = "grabdish"
 }
 resource "oci_core_internet_gateway" "ig" {
-   compartment_id = var.ociCompartmentOcid
-   display_name   = "ClusterInternetGateway"
-   vcn_id         = oci_core_vcn.okell_vcn.id
+  compartment_id = var.ociCompartmentOcid
+  display_name   = "ClusterInternetGateway"
+  vcn_id         = oci_core_vcn.okell_vcn.id
 }
 /*resource "oci_core_dhcp_options" "grabdish" {
     #Required
@@ -54,18 +54,18 @@ resource oci_core_public_ip puip {
   #public_ip_pool_id = <<Optional value not found in discovery>>
 }
 */
-resource oci_core_nat_gateway ngw {
+resource "oci_core_nat_gateway" "ngw" {
   block_traffic  = "false"
   compartment_id = var.ociCompartmentOcid
-  display_name = "ngw"
+  display_name   = "ngw"
   freeform_tags = {
   }
   #public_ip_id = oci_core_public_ip.puip.id
-  vcn_id       = oci_core_vcn.okell_vcn.id
+  vcn_id = oci_core_vcn.okell_vcn.id
 }
-resource oci_core_service_gateway sg {
+resource "oci_core_service_gateway" "sg" {
   compartment_id = var.ociCompartmentOcid
-  display_name = "grabdish"
+  display_name   = "grabdish"
   freeform_tags = {
   }
   #route_table_id = <<Optional value not found in discovery>>
@@ -74,9 +74,9 @@ resource oci_core_service_gateway sg {
   }
   vcn_id = oci_core_vcn.okell_vcn.id
 }
-resource oci_core_route_table private {
+resource "oci_core_route_table" "private" {
   compartment_id = var.ociCompartmentOcid
-  display_name = "private"
+  display_name   = "private"
   freeform_tags = {
   }
   route_rules {
@@ -101,7 +101,7 @@ resource oci_core_route_table private {
   */
   vcn_id = oci_core_vcn.okell_vcn.id
 }
-resource oci_core_default_route_table public {
+resource "oci_core_default_route_table" "public" {
   display_name = "public"
   freeform_tags = {
   }
@@ -116,46 +116,46 @@ resource oci_core_default_route_table public {
 resource "oci_core_subnet" "endpoint_Subnet" {
   #Required
   #availability_domain = data.oci_identity_availability_domain.ad1.name
-  cidr_block          = "10.0.0.0/28"
-  compartment_id      = var.ociCompartmentOcid
-  vcn_id              = oci_core_vcn.okell_vcn.id
+  cidr_block     = "10.0.0.0/28"
+  compartment_id = var.ociCompartmentOcid
+  vcn_id         = oci_core_vcn.okell_vcn.id
   # Provider code tries to maintain compatibility with old versions.
-  security_list_ids   = [oci_core_security_list.endpoint.id]
-  display_name        = "SubNet1ForEndpoint"
+  security_list_ids          = [oci_core_security_list.endpoint.id]
+  display_name               = "SubNet1ForEndpoint"
   prohibit_public_ip_on_vnic = "false"
-  route_table_id      = oci_core_vcn.okell_vcn.default_route_table_id
-  dns_label           = "endpoint"
+  route_table_id             = oci_core_vcn.okell_vcn.default_route_table_id
+  dns_label                  = "endpoint"
 }
 resource "oci_core_subnet" "nodePool_Subnet" {
   #Required
   #availability_domain = data.oci_identity_availability_domain.ad1.name
-  cidr_block          = "10.0.10.0/24"
-  compartment_id      = var.ociCompartmentOcid
-  vcn_id              = oci_core_vcn.okell_vcn.id
+  cidr_block     = "10.0.10.0/24"
+  compartment_id = var.ociCompartmentOcid
+  vcn_id         = oci_core_vcn.okell_vcn.id
   # Provider code tries to maintain compatibility with old versions.
-  security_list_ids = [oci_core_security_list.nodePool.id]
-  display_name      = "SubNet1ForNodePool"
+  security_list_ids          = [oci_core_security_list.nodePool.id]
+  display_name               = "SubNet1ForNodePool"
   prohibit_public_ip_on_vnic = "true"
-  route_table_id    = oci_core_route_table.private.id
-  dns_label           = "nodepool"
+  route_table_id             = oci_core_route_table.private.id
+  dns_label                  = "nodepool"
 }
 resource "oci_core_subnet" "svclb_Subnet" {
   #Required
   #availability_domain = data.oci_identity_availability_domain.ad1.name
-  cidr_block          = "10.0.20.0/24"
-  compartment_id      = var.ociCompartmentOcid
-  vcn_id              = oci_core_vcn.okell_vcn.id
+  cidr_block     = "10.0.20.0/24"
+  compartment_id = var.ociCompartmentOcid
+  vcn_id         = oci_core_vcn.okell_vcn.id
   # Provider code tries to maintain compatibility with old versions.
-  security_list_ids = [oci_core_default_security_list.svcLB.id]
-  display_name      = "SubNet1ForSvcLB"
-  route_table_id    = oci_core_vcn.okell_vcn.default_route_table_id
-  dhcp_options_id = oci_core_vcn.okell_vcn.default_dhcp_options_id
+  security_list_ids          = [oci_core_default_security_list.svcLB.id]
+  display_name               = "SubNet1ForSvcLB"
+  route_table_id             = oci_core_vcn.okell_vcn.default_route_table_id
+  dhcp_options_id            = oci_core_vcn.okell_vcn.default_dhcp_options_id
   prohibit_public_ip_on_vnic = "false"
-  dns_label           = "svclb"
+  dns_label                  = "svclb"
 }
-resource oci_core_security_list nodePool {
+resource "oci_core_security_list" "nodePool" {
   compartment_id = var.ociCompartmentOcid
-  display_name = "nodepool"
+  display_name   = "nodepool"
   egress_security_rules {
     description      = "Allow pods on one worker node to communicate with pods on other worker nodes"
     destination      = "10.0.10.0/24"
@@ -221,7 +221,7 @@ resource oci_core_security_list nodePool {
     }
     #udp_options = <<Optional value not found in discovery>>
   }
-/*
+  /*
   egress_security_rules {
     description      = "Allow nodes to communicate with OKE to ensure correct start-up and continued functioning (1)"
     destination      = data.oci_core_services.services.services.1.cidr_block
@@ -309,7 +309,7 @@ resource oci_core_security_list nodePool {
     }
     #udp_options = <<Optional value not found in discovery>>
   }
-/*
+  /*
   ingress_security_rules {
     #description = <<Optional value not found in discovery>>
     #icmp_options = <<Optional value not found in discovery>>
@@ -342,9 +342,9 @@ resource oci_core_security_list nodePool {
   vcn_id = oci_core_vcn.okell_vcn.id
 }
 
-resource oci_core_security_list endpoint {
+resource "oci_core_security_list" "endpoint" {
   compartment_id = var.ociCompartmentOcid
-  display_name = "endpoint"
+  display_name   = "endpoint"
   egress_security_rules {
     description      = "Allow Kubernetes Control Plane to communicate with OKE"
     destination      = data.oci_core_services.services.services.0.cidr_block
@@ -442,8 +442,8 @@ resource oci_core_security_list endpoint {
   vcn_id = oci_core_vcn.okell_vcn.id
 }
 
-resource oci_core_default_security_list svcLB {
-  display_name = "svcLB"
+resource "oci_core_default_security_list" "svcLB" {
+  display_name               = "svcLB"
   manage_default_resource_id = oci_core_vcn.okell_vcn.default_security_list_id
 }
 data "oci_core_services" "services" {

grabdish/terraform/database.tf

@@ -8,13 +8,13 @@ resource "random_string" "autonomous_database_wallet_password" {
   special = true
 }
 resource "random_password" "database_admin_password" {
-  length  = 12
-  upper   = true
-  lower   = true
-  numeric  = true
-  special = false
-  min_lower = "1"
-  min_upper = "1"
+  length      = 12
+  upper       = true
+  lower       = true
+  numeric     = true
+  special     = false
+  min_lower   = "1"
+  min_upper   = "1"
   min_numeric = "1"
 }
 resource "oci_database_autonomous_database" "autonomous_database_atp" {
@@ -25,10 +25,10 @@ resource "oci_database_autonomous_database" "autonomous_database_atp" {
   data_storage_size_in_tbs = "1"
   db_name                  = var.orderDbName
   # is_free_tier = true , if there exists sufficient service limit
-  is_free_tier             = false
+  is_free_tier = false
   #Optional #db_workload = "${var.autonomous_database_db_workload}"
   db_workload                                    = var.autonomous_database_db_workload
-  display_name ="ORDERDB"
+  display_name                                   = "ORDERDB"
   is_auto_scaling_enabled                        = "false"
   is_preview_version_with_service_terms_accepted = "false"
 }
@@ -40,17 +40,17 @@ resource "oci_database_autonomous_database" "autonomous_database_atp2" {
   data_storage_size_in_tbs = "1"
   db_name                  = var.inventoryDbName
   is_free_tier             = false
-  db_workload                                    = var.autonomous_database_db_workload
+  db_workload              = var.autonomous_database_db_workload
   // Autonomous Database name cannot be longer than 14 characters.
-  display_name = "INVENTORYDB"
+  display_name                                   = "INVENTORYDB"
   is_auto_scaling_enabled                        = "false"
   is_preview_version_with_service_terms_accepted = "false"
 }
 data "oci_database_autonomous_databases" "autonomous_databases_atp" {
   #Required
   compartment_id = var.ociCompartmentOcid
   #Optional
-  display_name =  "ORDERDB"
+  display_name = "ORDERDB"
   db_workload  = var.autonomous_database_db_workload
 }
 data "oci_database_autonomous_databases" "autonomous_databases_atp2" {
@@ -66,9 +66,9 @@ data "oci_objectstorage_namespace" "test_namespace" {
   compartment_id = var.ociCompartmentOcid
 }
 //========= Outputs ===========================
-output "ns_objectstorage_namespace" { 
-  value =  [ data.oci_objectstorage_namespace.test_namespace.namespace ]
+output "ns_objectstorage_namespace" {
+  value = [data.oci_objectstorage_namespace.test_namespace.namespace]
 }
 output "autonomous_database_admin_password" {
-  value =  [ "Welcome12345" ]
+  value = ["Welcome12345"]
 }

grabdish/terraform/main_var.tf

@@ -6,4 +6,11 @@ variable "ociCompartmentOcid" {}
 variable "ociRegionIdentifier" {}
 variable "runName" {}
 variable "orderDbName" {}
-variable "inventoryDbName" {}
+variable "inventoryDbName" {}
+
+variable "kubernetes_version" {
+  description = "OKE Version"
+  type        = string
+  default     = "v1.27.2"
+}
+

grabdish/terraform/provider.tf

@@ -1,12 +1,13 @@
 terraform {
   required_providers {
     oci = {
-      source = "oracle/oci"
-      version = "4.42.0"
+      source  = "oracle/oci"
+      version = "~> 5"
     }
   }
+  required_version = "~> 1.2"
 }
 
 provider "oci" {
-  region           = var.ociRegionIdentifier
-}
+  region = var.ociRegionIdentifier
+}