Add stack versioning and AI blueprints link (#59)

grantneumanoracle · web-flow · commit c80e0470a947 · 2025-05-20T19:50:16.000-07:00
- Introduced CLUSTER_CREATION_STACK_VERSION and OCI_AI_BLUEPRINTS_STACK_VERSION files to manage versioning.
- Updated outputs.tf to include stack version outputs for both cluster creation and AI blueprints.
- Modified schema.yaml to reflect new version variables and outputs.
- Replaced hardcoded version references with dynamic variables in locals and outputs.
- Removed obsolete VERSION files from the repository.
diff --git a/cluster_creation_terraform/CLUSTER_CREATION_STACK_VERSION b/cluster_creation_terraform/CLUSTER_CREATION_STACK_VERSION
@@ -0,0 +1 @@
+v1.0.0
diff --git a/cluster_creation_terraform/OCI_AI_BLUEPRINTS_LINK b/cluster_creation_terraform/OCI_AI_BLUEPRINTS_LINK
@@ -0,0 +1 @@
+"https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-ai-blueprints/releases/download/release-2025-05-16/release_2025_05_16_app.zip"
diff --git a/cluster_creation_terraform/outputs.tf b/cluster_creation_terraform/outputs.tf
@@ -2,6 +2,10 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+output "cluster_creation_stack_version" {
+  value = file("${path.module}/CLUSTER_CREATION_STACK_VERSION")
+}
+
 output "oke_cluster_name" {
   value = oci_containerengine_cluster.oke_cluster[0].name
 }
diff --git a/cluster_creation_terraform/schema.yaml b/cluster_creation_terraform/schema.yaml
@@ -20,6 +20,11 @@ variableGroups:
     - region
     visible: false
 
+  - title: "Stack Version"
+    variables:
+    - cluster_creation_stack_version
+    visible: true
+
   - title: "Advanced Configuration?"
     variables: 
     - show_advanced
@@ -131,6 +136,13 @@ variables:
 
 outputs:
 
+  cluster_creation_stack_version:
+    type: string
+    title: "Stack Version"
+    description: "The version of this stack"
+    required: true
+    visible: true
+
   oke_cluster_name:
     type: string
     title: "OKE Cluster Name"
@@ -196,6 +208,11 @@ outputGroups:
     outputs:
       - oci_ai_blueprints_link_for_section
 
+
+  - title: "Cluster Creation Stack Version"
+    outputs:
+      - cluster_creation_stack_version
+
   - title: OKE Cluster Details
     outputs:
       - oke_cluster_name
diff --git a/cluster_creation_terraform/variables.tf b/cluster_creation_terraform/variables.tf
@@ -2,7 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 variable "oci_ai_blueprints_link_variable" {
-  default = "https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-ai-blueprints/releases/download/release-2025-05-16/release_2025_05_16_app.zip"
+  type    = string
+  default = file("${path.module}/OCI_AI_BLUEPRINTS_LINK")
 }
 
 # OKE Variables
diff --git a/oci_ai_blueprints_terraform/OCI_AI_BLUEPRINTS_STACK_VERSION b/oci_ai_blueprints_terraform/OCI_AI_BLUEPRINTS_STACK_VERSION
@@ -0,0 +1 @@
+v1.0.0
diff --git a/oci_ai_blueprints_terraform/VERSION b/oci_ai_blueprints_terraform/VERSION
diff --git a/oci_ai_blueprints_terraform/app-configmap.tf b/oci_ai_blueprints_terraform/app-configmap.tf
@@ -10,7 +10,7 @@ resource "kubernetes_config_map" "corrino-configmap" {
     ADDON_GRAFANA_USER                             = local.addon.grafana_user
     BACKEND_SERVICE_NAME                           = local.app.backend_service_name
     COMPARTMENT_ID                                 = local.oci.compartment_id
-    CORRINO_VERSION                                = local.versions.corrino_version
+    CONTROL_PLANE_VERSION                          = var.stack_version
     DJANGO_ALLOWED_HOSTS                           = local.django.allowed_hosts
     DJANGO_CSRF_TRUSTED_ORIGINS                    = local.django.csrf_trusted_origins
     DJANGO_SECRET                                  = local.django.secret
diff --git a/oci_ai_blueprints_terraform/helm.tf b/oci_ai_blueprints_terraform/helm.tf
@@ -112,6 +112,7 @@ resource "helm_release" "kueue" {
   wait             = false
   version          = "0.11.4"
 
-  count = var.bring_your_own_kueue ? 0 : 1
+  count      = var.bring_your_own_kueue ? 0 : 1
+  depends_on = [kubernetes_job.corrino_migration_job, kubernetes_job.wallet_extractor_job]
 }
 
diff --git a/oci_ai_blueprints_terraform/locals.tf b/oci_ai_blueprints_terraform/locals.tf
@@ -11,9 +11,9 @@ locals {
     backend_service_name_origin  = "http://corrino-cp"
     backend_service_name_ingress = "corrino-cp-ingress"
     #    backend_image_uri_base                       = join(":", [local.ocir.base_uri, local.ocir.backend_image])
-    backend_image_uri = format("${local.ocir.base_uri}:${local.ocir.backend_image}-${local.versions.corrino_version}")
+    backend_image_uri = format("${local.ocir.base_uri}:${local.ocir.backend_image}-${var.stack_version}")
     #frontend_image_uri                           = join(":", [local.ocir.base_uri, local.ocir.frontend_image])
-    blueprint_portal_image_uri                     = join(":", [local.ocir.base_uri, local.ocir.blueprint_portal_image])
+    blueprint_portal_image_uri                     = format("${local.ocir.base_uri}:${local.ocir.blueprint_portal_image}-${var.stack_version}")
     recipe_bucket_name                             = "corrino-recipes"
     recipe_validation_enabled                      = "True"
     recipe_validation_shape_availability_enabled   = "True"
@@ -30,16 +30,16 @@ locals {
     object_filename = "corrino_registration.json"
     object_filepath = format("%s/%s", abspath(path.root), random_uuid.registration_id.result)
     object_content = jsonencode({
-      "Registration ID"  = random_uuid.registration_id.result
-      "Deploy DateTime"  = local.ts
-      "Administrator"    = var.corrino_admin_email
-      "Workspace Name"   = local.app_name
-      "Deploy ID"        = local.deploy_id
-      "Corrino Version"  = var.corrino_version
-      "FQDN"             = local.fqdn.name
-      "Tenancy OCID"     = local.oci.tenancy_id
-      "OKE Cluster OCID" = local.oke.cluster_ocid
-      "Region"           = local.oci.region_name
+      "Registration ID"       = random_uuid.registration_id.result
+      "Deploy DateTime"       = local.ts
+      "Administrator"         = var.corrino_admin_email
+      "Workspace Name"        = local.app_name
+      "Deploy ID"             = local.deploy_id
+      "Control Plane Version" = var.stack_version
+      "FQDN"                  = local.fqdn.name
+      "Tenancy OCID"          = local.oci.tenancy_id
+      "OKE Cluster OCID"      = local.oke.cluster_ocid
+      "Region"                = local.oci.region_name
     })
     upload_path = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/bqCfQwvzAZPCnxehCZs1Le5V2Pajn3j4JsFzb5CWHRNvtQ4Je-Lk_ApwCcurdpYT/n/iduyx1qnmway/b/corrino-terraform-registry/o/${random_uuid.registration_id.result}/"
   }
@@ -49,10 +49,6 @@ locals {
     "corrino_uuid"      = random_uuid.registration_id.result
   }
 
-  versions = {
-    corrino_version = var.corrino_version
-  }
-
   oke = {
     deploy_id    = local.deploy_id
     cluster_ocid = var.existent_oke_cluster_id
@@ -139,7 +135,7 @@ locals {
   }
 
   third_party_namespaces = {
-    prometheus_namespace = var.bring_your_own_prometheus ? var.existent_prometheus_namespace : data.kubernetes_namespace.cluster_tools_namespace.0.id 
+    prometheus_namespace = var.bring_your_own_prometheus ? var.existent_prometheus_namespace : data.kubernetes_namespace.cluster_tools_namespace.0.id
   }
 
   env_universal = [
@@ -227,9 +223,9 @@ locals {
       config_map_key  = "COMPARTMENT_ID"
     },
     {
-      name            = "CORRINO_VERSION"
+      name            = "CONTROL_PLANE_VERSION"
       config_map_name = "corrino-configmap"
-      config_map_key  = "CORRINO_VERSION"
+      config_map_key  = "CONTROL_PLANE_VERSION"
     },
     {
       name            = "DJANGO_ALLOWED_HOSTS"
diff --git a/oci_ai_blueprints_terraform/modules/corrino/VERSION b/oci_ai_blueprints_terraform/modules/corrino/VERSION
diff --git a/oci_ai_blueprints_terraform/modules/corrino/outputs.tf b/oci_ai_blueprints_terraform/modules/corrino/outputs.tf
@@ -3,9 +3,7 @@
 # 
 
 # Deployment outputs
-output "stack_version" {
-  value = file("${path.module}/VERSION")
-}
+
 output "deploy_id" {
   value = local.deploy_id
 }
@@ -55,9 +53,9 @@ output "cluster_tools_namespace" {
 }
 
 output "helm_release_ingress_nginx" {
-   value = module.cluster-tools.helm_release_ingress_nginx
+  value = module.cluster-tools.helm_release_ingress_nginx
 }
 
 output "helm_release_grafana" {
-   value = module.cluster-tools.helm_release_grafana
+  value = module.cluster-tools.helm_release_grafana
 }
diff --git a/oci_ai_blueprints_terraform/outputs.tf b/oci_ai_blueprints_terraform/outputs.tf
@@ -101,9 +101,13 @@ output "external_ip" {
 output "corrino_source_code" {
   value = "https://github.com/oracle-quickstart/corrino/"
 }
-output "corrino_version" {
+output "stack_version" {
   #  value = file("${path.module}/VERSION")
-  value = local.versions.corrino_version
+  value = var.stack_version
+}
+
+output "oci_ai_blueprints_stack_version" {
+  value = file("${path.module}/OCI_AI_BLUEPRINTS_STACK_VERSION")
 }
 
 output "corrino_admin_username_output" {
diff --git a/oci_ai_blueprints_terraform/schema.yaml b/oci_ai_blueprints_terraform/schema.yaml
@@ -20,6 +20,11 @@ source:
 
 outputGroups:
 
+  - title: Versions
+    outputs:
+      - oci_ai_blueprints_stack_version
+      - stack_version
+
   - title: "OCI AI Blueprints Portal"
     outputs:
       - blueprints_portal_url
@@ -54,20 +59,15 @@ variableGroups:
     - region
     visible: false
 
+  - title: "Version Control"
+    variables:
+    - stack_version
+
 
   - title: "Prerequisites"
     variables:
     - is_oke_cluster_setup
 
-  # - title: "Corrino Workspace"
-  #   variables:
-  #   - app_name
-  #   - deploy_id
-  #   - corrino_version
-#    - show_advanced
-#    - mushop_atp
-    # - mushop_oss
-
   - title: "OCI AI Blueprints Admin"
     variables:
     - corrino_admin_username
@@ -416,15 +416,6 @@ variables:
 #    description: "Shows advanced options, allowing enable customer-managed encryption keys, select your ssh key, select/unselect cluster utilities, do not create policies, and other advanced options"
 #    visible: true
 
-  # Corrino Version
-
-  corrino_version:
-    type: string
-    title: "OCI AI Blueprints Version"
-    description: "This is the version of OCI AI Blueprints software that will be installed."
-    required: true
-    default: "latest"
-    visible: false
 
   # --------------------
   # Corrino Users
@@ -458,8 +449,30 @@ variables:
     required: true
     default: false
     visible: true
-    
-    
+
+
+
+  # ---------------------------------
+  # Version Control
+  # ---------------------------------
+  stack_version:
+    title: "Stack Version"
+    type: enum
+    enum:
+      - "v1.0.0"
+    default: "v1.0.0"
+    required: true
+    visible: true
+
+
+  oci_ai_blueprints_stack_version:
+    type: string
+    title: "OCI AI Blueprints Stack Version"
+    description: "The version of this stack"
+    required: true
+    visible: false
+
+
   # --------------------
   # ADB
   # --------------------
@@ -1224,13 +1237,6 @@ variables:
 #      - autonomous_database_password
 
 
-#  - title: Dev Notes
-#    outputs:
-##      - dev
-#      - deploy_id
-#      - corrino_source_code
-#      - corrino_version
-
 outputs:
 
   external_ip:
@@ -1336,9 +1342,6 @@ outputs:
   corrino_source_code:
     visible: false
 
-  corrino_version:
-    visible: false
-
   cluster_region:
     visible: false
 
diff --git a/oci_ai_blueprints_terraform/variables.tf b/oci_ai_blueprints_terraform/variables.tf
@@ -65,9 +65,8 @@ variable "policy_creation_enabled" {
   default     = false
 }
 
-variable "corrino_version" {
-  type    = string
-  default = "latest"
+variable "stack_version" {
+  type = string
 }
 
 variable "share_data_with_corrino_team_enabled" {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-ai-blueprints/releases/download/release-2025-05-16/release_2025_05_16_app.zip"`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`3`	`3`	`#`
`4`	`4`
	`5`	`+output "cluster_creation_stack_version" {`
	`6`	`+ value = file("${path.module}/CLUSTER_CREATION_STACK_VERSION")`
	`7`	`+}`
	`8`	`+`
`5`	`9`	`output "oke_cluster_name" {`
`6`	`10`	`value = oci_containerengine_cluster.oke_cluster[0].name`
`7`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`3`	`3`	`#`
`4`	`4`	`variable "oci_ai_blueprints_link_variable" {`
`5`		`- default = "https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-ai-blueprints/releases/download/release-2025-05-16/release_2025_05_16_app.zip"`
	`5`	`+ type = string`
	`6`	`+ default = file("${path.module}/OCI_AI_BLUEPRINTS_LINK")`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`# OKE Variables`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ resource "helm_release" "kueue" {`
`112`	`112`	`wait = false`
`113`	`113`	`version = "0.11.4"`
`114`	`114`
`115`		`- count = var.bring_your_own_kueue ? 0 : 1`
	`115`	`+ count = var.bring_your_own_kueue ? 0 : 1`
	`116`	`+ depends_on = [kubernetes_job.corrino_migration_job, kubernetes_job.wallet_extractor_job]`
`116`	`117`	`}`
`117`	`118`