root module update 0.9.3

brokedba · Nov 30, 2024 · 8ab73a2 · 8ab73a2
1 parent 8939dc6
commit 8ab73a2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/terraform-provider-oci/oke-quickstartz/VERSION b/terraform-provider-oci/oke-quickstartz/VERSION
@@ -1 +1 @@
-0.9.2
+0.9.3
diff --git a/terraform-provider-oci/oke-quickstartz/oci-networking.tf b/terraform-provider-oci/oke-quickstartz/oci-networking.tf
@@ -1,8 +1,8 @@
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022-2024, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
-# File Version: 0.9.0
+# File Version: 0.10.1
 
 # Dependencies:
 #   - defaults.tf file
@@ -24,8 +24,9 @@
 ##   Date                    Name              Description
 ##   (DD/MM/YYYY)
 ##   ----------    ------------------------    --------------------------------------
-##   28/05/2024     Kosseila HD (CLoudDude)      repatriated networtking modules back to the repo
+##   28/05/2024     Kosseila HD (CloudDude)      repatriated networtking modules back to the repo
 ##                                              from :github.com/oracle-quickstart/terraform-oci-networking//modules/*?ref=0.2.0
+##   28/11/2024     Kosseila HD (CloudDude)      updated the content based on last commit 0.9.3 Zero Nine 3 Pull #42
 ############################################################################################
 ################################################################################
 # Module: Virtual Cloud Network (VCN)
@@ -61,12 +62,12 @@ module "subnets" {
   create_subnet              = local.create_subnets
   subnet_name                = each.value.subnet_name
   cidr_block                 = each.value.cidr_block
-  display_name               = each.value.display_name # If null, is autogenerated
-  dns_label                  = each.value.dns_label    # If null, is autogenerated
+  display_name               = try(each.value.display_name, null) # If null, is autogenerated
+  dns_label                  = try(each.value.dns_label, null)    # If null, is autogenerated
   prohibit_public_ip_on_vnic = each.value.prohibit_public_ip_on_vnic
   prohibit_internet_ingress  = each.value.prohibit_internet_ingress
   route_table_id = (anytrue([(each.value.alternative_route_table_name == ""), (each.value.alternative_route_table_name == null)])
-    ? each.value.route_table_id
+ ? try(each.value.route_table_id, null)
   : module.route_tables[each.value.alternative_route_table_name].route_table_id)                                                                        # If null, the VCN's default route table is used
   dhcp_options_id   = each.value.dhcp_options_id                                                                                                        # If null, the VCN's default set of DHCP options is used
   security_list_ids = concat(each.value.security_list_ids, [for v in each.value.extra_security_list_names : module.security_lists[v].security_list_id]) # If null, the VCN's default security list is used
@@ -126,7 +127,7 @@ module "route_tables" {
   # Route Table attributes
   create_route_table = local.create_subnets
   route_table_name   = each.value.route_table_name
-  display_name       = each.value.display_name
+  display_name       = try(each.value.display_name, null)
   route_rules        = each.value.route_rules
 }
 

diff --git a/terraform-provider-oci/oke-quickstartz/outputs.tf b/terraform-provider-oci/oke-quickstartz/outputs.tf
@@ -20,13 +20,17 @@ output "deployed_oke_kubernetes_version" {
 output "deployed_to_region" {
   value = module.oke.deployed_to_region
 }
+output "cluster_endpoint_visibility" {
+  description = "The visibility of the cluster endpoint."
+  value       = var.cluster_endpoint_visibility
+}
 output "kubeconfig" {
   value     = module.oke.kubeconfig
   sensitive = true
 }
 output "kubeconfig_for_kubectl" {
   value       = module.oke.kubeconfig_for_kubectl
-  description = "If using Terraform locally, this command set KUBECONFIG environment variable to run kubectl locally"
+  description = "If using Terraform locally, this sets KUBECONFIG environment variable to run kubectl locally"
 }
 output "oke_cluster_ocid" {
   value = module.oke.oke_cluster_ocid

diff --git a/terraform-provider-oci/oke-quickstartz/versions.tf b/terraform-provider-oci/oke-quickstartz/versions.tf
@@ -3,37 +3,37 @@
 # 
 
 terraform {
-  required_version = ">= 1.1"
+  required_version = ">= 1.5" #">= 1.1"
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = "~> 4, < 5"
+      version = ">= 6" #"~> 4, < 5"
       # https://registry.terraform.io/providers/oracle/oci/
       configuration_aliases = [oci.home_region]
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2"
+      version = ">= 2.32" #"~> 2"
       # https://registry.terraform.io/providers/hashicorp/kubernetes/
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2"
+      version = ">= 2.15" #"~> 2"
       # https://registry.terraform.io/providers/hashicorp/helm/
     }
     tls = {
       source  = "hashicorp/tls"
-      version = "~> 4"
+      version = ">= 4" # "~> 4"
       # https://registry.terraform.io/providers/hashicorp/tls/
     }
     local = {
       source  = "hashicorp/local"
-      version = "~> 2"
+      version = ">= 2.5" #"~> 2"
       # https://registry.terraform.io/providers/hashicorp/local/
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3"
+      version = ">= 3.6" #"~> 3"
       # https://registry.terraform.io/providers/hashicorp/random/
     }
   }