fix: versions file in submodules

additional fixes:
  - for default bastion os version when using Autonomous
  - disabling bastion addon when using different OS versions
  - operator await should only trigger if bastion is created

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

module-bastion.tf

@@ -46,18 +46,19 @@ module "bastion" {
   compartment_id = local.compartment_id
 
   # Bastion
-  assign_dns          = var.assign_dns
-  availability_domain = coalesce(var.bastion_availability_domain, lookup(local.ad_numbers_to_names, local.ad_numbers[0]))
-  image_id            = local.bastion_image_id
-  nsg_ids             = try(compact(flatten([var.bastion_nsg_ids, [try(module.network.bastion_nsg_id, null)]])), [])
-  is_public           = var.bastion_is_public
-  shape               = var.bastion_shape
-  ssh_private_key     = sensitive(local.ssh_private_key) # to await cloud-init completion
-  ssh_public_key      = local.ssh_public_key
-  subnet_id           = try(module.network.bastion_subnet_id, "") # safe destroy; validated in submodule
-  timezone            = var.timezone
-  upgrade             = var.bastion_upgrade
-  user                = var.bastion_user
+  assign_dns               = var.assign_dns
+  availability_domain      = coalesce(var.bastion_availability_domain, lookup(local.ad_numbers_to_names, local.ad_numbers[0]))
+  bastion_image_os_version = var.bastion_image_os_version
+  image_id                 = local.bastion_image_id
+  nsg_ids                  = try(compact(flatten([var.bastion_nsg_ids, [try(module.network.bastion_nsg_id, null)]])), [])
+  is_public                = var.bastion_is_public
+  shape                    = var.bastion_shape
+  ssh_private_key          = sensitive(local.ssh_private_key) # to await cloud-init completion
+  ssh_public_key           = local.ssh_public_key
+  subnet_id                = try(module.network.bastion_subnet_id, "") # safe destroy; validated in submodule
+  timezone                 = var.timezone
+  upgrade                  = var.bastion_upgrade
+  user                     = var.bastion_user
 
   # Standard tags as defined if enabled for use, or freeform
   # User-provided tags are merged last and take precedence

module-operator.tf

@@ -44,7 +44,7 @@ locals {
 }
 
 module "operator" {
-  count          = var.create_operator ? 1 : 0
+  count          = var.create_bastion && var.create_operator ? 1 : 0
   source         = "./modules/operator"
   state_id       = local.state_id
   compartment_id = local.compartment_id

modules/bastion/cloudinit.tf

@@ -11,7 +11,7 @@ data "cloudinit_config" "bastion" {
     # https://cloudinit.readthedocs.io/en/latest/reference/examples.html#run-commands-on-first-boot
     content = <<-EOT
     runcmd:
-    - dnf config-manager --disable ol8_addons --disable ol8_appstream
+    - dnf config-manager --disable ol${var.bastion_image_os_version}_addons --disable ol${var.bastion_image_os_version}_appstream
     EOT
   }
 

modules/bastion/variables.tf

@@ -8,6 +8,7 @@ variable "state_id" { type = string }
 # Bastion
 variable "assign_dns" { type = bool }
 variable "availability_domain" { type = string }
+variable "bastion_image_os_version" {type = string}
 variable "image_id" { type = string }
 variable "is_public" { type = bool }
 variable "nsg_ids" { type = list(string) }

modules/cluster/versions.tf

@@ -1 +1,16 @@
-../../versions.tf
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.3.0"
+
+  required_providers {
+
+    oci = {
+      configuration_aliases = [oci.home]
+      source                = "oracle/oci"
+      version               = ">= 4.119.0"
+    }
+
+  }
+}

modules/iam/versions.tf

@@ -1 +1,19 @@
-../../versions.tf
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.3.0"
+
+  required_providers {
+    oci = {
+      configuration_aliases = [oci.home]
+      source                = "oracle/oci"
+      version               = ">= 4.119.0"
+    }
+
+    time = {
+      source  = "hashicorp/time"
+      version = ">= 0.9.1"
+    }
+  }
+}

modules/network/versions.tf

@@ -1 +1,16 @@
-../../versions.tf
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+terraform {
+  required_version = ">= 1.3.0"
+
+  required_providers {
+
+    oci = {
+      configuration_aliases = [oci.home]
+      source                = "oracle/oci"
+      version               = ">= 4.119.0"
+    }
+
+  }
+}

modules/operator/versions.tf

@@ -1,28 +1,23 @@
-# Copyright (c) 2017, 2023 Oracle Corporation and/or its affiliates.
+# Copyright (c) 2017, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
-  required_version = ">= 1.2.0"
+  required_version = ">= 1.3.0"
 
   required_providers {
     cloudinit = {
       source  = "hashicorp/cloudinit"
       version = ">= 2.2.0"
     }
 
-    helm = {
-      source  = "hashicorp/helm"
-      version = ">= 2.9.0"
-    }
-
     null = {
       source  = "hashicorp/null"
       version = ">= 3.2.1"
     }
 
     oci = {
-      source  = "oracle/oci"
-      version = ">= 4.119.0"
+      source                = "oracle/oci"
+      version               = ">= 4.119.0"
     }
   }
 }

variables-bastion.tf

@@ -60,7 +60,7 @@ variable "bastion_image_os" {
 }
 
 variable "bastion_image_os_version" {
-  default     = "8.8"
+  default     = "8"
   description = "Bastion image operating system version when bastion_image_type = 'platform'."
   type        = string
 }