Skip to content

Commit

Permalink
fix symlinks issues and cluster autoscaler defaults override
Browse files Browse the repository at this point in the history
  • Loading branch information
robo-cap authored and hyder committed May 20, 2024
1 parent 51e2c76 commit 02aeaeb
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 69 deletions.
4 changes: 0 additions & 4 deletions module-cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ module "cluster" {
},
local.service_lb_freeform_tags,
)

providers = {
oci.home = oci.home
}
}

output "cluster_id" {
Expand Down
4 changes: 0 additions & 4 deletions module-network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ module "network" {
vcn_cidrs = local.vcn_cidrs
vcn_id = local.vcn_id
worker_is_public = var.worker_is_public

providers = {
oci.home = oci.home
}
}

# VCN
Expand Down
16 changes: 0 additions & 16 deletions modules/cluster/versions.tf

This file was deleted.

13 changes: 13 additions & 0 deletions modules/cluster/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 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_providers {
oci = {
source = "oracle/oci"
version = ">= 4.119.0"
}
}
}
11 changes: 1 addition & 10 deletions modules/extensions/autoscaler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,7 @@ data "helm_template" "cluster_autoscaler" {
}

dynamic "set" {
for_each = local.cluster_autoscaler_defaults
iterator = helm_value
content {
name = helm_value.key
value = helm_value.value
}
}

dynamic "set" {
for_each = var.cluster_autoscaler_helm_values
for_each = merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values)
iterator = helm_value
content {
name = helm_value.key
Expand Down
19 changes: 0 additions & 19 deletions modules/iam/versions.tf

This file was deleted.

16 changes: 16 additions & 0 deletions modules/iam/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright (c) 2024 Oracle 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_providers {
oci = {
configuration_aliases = [oci.home]
source = "oracle/oci"
version = ">= 4.119.0"
}
}
}
16 changes: 0 additions & 16 deletions modules/network/versions.tf

This file was deleted.

13 changes: 13 additions & 0 deletions modules/network/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 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_providers {
oci = {
source = "oracle/oci"
version = ">= 4.119.0"
}
}
}

0 comments on commit 02aeaeb

Please sign in to comment.