Skip to content

Commit d9bdf1b

Browse files
juniorjunior
authored
Merge pull request #42 from junior/ZeroTEN
Zero Nine 3
2 parents d69ee4a + 6820b1c commit d9bdf1b

File tree

20 files changed

+59
-55
lines changed

20 files changed

+59
-55
lines changed

‎.github/workflows/stack.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33
#
44

@@ -27,6 +27,9 @@ jobs:
2727
STACK_FILES="*.tf schema.yaml README.md LICENSE VERSION .terraform.lock.hcl modules/"
2828
RELEASE=$(cat VERSION)
2929
ASSETS+="${STACKNAME}-stack.zip ${STACKNAME}-${RELEASE}.zip "
30+
echo "::group::Generating standalone providers.tf"
31+
cp -f providers.tf.example providers.tf || { printf '\n providers.tf.example ignored.\n'; exit 0; }
32+
echo "::endgroup::"
3033
echo "::group::Processing $STACKNAME"
3134
zip -r ${STACKNAME}-stack.zip $STACK_FILES -x "*.tfstat*" ".terraform/" || { printf '\n⛔ Unable to create %s stack.\n'; exit 1; }
3235
cp ${STACKNAME}-stack.zip ${STACKNAME}-${RELEASE}.zip || { printf '\n⛔ Unable to create %s stack.\n'; exit 1; }

