fix up nlb config

.gitignore

@@ -35,3 +35,4 @@ override.tf.json
 terraform.rc
 *tf.plan
 *.terraform.lock.hcl
+oci-managed/oke/kubeconfig

oci-managed/main.tf

@@ -27,8 +27,8 @@ module "snet" {
   environment      = var.environment
 
   vcn_id           = module.vcn.vcn_id
-  vcn_nat_route_id = module.vcn.vcn_nat_route_table_id
-  vcn_ig_route_id  = module.vcn.vcn_ig_route_table_id
+  vcn_nat_route_id = module.vcn.nat_route_id
+  vcn_ig_route_id  = module.vcn.ig_route_id
 }
 
 module "oke" {
@@ -41,7 +41,7 @@ module "oke" {
   vcn_id                    = module.vcn.vcn_id
   vcn_public_subnet_id      = module.snet.public_subnet_id
   vcn_private_subnet_id     = module.snet.private_subnet_id
-  node_availability_domains = [var.availability_domain]
+  node_availability_domains = var.availability_domain
   node_pool_size            = var.node_pool_size
   ssh_public_key            = var.public_key_path
 }
@@ -51,6 +51,7 @@ module "nlb" {
 
   compartment_ocid = var.compartment_ocid
   cluster_ocid     = module.oke.cluster_ocid
-  cluster_public_endpoint = module.oke.public_endpoint
-  values_file = "traefik-values.yaml"
+  values_file      = "traefik-values.yaml"
+
+  depends_on = [ module.oke ]
 }

oci-managed/nlb/variables.tf

@@ -5,9 +5,6 @@ variable "environment" {
 variable "cluster_ocid" {
   type = string
 }
-variable "cluster_public_endpoint" {
-  type = string
-}
 
 variable "namespace" {
   description = "Namespace to install traefik chart into"

oci-managed/oke/data.tf

@@ -6,9 +6,21 @@ data "oci_core_images" "latest_image" {
   compartment_id = var.compartment_ocid
   operating_system = "Oracle Linux"
   operating_system_version = "8.8"
+  shape = "VM.Standard.A1.Flex"
   filter {
     name   = "display_name"
     values = ["^.*aarch64-.*$"]
     regex = true
   }
 }
+
+data "oci_containerengine_cluster_kube_config" "cluster_kube_config" {
+    #Required
+    cluster_id = oci_containerengine_cluster.k8s_cluster.id
+    token_version = "2.0.0"
+}
+
+resource "local_file" "oke_kubeconfig" {
+  content         = data.oci_containerengine_cluster_kube_config.cluster_kube_config.content
+  filename        = "${path.module}/kubeconfig"
+  }

oci-managed/oke/node_pool.tf

@@ -21,7 +21,7 @@ resource "oci_containerengine_node_pool" "k8s_node_pool" {
   }
 
   node_source_details {
-    image_id    = data.oci_core_images.latest_image.images.0.id
+    image_id    = var.node_image_ocid
     source_type = "image"
   }
 

oci-managed/oke/variables.tf

@@ -12,9 +12,11 @@ variable "kubernetes_version" {
 variable "ssh_public_key" {
   type = string
 }
+variable "node_image_ocid" {
+  default = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaiiymiaz2loraurxo6dgj5y4oiturf4inrkzvwimzw3d2a42kns6q"
+}
 variable "node_availability_domains" {
   type    = list(string)
-  default = data.oci_identity_availability_domains.ads.availability_domains[*].name
 }
 variable "node_pool_size" {
   type    = number
@@ -34,4 +36,3 @@ variable "vcn_public_subnet_id" {
 variable "vcn_private_subnet_id" {
   type = string
 }
-

oci-managed/provider.tf

@@ -19,3 +19,9 @@ provider "oci" {
   region                 = var.region
   retry_duration_seconds = 120
 }
+
+provider "helm" {
+  kubernetes {
+    config_path = "oke/kubeconfig"
+  }
+}