modified: main.tf

	modified:   modules/oke/main.tf
	modified:   modules/oke/variables.tf
	modified:   schema.yaml
	modified:   variables.tf

Author: mprestin77

main.tf

@@ -49,6 +49,8 @@ module "oke" {
   tenancy_ocid = var.tenancy_ocid
   compartment_ocid = var.compartment_ocid
   cluster_name = var.cluster_name
+  cni_type = var.cni_type
+  cluster_type = var.cluster_type
   kubernetes_version = var.kubernetes_version
   oke_nodepool_name = var.oke_nodepool_name
   oke_nodepool_shape = var.oke_nodepool_shape

modules/oke/main.tf

@@ -4,6 +4,11 @@ resource "oci_containerengine_cluster" "oke_cluster" {
   name               = var.cluster_name
   vcn_id             = var.vcn_id
 
+  #Optional
+  cluster_pod_network_options {
+    cni_type = var.cni_type
+  }
+
   endpoint_config {
     is_public_ip_enabled = var.cluster_endpoint_config_is_public_ip_enabled
     # nsg_ids = var.cluster_endpoint_config_nsg_ids

modules/oke/variables.tf

@@ -17,6 +17,7 @@ variable "ssh_public_key" {}
 variable "create_new_oke_cluster" {}
 variable "existing_oke_cluster_id" {}
 variable "cluster_endpoint_config_is_public_ip_enabled" {}
+variable "cni_type" {}
 locals {
   cluster_k8s_latest_version   = reverse(sort(data.oci_containerengine_cluster_option.oke.kubernetes_versions))[0]
   node_pool_k8s_latest_version = reverse(sort(data.oci_containerengine_node_pool_option.oke.kubernetes_versions))[0]

schema.yaml

@@ -265,7 +265,7 @@ variables:
     visible: create_new_oke_cluster
     dependsOn:
       compartmentId: compartment_ocid
-    default: "VM.Standard.E3.Flex"
+    default: "VM.Standard.E5.Flex"
 
   oke_nodepool_size:
     type: int
@@ -428,13 +428,12 @@ variables:
   mysql_shape:
     type: enum
     enum:
-    - "VM.Standard.E2.1"
-    - "VM.Standard.E2.2"
-    - "VM.Standard.E2.3"
-    - "VM.Standard.E2.4"
+    - "MySQL.VM.Standard.E4.1.16GB"
+    - "MySQL.VM.Standard.E4.2.32GB"
+    - "MySQL.VM.Standard.E4.4.64GB
     title: "OCI MySQL instance shape"
     description: "Shape of the OCI MySQL intance"
-    default: "VM.Standard.E2.2"
+    default: "MySQL.VM.Standard.E4.1.16GB"
 
   enable_backups:
     type: boolean
@@ -470,7 +469,7 @@ variables:
     title: "Staging Server Instance Shape"
     dependsOn:
       compartmentId: compartment_ocid
-    default: "VM.Standard.E3.Flex"
+    default: "VM.Standard.E5.Flex"
     required: true
 
   public_edge_node:

variables.tf

@@ -84,6 +84,18 @@ variable "kubernetes_version" {
   default = "v1.34.1"
 }
 
+variable "cni_type" {
+  description = "CNI type (e.g., OCI_VCN_IP_NATIVE or FLANNEL_OVERLAY)."
+  type        = string
+  default     = "OCI_VCN_IP_NATIVE"
+}
+
+variable "cluster_type" {
+  description = "OKE cluster type (ENHANCED_CLUSTER or BASIC_CLUSTER)."
+  type        = string
+  default     = "ENHANCED_CLUSTER"
+}
+
 variable "oke_nodepool_name" {
   default = "tc-nodepool"
 }
@@ -203,7 +215,7 @@ variable "mysql_admin_password" {
 
 
 variable "mysql_shape" {
-  default = "MySQL.VM.Standard.E4.1.16GB"
+  default = ""
 }
 
 variable "enable_backups" {