Fixed some bugs in helms. (#111)

Author: dkennetzoracle

oci_ai_blueprints_terraform/app-api.tf

@@ -90,40 +90,7 @@ resource "kubernetes_deployment" "corrino_cp_deployment" {
               }
             }
           }
-
-          # dynamic "env" {
-          #   for_each = local.env_adb_access
-          #   content {
-          #     name  = env.value.name
-          #     value = env.value.value
-          #   }
-          # }
-
-          # dynamic "env" {
-          #   for_each = local.env_adb_access_secrets
-          #   content {
-          #     name = env.value.name
-          #     value_from {
-          #       secret_key_ref {
-          #         name = env.value.secret_name
-          #         key  = env.value.secret_key
-          #       }
-          #     }
-          #   }
-          # }
-
-          # volume_mount {
-          #   name       = "adb-wallet-volume"
-          #   mount_path = "/app/wallet"
-          #   read_only  = true
-          # }
         }
-        # volume {
-        #   name = "adb-wallet-volume"
-        #   secret {
-        #     secret_name = "oadb-wallet"
-        #   }
-        # }
       }
     }
   }

oci_ai_blueprints_terraform/app-background.tf

@@ -67,40 +67,7 @@ resource "kubernetes_deployment" "corrino_cp_background_deployment" {
               }
             }
           }
-
-          # dynamic "env" {
-          #   for_each = local.env_adb_access
-          #   content {
-          #     name  = env.value.name
-          #     value = env.value.value
-          #   }
-          # }
-
-          # dynamic "env" {
-          #   for_each = local.env_adb_access_secrets
-          #   content {
-          #     name = env.value.name
-          #     value_from {
-          #       secret_key_ref {
-          #         name = env.value.secret_name
-          #         key  = env.value.secret_key
-          #       }
-          #     }
-          #   }
-          # }
-
-          # volume_mount {
-          #   name       = "adb-wallet-volume"
-          #   mount_path = "/app/wallet"
-          #   read_only  = true
-          # }
         }
-        # volume {
-        #   name = "adb-wallet-volume"
-        #   secret {
-        #     secret_name = "oadb-wallet"
-        #   }
-        # }
       }
     }
   }

oci_ai_blueprints_terraform/app-migration.tf

@@ -101,8 +101,8 @@ resource "kubernetes_job" "corrino_migration_job" {
   }
   wait_for_completion = true
   timeouts {
-    create = "10m"
-    update = "10m"
+    create = "20m"
+    update = "20m"
   }
 
   depends_on = [

oci_ai_blueprints_terraform/files/kong/values.yaml

@@ -1,7 +1,7 @@
 # Kong Gateway - Clean Setup for AI Model Routing
 image:
-  repository: kong
-  tag: "3.9"
+  repository: docker.io/kong
+  tag: "3.9.1"
 
 # DB-less mode
 env:
@@ -57,6 +57,9 @@ status:
 
 # Enable Kong Ingress Controller
 ingressController:
+  image:
+    repository: docker.io/kong/kubernetes-ingress-controller
+    tag: "3.5"
   enabled: true
   env:
     kong_admin_token: kong-admin-token

oci_ai_blueprints_terraform/helm.tf

@@ -85,15 +85,15 @@ resource "helm_release" "amd_device_metrics_exporter" {
   name              = "amd-device-metrics-exporter"
   chart             = "device-metrics-exporter-charts"
   repository        = "https://rocm.github.io/device-metrics-exporter"
-  version           = "v1.2.1"
+  version           = "v1.3.1"
   values            = ["${file("./files/amd-device-metrics-exporter/values.yaml")}"]
   create_namespace  = false
   recreate_pods     = true
   force_update      = true
   dependency_update = true
   wait              = false
   max_history       = 1
-  depends_on = [null_resource.webhook_charts_ready]
+  depends_on = [null_resource.webhook_charts_ready, module.oke-quickstart.helm_release_prometheus]
 }
 
 resource "helm_release" "keda" {

oci_ai_blueprints_terraform/modules/corrino/modules/cluster-tools/outputs.tf

@@ -13,3 +13,6 @@ output "helm_release_grafana" {
    value = helm_release.grafana
 }
 
+output "helm_release_prometheus" {
+   value = helm_release.prometheus
+}

oci_ai_blueprints_terraform/modules/corrino/outputs.tf

@@ -58,4 +58,8 @@ output "helm_release_ingress_nginx" {
 
 output "helm_release_grafana" {
   value = module.cluster-tools.helm_release_grafana
+}
+
+output "helm_release_prometheus" {
+  value = module.cluster-tools.helm_release_prometheus
 }