Merge pull request #16 from junior/5G-example

Small fix - 0.8.4

Author: junior

VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

cluster-tools.tf

@@ -52,7 +52,7 @@ module "cluster-tools" {
 # Kubernetes Cluster Tools
 ## IngressController/LoadBalancer
 variable "ingress_nginx_enabled" {
-  default     = true
+  default     = false
   description = "Enable Ingress Nginx for Kubernetes Services (This option provision a Load Balancer)"
 }
 variable "ingress_load_balancer_shape" {
@@ -95,7 +95,7 @@ variable "ingress_email_issuer" {
 
 ## Cert Manager
 variable "cert_manager_enabled" {
-  default     = true
+  default     = false
   description = "Enable x509 Certificate Management"
 }
 
@@ -107,13 +107,13 @@ variable "metrics_server_enabled" {
 
 ## Prometheus
 variable "prometheus_enabled" {
-  default     = true
+  default     = false
   description = "Enable Prometheus"
 }
 
 ## Grafana
 variable "grafana_enabled" {
-  default     = true
+  default     = false
   description = "Enable Grafana Dashboards. Includes example dashboards and Prometheus, OCI Logging and OCI Metrics datasources"
 }
 

defaults.tf

@@ -20,7 +20,7 @@
 ################################################################################
 locals {
   deploy_id   = random_string.deploy_id.result
-  deploy_tags = { "DeploymentID" = local.deploy_id, "AppName" = local.app_name, "Quickstart" = "oke_base" }
+  deploy_tags = { "DeploymentID" = local.deploy_id, "AppName" = local.app_name, "Quickstart" = "terraform-oci-oke-quickstart" }
   oci_tag_values = {
     "freeformTags" = merge(var.tag_values.freeformTags, local.deploy_tags),
     "definedTags"  = var.tag_values.definedTags

examples/basic-cluster/oke.tf

@@ -1,5 +1,5 @@
 module "oke-quickstart" {
-  source = "github.com/oracle-quickstart/terraform-oci-oke-quickstart?ref=0.8.2"
+  source = "github.com/oracle-quickstart/terraform-oci-oke-quickstart?ref=0.8.3"
 
   # Oracle Cloud Infrastructure Tenancy and Compartment OCID
   tenancy_ocid     = var.tenancy_ocid
@@ -11,7 +11,7 @@ module "oke-quickstart" {
   app_name = "Basic"
 
   # Freeform Tags + Defined Tags. Tags are applied to all resources.
-  tag_values = { "freeformTags" = { "Environment" = "Development", "DeploymentType" = "basic" }, "definedTags" = {} }
+  tag_values = { "freeformTags" = { "Environment" = "Development", "DeploymentType" = "basic", "QuickstartExample" = "basic-cluster" }, "definedTags" = {} }
 
   # OKE Node Pool 1 arguments
   node_pool_cni_type_1                 = "FLANNEL_OVERLAY" # Use "OCI_VCN_IP_NATIVE" for VCN Native PODs Network. If the node pool 1 uses the OCI_VCN_IP_NATIVE, the cluster will also be configured with same cni

examples/basic-cluster/outputs.tf

@@ -4,7 +4,7 @@
 
 # Deployment outputs
 output "deploy_id" {
-  value = local.deploy_id
+  value = module.oke-quickstart.deploy_id
 }
 
 # OKE Outputs
@@ -33,6 +33,6 @@ output "dev" {
 # Use of this resource for production deployments is not recommended. 
 # Instead, generate a private key file outside of Terraform and distribute it securely to the system where Terraform will be run.
 output "generated_private_key_pem" {
-  value     = var.generate_public_ssh_key ? tls_private_key.oke_worker_node_ssh_key.private_key_pem : "No Keys Auto Generated"
+  value     = module.oke-quickstart.generated_private_key_pem
   sensitive = true
 }

main.tf

@@ -408,7 +408,7 @@ locals {
           udp_options  = { max = -1, min = -1, source_port_range = null }
           icmp_options = null
           }, {
-          description  = "Path discovery"
+          description  = "Path discovery - Kubernetes API Endpoint"
           source       = lookup(local.network_cidrs, "ENDPOINT-REGIONAL-SUBNET-CIDR")
           source_type  = "CIDR_BLOCK"
           protocol     = local.security_list_ports.icmp_protocol_number
@@ -417,6 +417,15 @@ locals {
           udp_options  = { max = -1, min = -1, source_port_range = null }
           icmp_options = { type = "3", code = "4" }
           }, {
+          description  = "Path discovery"
+          source       = lookup(local.network_cidrs, "ALL-CIDR")
+          source_type  = "CIDR_BLOCK"
+          protocol     = local.security_list_ports.icmp_protocol_number
+          stateless    = false
+          tcp_options  = { max = -1, min = -1, source_port_range = null }
+          udp_options  = { max = -1, min = -1, source_port_range = null }
+          icmp_options = { type = "3", code = "4" }
+          }, {
           description  = "Load Balancer to Worker nodes node ports"
           source       = lookup(local.network_cidrs, "LB-REGIONAL-SUBNET-CIDR")
           source_type  = "CIDR_BLOCK"
@@ -435,7 +444,7 @@ locals {
           description      = "Allow traffic to worker nodes"
           destination      = lookup(local.network_cidrs, "ALL-CIDR")
           destination_type = "CIDR_BLOCK"
-          protocol         = local.security_list_ports.tcp_protocol_number # all_protocols
+          protocol         = local.security_list_ports.all_protocols
           stateless        = false
           tcp_options      = { max = 32767, min = 30000, source_port_range = null }
           udp_options      = { max = -1, min = -1, source_port_range = null }

modules/cluster-tools/cluster-tools.tf

@@ -25,7 +25,7 @@ locals {
     metrics_server         = "https://kubernetes-sigs.github.io/metrics-server"
     metrics_server_version = "3.8.2"
   }
-  use_cluster_tools_namespace = (var.grafana_enabled || var.ingress_nginx_enabled || var.cert_manager_enabled || var.prometheus_enabled) ? true : false
+  use_cluster_tools_namespace = anytrue([var.grafana_enabled,var.ingress_nginx_enabled,var.cert_manager_enabled,var.prometheus_enabled]) ? true : false
 }
 
 # OCI Provider

modules/oci-networking/README.md

@@ -0,0 +1,3 @@
+# OCI Networking module
+
+> __Warning__: Moved to [oracle-quickstart/terraform-oci-networking](https://github.com/oracle-quickstart/terraform-oci-networking). Sub modules with specific OCI Networking resource also available. example: [Virtual Cloud Network](https://github.com/oracle-quickstart/terraform-oci-networking/tree/main/modules/vcn).