Merge pull request #25 from oracle/springboot-1.1.1

Added fix for cluster version
oracle · Sep 1, 2023 · 88a61ba · 88a61ba
2 parents f433c6d + 16eed07
commit 88a61ba
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf
@@ -8,7 +8,7 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" {
     ]
     subnet_id = oci_core_subnet.endpoint.id
   }
-  kubernetes_version  = "v1.25.4"
+  kubernetes_version  = local.latest
   name                = "mtdrworkshopcluster-${var.mtdrKey}"
   vcn_id              = oci_core_vcn.okevcn.id
   #optional
@@ -36,7 +36,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.mtdrworkshop_cluster.id
   compartment_id     = var.ociCompartmentOcid
-  kubernetes_version = "v1.25.4"
+  kubernetes_version = local.latest
   name               = "Pool"
   #  node_shape="VM.Standard2.4"
   #  node_shape         = "VM.Standard.B2.1"
@@ -80,4 +80,9 @@ data "oci_containerengine_node_pool_option" "mtdrworkshop_node_pool_option" {
 locals {
   all_sources = data.oci_containerengine_node_pool_option.mtdrworkshop_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]
-}
+}
+
+locals {
+    versions = reverse(sort(data.oci_containerengine_cluster_option.mtdrworkshop_cluster_option.kubernetes_versions))
+    latest = local.versions[0]
+  }
diff --git a/MtdrSpring/terraform/database.tf b/MtdrSpring/terraform/database.tf
@@ -50,4 +50,8 @@ output "ns_objectstorage_namespace" {
 }
 output "autonomous_database_admin_password" {
   value =  [ "Welcome12345" ]
+}
+
+output "adb_ocid" {
+  value = oci_database_autonomous_database.autonomous_database_atp.id
 }
diff --git a/MtdrSpring/terraform/provider.tf b/MtdrSpring/terraform/provider.tf
@@ -1,11 +1,12 @@
 terraform {
-  required_providers{
+  required_providers {
     oci = {
-      source = "hashicorp/oci"
-      version = "4.42.0"
+      source = "oracle/oci"
+      version = ">= 5.9.0"
     }
   }
 }
+
 provider "oci"{
   region = var.ociRegionIdentifier
 }
diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh
@@ -284,7 +284,7 @@ fi
 
 # Get MTDR_DB OCID
 while ! state_done MTDR_DB_OCID; do
-  MTDR_DB_OCID=`oci db autonomous-database list --compartment-id "$(cat state/COMPARTMENT_OCID)" --query 'join('"' '"',data[?"display-name"=='"'MTDRDB'"'].id)' --raw-output`
+  MTDR_DB_OCID=`terraform -chdir="$MTDRWORKSHOP_LOCATION/terraform" output --raw adb_ocid`
   if [[ "$MTDR_DB_OCID" =~ ocid1.autonomousdatabase* ]]; then
     state_set MTDR_DB_OCID "$MTDR_DB_OCID"
   else