Skip to content

Commit f0f2a1a

Browse files
added all output specific changes
1 parent 0072443 commit f0f2a1a

12 files changed

Lines changed: 27 additions & 27 deletions

File tree

modules/artifactories/default/0.2/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
namespace = lookup(local.metadata, "namespace", lookup(var.cluster, "namespace", "default"))
66
artifactories = lookup(local.spec, "artifactories", {})
77
include_all = lookup(local.spec, "include_all", length(local.artifactories) > 0 ? "false" : "true")
8-
kubernetes_details = var.inputs.kubernetes_details.attributes.cluster
8+
kubernetes_details = var.inputs.kubernetes_details.attributes.k8s_details.cluster
99
host = local.kubernetes_details.auth.host
1010
cluster_ca_certificate = base64encode(local.kubernetes_details.auth.cluster_ca_certificate)
1111
token = local.kubernetes_details.auth.token

modules/cert_manager/default/0.1/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ locals {
9999
environments = merge(local.http_validations, local.disable_dns_validation ? {} : local.dns01_validations)
100100

101101
# Nodepool configuration from inputs
102-
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details.attributes : {
102+
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details : {
103103
node_class_name = ""
104104
node_pool_name = ""
105105
taints = []

modules/cert_manager/default/0.1/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module "iam_user_name" {
55
environment = var.environment
66
limit = 64
77
globally_unique = false
8-
resource_name = var.inputs.kubernetes_details.attributes.cluster.name
8+
resource_name = var.inputs.kubernetes_details.attributes.k8s_details.cluster.name
99
resource_type = ""
1010
is_k8s = false
1111
}
@@ -16,7 +16,7 @@ module "iam_policy_name" {
1616
environment = var.environment
1717
limit = 128
1818
globally_unique = false
19-
resource_name = var.inputs.kubernetes_details.attributes.cluster.name
19+
resource_name = var.inputs.kubernetes_details.attributes.k8s_details.cluster.name
2020
resource_type = ""
2121
is_k8s = false
2222
}

modules/ingress/nginx_k8s_native/0.2/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ locals {
250250
}
251251

252252
# Nodepool configuration from inputs
253-
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details.attributes : {
253+
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details : {
254254
node_class_name = ""
255255
node_pool_name = ""
256256
taints = []

modules/kubernetes_cluster/aws_eks/0.3/facets.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,24 +168,24 @@ outputs:
168168
source: hashicorp/kubernetes
169169
version: 2.17.0
170170
attributes:
171-
host: attributes.cluster.auth.host
172-
token: attributes.cluster.auth.token
173-
cluster_ca_certificate: attributes.cluster.auth.cluster_ca_certificate
171+
host: cluster.auth.host
172+
token: cluster.auth.token
173+
cluster_ca_certificate: cluster.auth.cluster_ca_certificate
174174
helm:
175175
source: hashicorp/helm
176176
version: 2.8.0
177177
attributes:
178178
kubernetes:
179-
host: attributes.cluster.auth.host
180-
token: attributes.cluster.auth.token
181-
cluster_ca_certificate: attributes.cluster.auth.cluster_ca_certificate
179+
host: cluster.auth.host
180+
token: cluster.auth.token
181+
cluster_ca_certificate: cluster.auth.cluster_ca_certificate
182182
kubernetes-alpha:
183183
source: hashicorp/kubernetes-alpha
184184
version: 0.6.0
185185
attributes:
186-
host: attributes.cluster.auth.host
187-
cluster_ca_certificate: attributes.cluster.auth.cluster_ca_certificate
188-
token: attributes.cluster.auth.token
186+
host: cluster.auth.host
187+
cluster_ca_certificate: cluster.auth.cluster_ca_certificate
188+
token: cluster.auth.token
189189
sample:
190190
kind: kubernetes_cluster
191191
flavor: aws_eks_demo

modules/kubernetes_cluster/aws_eks/0.3/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ locals {
44
}
55
output_attributes = {
66
k8s_details = module.k8s_cluster.k8s_details
7+
secrets = ["k8s_details"]
78
}
8-
secrets = ["output_attributes"]
99
}

modules/kubernetes_node_pool/aws_karpenter/0.1/facets.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ inputs:
293293
description: VPC network details for node placement
294294
optional: false
295295
outputs:
296-
default:
296+
attributes:
297297
type: '@outputs/aws_karpenter_nodepool'
298298
title: AWS Karpenter NodePool
299299
sample:

modules/kubernetes_node_pool/aws_karpenter/0.1/locals.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ locals {
3232
proxy_bypass_list = try(local.networking.proxy_configuration.bypass_domains, "") != "" ? split(",", local.networking.proxy_configuration.bypass_domains) : split(",", "localhost,127.0.0.1,169.254.169.254,.internal,.eks.amazonaws.com")
3333

3434
# Automatically detect IAM role from EKS cluster - updated path for new structure
35-
node_iam_role_arn = local.kubernetes_details.attributes.node_group.iam_role_name
35+
node_iam_role_arn = local.kubernetes_details.node_group.iam_role_name
3636

3737
# Subnet selection based on user choice from dropdown
3838
subnet_type = try(local.networking.subnet_type, "private")
@@ -52,15 +52,15 @@ locals {
5252
]
5353

5454
# Always use the node security group ID from EKS cluster output
55-
node_security_group_id = local.kubernetes_details.attributes.node_group.security_group_id
55+
node_security_group_id = local.kubernetes_details.node_group.security_group_id
5656

5757
# Combine user tags with environment tags - updated cluster name path
5858
combined_tags = merge(
5959
local.tags,
6060
{
6161
"facets.cloud/environment" = var.environment.name
6262
"facets.cloud/managed-by" = "facets"
63-
# "kubernetes.io/cluster/${local.kubernetes_details.attributes.cluster.name}" = "owned"
63+
# "kubernetes.io/cluster/${local.kubernetes_details.cluster.name}" = "owned"
6464
}
6565
)
6666

modules/prometheus/k8s/0.1/irsa.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ module "irsa" {
1919
iam_role_name = module.irsa_name.name
2020
namespace = var.environment.namespace
2121
sa_name = local.irsa_config.service_account_name
22-
eks_oidc_provider_arn = var.inputs.kubernetes_details.attributes.cluster.oidc_provider_arn
22+
eks_oidc_provider_arn = var.inputs.kubernetes_details.attributes.k8s_details.cluster.oidc_provider_arn
2323
}

modules/prometheus/k8s/0.1/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ locals {
8888
prometheus_retention = lookup(local.spec, "retention", "100d")
8989

9090
# Nodepool configuration from inputs
91-
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details.attributes : {
91+
nodepool_config = lookup(var.inputs, "kubernetes_node_pool_details", null) != null ? var.inputs.kubernetes_node_pool_details : {
9292
node_class_name = ""
9393
node_pool_name = ""
9494
taints = []

0 commit comments

Comments
 (0)