‎VARIABLES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
| <a name="input_cluster_cni_type"></a> [cluster\_cni\_type](#input\_cluster\_cni\_type) | The CNI type to use for the cluster. Valid values are: FLANNEL\_OVERLAY or OCI\_VCN\_IP\_NATIVE | `string` | `"FLANNEL_OVERLAY"` | no |
99
| <a name="input_cluster_endpoint_visibility"></a> [cluster\_endpoint\_visibility](#input\_cluster\_endpoint\_visibility) | The Kubernetes cluster that is created will be hosted on a public subnet with a public IP address auto-assigned or on a private subnet. If Private, additional configuration will be necessary to run kubectl commands | `string` | `"Public"` | no |
1010
| <a name="input_cluster_load_balancer_visibility"></a> [cluster\_load\_balancer\_visibility](#input\_cluster\_load\_balancer\_visibility) | The Load Balancer that is created will be hosted on a public subnet with a public IP address auto-assigned or on a private subnet. This affects the Kubernetes services, ingress controller and other load balancers resources | `string` | `"Public"` | no |
11+
| <a name="input_cluster_type"></a> [cluster\_type](#input\_cluster\_type) | The type of OKE cluster to create. Valid values are: BASIC\_CLUSTER or ENHANCED\_CLUSTER | `string` | `"BASIC_CLUSTER"` | no |
1112
| <a name="input_cluster_workers_visibility"></a> [cluster\_workers\_visibility](#input\_cluster\_workers\_visibility) | The Kubernetes worker nodes that are created will be hosted in public or private subnet(s) | `string` | `"Private"` | no |
1213
| <a name="input_compartment_ocid"></a> [compartment\_ocid](#input\_compartment\_ocid) | n/a | `any` | n/a | yes |
1314
| <a name="input_create_compartment_policies"></a> [create\_compartment\_policies](#input\_create\_compartment\_policies) | Creates policies that will reside on the compartment. e.g.: Policies to support Cluster Autoscaler, OCI Logging datasource on Grafana | `bool` | `true` | no |

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.2
1+
0.9.3

‎examples/5G-NF-Infra/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
configuration_aliases = [oci.home_region, oci.current_region]
1313
}

‎examples/basic-cluster/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
configuration_aliases = [oci.home_region]
1313
}

‎examples/basic-with-existing-network/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
}
1313
kubernetes = {

‎modules/cluster-tools/cluster-tools.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ locals {
1515
# Helm repos
1616
helm_repository = {
1717
ingress_nginx = "https://kubernetes.github.io/ingress-nginx"
18-
ingress_nginx_version = "4.6.1"
18+
ingress_nginx_version = "4.11.2"
1919
jetstack = "https://charts.jetstack.io" # cert-manager
20-
jetstack_version = "1.12.0" # cert-manager
20+
jetstack_version = "1.15.3" # cert-manager
2121
grafana = "https://grafana.github.io/helm-charts"
22-
grafana_version = "6.56.5"
22+
grafana_version = "8.4.8"
2323
prometheus = "https://prometheus-community.github.io/helm-charts"
24-
prometheus_version = "22.6.2"
24+
prometheus_version = "25.26.0"
2525
metrics_server = "https://kubernetes-sigs.github.io/metrics-server"
26-
metrics_server_version = "3.10.0"
26+
metrics_server_version = "3.12.1"
2727
}
2828
use_cluster_tools_namespace = anytrue([var.grafana_enabled, var.ingress_nginx_enabled, var.cert_manager_enabled, var.prometheus_enabled]) ? true : false
2929
}

‎modules/cluster-tools/grafana.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ resource "helm_release" "grafana" {
2525
type = "string"
2626
}
2727

28-
set {
29-
name = "grafana\\.ini.server.serve_from_sub_path"
30-
value = "true"
31-
}
28+
# set {
29+
# name = "grafana\\.ini.server.serve_from_sub_path"
30+
# value = "true"
31+
# }
3232

3333
values = [
3434
<<EOF

‎modules/cluster-tools/modules/cert-manager/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variable "chart_repository" {
1010
default = "https://charts.jetstack.io"
1111
}
1212
variable "chart_version" {
13-
default = "1.9.1"
13+
default = "1.15.3"
1414
}
1515
variable "ingress_email_issuer" {
1616
default = "no-reply@example.cloud"

‎modules/cluster-tools/modules/cert-manager/providers.tf renamed to ‎modules/cluster-tools/modules/cert-manager/versions.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
helm = {
99
source = "hashicorp/helm"
10-
version = "~> 2"
10+
version = ">= 2.15"
1111
# https://registry.terraform.io/providers/hashicorp/helm/
1212
}
1313
tls = {
1414
source = "hashicorp/tls"
15-
version = "~> 4"
15+
version = ">= 4"
1616
# https://registry.terraform.io/providers/hashicorp/tls/
1717
}
1818
local = {
1919
source = "hashicorp/local"
20-
version = "~> 2"
20+
version = ">= 2.5"
2121
# https://registry.terraform.io/providers/hashicorp/local/
2222
}
2323
}

‎modules/cluster-tools/modules/verrazzano/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
helm = {
99
source = "hashicorp/helm"

‎modules/cluster-tools/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
kubernetes = {
99
source = "hashicorp/kubernetes"

‎modules/oci-policies/versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
configuration_aliases = [oci.home_region]
1313
}
1414
local = {
1515
source = "hashicorp/local"
16-
version = "~> 2"
16+
version = ">= 2"
1717
# https://registry.terraform.io/providers/hashicorp/local/
1818
}
1919
}

‎modules/oci-vault-kms/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
configuration_aliases = [oci.home_region]
1313
}

‎modules/oke-cluster-autoscaler/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
variable "cluster_autoscaler_supported_k8s_versions" {
1212
type = map(string)
1313

14-
default = { "1.23" = "1.23.0-4", "1.24" = "1.24.0-5", "1.25" = "1.25.0-6", "1.26" = "1.26.2-7" } # There's no API to get that list. Need to be updated manually
14+
default = { "1.27" = "1.27.2-9", "1.28" = "1.28.0-5", "1.29" = "1.29.3-1", "1.30" = "1.30.1-2" } # There's no API to get that list. Need to be updated manually
1515
description = "Supported Kubernetes versions for OKE cluster autoscaler"
1616
}
1717
variable "custom_cluster_autoscaler_image" {

‎modules/oke-cluster-autoscaler/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.2"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
}
1313
kubernetes = {

‎modules/oke-node-pool/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
}
1313
local = {

‎modules/oke/versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
}
1313
local = {
1414
source = "hashicorp/local"
15-
version = "~> 2"
15+
version = ">= 2"
1616
# https://registry.terraform.io/providers/hashicorp/local/
1717
}
1818
}

‎oci-networking.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022-2024, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33
#
44

5-
# File Version: 0.9.0
5+
# File Version: 0.10.1
66

77
# Dependencies:
88
# - defaults.tf file
@@ -24,7 +24,7 @@
2424
# Module: Virtual Cloud Network (VCN)
2525
################################################################################
2626
module "vcn" {
27-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.2.0"
27+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.3.2"
2828

2929
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
3030
compartment_ocid = local.vcn_compartment_ocid
@@ -47,7 +47,7 @@ module "vcn" {
4747
################################################################################
4848
module "subnets" {
4949
for_each = { for map in local.subnets : map.subnet_name => map }
50-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.2.0"
50+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.3.2"
5151

5252
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
5353
compartment_ocid = local.vcn_compartment_ocid
@@ -60,12 +60,12 @@ module "subnets" {
6060
create_subnet = local.create_subnets
6161
subnet_name = each.value.subnet_name
6262
cidr_block = each.value.cidr_block
63-
display_name = each.value.display_name # If null, is autogenerated
64-
dns_label = each.value.dns_label # If null, is autogenerated
63+
display_name = try(each.value.display_name, null) # If null, is autogenerated
64+
dns_label = try(each.value.dns_label, null) # If null, is autogenerated
6565
prohibit_public_ip_on_vnic = each.value.prohibit_public_ip_on_vnic
6666
prohibit_internet_ingress = each.value.prohibit_internet_ingress
6767
route_table_id = (anytrue([(each.value.alternative_route_table_name == ""), (each.value.alternative_route_table_name == null)])
68-
? each.value.route_table_id
68+
? try(each.value.route_table_id, null)
6969
: module.route_tables[each.value.alternative_route_table_name].route_table_id) # If null, the VCN's default route table is used
7070
dhcp_options_id = each.value.dhcp_options_id # If null, the VCN's default set of DHCP options is used
7171
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
@@ -80,7 +80,7 @@ module "subnets" {
8080
# Module: Gateways
8181
################################################################################
8282
module "gateways" {
83-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.2.0"
83+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.3.2"
8484

8585
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
8686
compartment_ocid = local.vcn_compartment_ocid
@@ -114,7 +114,7 @@ module "gateways" {
114114
################################################################################
115115
module "route_tables" {
116116
for_each = { for map in local.route_tables : map.route_table_name => map }
117-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.2.0"
117+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.3.2"
118118

119119
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
120120
compartment_ocid = local.vcn_compartment_ocid
@@ -126,7 +126,7 @@ module "route_tables" {
126126
# Route Table attributes
127127
create_route_table = local.create_subnets
128128
route_table_name = each.value.route_table_name
129-
display_name = each.value.display_name
129+
display_name = try(each.value.display_name, null)
130130
route_rules = each.value.route_rules
131131
}
132132

@@ -135,7 +135,7 @@ module "route_tables" {
135135
################################################################################
136136
module "security_lists" {
137137
for_each = { for map in local.security_lists : map.security_list_name => map }
138-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.2.0"
138+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.3.2"
139139

140140
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
141141
compartment_ocid = local.vcn_compartment_ocid

‎versions.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
#
44

55
terraform {
6-
required_version = ">= 1.1"
6+
required_version = ">= 1.5"
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = "~> 4, < 5"
10+
version = ">= 6"
1111
# https://registry.terraform.io/providers/oracle/oci/
1212
configuration_aliases = [oci.home_region]
1313
}
1414
kubernetes = {
1515
source = "hashicorp/kubernetes"
16-
version = "~> 2"
16+
version = ">= 2.32"
1717
# https://registry.terraform.io/providers/hashicorp/kubernetes/
1818
}
1919
helm = {
2020
source = "hashicorp/helm"
21-
version = "~> 2"
21+
version = ">= 2.15"
2222
# https://registry.terraform.io/providers/hashicorp/helm/
2323
}
2424
tls = {
2525
source = "hashicorp/tls"
26-
version = "~> 4"
26+
version = ">= 4"
2727
# https://registry.terraform.io/providers/hashicorp/tls/
2828
}
2929
local = {
3030
source = "hashicorp/local"
31-
version = "~> 2"
31+
version = ">= 2.5"
3232
# https://registry.terraform.io/providers/hashicorp/local/
3333
}
3434
random = {
3535
source = "hashicorp/random"
36-
version = "~> 3"
36+
version = ">= 3.6"
3737
# https://registry.terraform.io/providers/hashicorp/random/
3838
}
3939
}

0 commit comments

Comments
 (0)