From b64a6af77b59feab8835a546f938fff679d325aa Mon Sep 17 00:00:00 2001
From: Oguz Pastirmaci <oguz.pastirmaci@oracle.com>
Date: Thu, 1 Aug 2024 17:58:36 -0700
Subject: [PATCH] Fix the wrong repo in cloud init (#30)

* Add instructions for adding a service account

* Update manifest link

* Update Terraform template
---
 terraform/cloud-init/ubuntu.sh | 2 +-
 terraform/main.tf              | 4 +++-
 terraform/variables.tf         | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/terraform/cloud-init/ubuntu.sh b/terraform/cloud-init/ubuntu.sh
index 7cabf45..c3effe1 100644
--- a/terraform/cloud-init/ubuntu.sh
+++ b/terraform/cloud-init/ubuntu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Add OKE repo & install the package
-add-apt-repository -y ''deb [trusted=yes] https://objectstorage.us-ashburn-1.oraclecloud.com/p/1_NbjfnPPmyyklGibGM-qEpujw9jEpWSLa9mXEIUFCFYqqHdUh5cFAWbj870h-g0/n/hpc_limited_availability/b/oke_node_packages/o/1.29.1/ubuntu stable main'
+add-apt-repository -y 'deb [trusted=yes] https://objectstorage.us-ashburn-1.oraclecloud.com/p/1_NbjfnPPmyyklGibGM-qEpujw9jEpWSLa9mXEIUFCFYqqHdUh5cFAWbj870h-g0/n/hpc_limited_availability/b/oke_node_packages/o/1.29.1/ubuntu stable main'
 
 apt install -y oci-oke-node-all=1.29.1*
 
diff --git a/terraform/main.tf b/terraform/main.tf
index c4194c8..012d1ac 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,6 +1,6 @@
 module "oke" {
   source  = "oracle-terraform-modules/oke/oci"
-  version = "5.1.7"
+  version = "5.1.8"
 
   # Provider
   providers           = { oci.home = oci.home }
@@ -34,6 +34,8 @@ module "oke" {
       description = "Operational pool", enabled = true,
       disable_default_cloud_init=true,
       mode        = "node-pool",
+      image_type = "custom",
+      image_id = var.operational_pool_image,
       boot_volume_size = 150,
       shape = "VM.Standard.E4.Flex",
       ocpus = 16,
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 7976921..c4a1246 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -6,11 +6,10 @@ variable "compartment_id" { type = string }
 variable "ssh_public_key_path" { type = string }
 variable "ssh_private_key_path" { type = string }
 
-variable system_pool_image { default = "" }
+variable operational_pool_image { default = "" }
 variable gpu_image { default = "" }
 variable gpu_shape { default = "" }
 variable kubernetes_version { default = "v1.29.1" }
 variable cluster_type { default = "enhanced" }
-variable cluster_name { default = "gpu-cluster" }
 variable cni_type {default = "flannel"}
 variable cluster_name { default = "oke-gpu-rdma-quickstart" }