Skip to content

Commit b2e6311

Browse files
bonclay7bonclay7
committed
Apply fixes
1 parent 075780a commit b2e6311

File tree

6 files changed

+69
-68
lines changed

6 files changed

+69
-68
lines changed

‎examples/eks-cluster-with-vpc/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module "eks_blueprints" {
5252
managed_node_groups = {
5353
mg_5 = {
5454
node_group_name = "managed-ondemand"
55-
instance_types = ["m5.large"]
55+
instance_types = ["t3.xlarge"]
5656
min_size = 2
5757
subnet_ids = module.vpc.private_subnets
5858
}

‎examples/existing-cluster-with-base-and-infra/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ provider "grafana" {
8989
auth = var.grafana_api_key
9090
}
9191

92+
//*
9293
module "workloads_infra" {
9394
source = "../../modules/workloads/infra"
9495
# source = "aws-observability/terrarom-aws-observability-accelerator/workloads/infra"
@@ -107,3 +108,4 @@ module "workloads_infra" {
107108
module.eks_observability_accelerator
108109
]
109110
}
111+
//*/

‎modules/workloads/infra/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ data "aws_eks_cluster" "eks_cluster" {
1010

1111
locals {
1212
name = "adot-collector-kubeprometheus"
13-
namespace = try(var.config.helm_config.namespace, local.name)
13+
namespace = try(var.helm_config.namespace, local.name)
1414

1515
eks_oidc_issuer_url = replace(data.aws_eks_cluster.eks_cluster.identity[0].oidc[0].issuer, "https://", "")
1616
eks_cluster_endpoint = data.aws_eks_cluster.eks_cluster.endpoint

‎modules/workloads/infra/main.tf

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ terraform {
99

1010
resource "helm_release" "kube_state_metrics" {
1111
count = var.enable_kube_state_metrics ? 1 : 0
12-
chart = var.config.ksm_helm_chart_name
13-
create_namespace = var.config.kms_create_namespace
14-
namespace = var.config.ksm_k8s_namespace
15-
name = var.config.ksm_helm_release_name
16-
version = var.config.ksm_helm_chart_version
17-
repository = var.config.ksm_helm_repo_url
12+
chart = var.ksm_config.helm_chart_name
13+
create_namespace = var.ksm_config.create_namespace
14+
namespace = var.ksm_config.k8s_namespace
15+
name = var.ksm_config.helm_release_name
16+
version = var.ksm_config.helm_chart_version
17+
repository = var.ksm_config.helm_repo_url
1818

1919
dynamic "set" {
20-
for_each = var.config.ksm_helm_settings
20+
for_each = var.ksm_config.helm_settings
2121
content {
2222
name = set.key
2323
value = set.value
@@ -27,15 +27,15 @@ resource "helm_release" "kube_state_metrics" {
2727

2828
resource "helm_release" "prometheus_node_exporter" {
2929
count = var.enable_node_exporter ? 1 : 0
30-
chart = var.config.ne_helm_chart_name
31-
create_namespace = var.config.ne_create_namespace
32-
namespace = var.config.ne_k8s_namespace
33-
name = var.config.ne_helm_release_name
34-
version = var.config.ne_helm_chart_version
35-
repository = var.config.ne_helm_repo_url
30+
chart = var.ne_config.helm_chart_name
31+
create_namespace = var.ne_config.create_namespace
32+
namespace = var.ne_config.k8s_namespace
33+
name = var.ne_config.helm_release_name
34+
version = var.ne_config.helm_chart_version
35+
repository = var.ne_config.helm_repo_url
3636

3737
dynamic "set" {
38-
for_each = var.config.ne_helm_settings
38+
for_each = var.ne_config.helm_settings
3939
content {
4040
name = set.key
4141
value = set.value
@@ -46,6 +46,8 @@ resource "helm_release" "prometheus_node_exporter" {
4646
module "helm_addon" {
4747
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon"
4848

49+
count = 1
50+
4951
helm_config = merge(
5052
{
5153
name = local.name
@@ -90,14 +92,13 @@ module "helm_addon" {
9092
name = "ekscluster"
9193
value = local.context.eks_cluster_id
9294
},
93-
9495
]
9596

9697
irsa_config = {
9798
create_kubernetes_namespace = true
9899
kubernetes_namespace = local.namespace
99100
create_kubernetes_service_account = true
100-
kubernetes_service_account = try(var.config.helm_config.service_account, local.name)
101+
kubernetes_service_account = try(var.helm_config.service_account, local.name)
101102
irsa_iam_policies = ["arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"]
102103
}
103104

‎modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,8 @@ spec:
265265
metrics_path: /metrics
266266
scheme: https
267267
tls_config:
268-
ca_file: /etc/prometheus/certs/secret_default_kube-prometheus-stack-admission_ca
269-
server_name: kube-prometheus-stack-operator
270-
insecure_skip_verify: false
268+
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
269+
insecure_skip_verify: true
271270
follow_redirects: true
272271
enable_http2: true
273272
relabel_configs:
@@ -594,7 +593,6 @@ spec:
594593
own_namespace: false
595594
names:
596595
- kube-system
597-
598596
- job_name: serviceMonitor/default/kube-prometheus-stack-kubelet/0
599597
honor_labels: true
600598
honor_timestamps: true
@@ -1350,7 +1348,6 @@ spec:
13501348
own_namespace: false
13511349
names:
13521350
- kube-system
1353-
13541351
- job_name: serviceMonitor/default/kube-prometheus-stack-apiserver/0
13551352
honor_timestamps: true
13561353
scrape_interval: 30s
@@ -1565,6 +1562,10 @@ spec:
15651562
- job_name: 'node-exporter'
15661563
kubernetes_sd_configs:
15671564
- role: endpoints
1565+
tls_config:
1566+
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
1567+
insecure_skip_verify: true
1568+
15681569
exporters:
15691570
prometheusremotewrite:
15701571
endpoint: {{ .Values.ampurl }}

‎modules/workloads/infra/variables.tf

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -62,62 +62,59 @@ variable "enable_kube_state_metrics" {
6262
default = true
6363
}
6464

65+
variable "ksm_config" {
66+
type = object({
67+
create_namespace = bool
68+
k8s_namespace = string
69+
helm_chart_name = string
70+
helm_chart_version = string
71+
helm_release_name = string
72+
helm_repo_url = string
73+
helm_settings = map(string)
74+
helm_values = map(any)
75+
})
76+
77+
default = {
78+
create_namespace = true
79+
helm_chart_name = "kube-state-metrics"
80+
helm_chart_version = "4.16.0"
81+
helm_release_name = "kube-state-metrics"
82+
helm_repo_url = "https://prometheus-community.github.io/helm-charts"
83+
helm_settings = {}
84+
helm_values = {}
85+
k8s_namespace = "kube-system"
86+
}
87+
nullable = false
88+
}
89+
6590
variable "enable_node_exporter" {
6691
type = bool
6792
default = true
6893
}
69-
70-
variable "config" {
94+
variable "ne_config" {
7195
type = object({
72-
helm_config = map(any)
73-
74-
kms_create_namespace = bool
75-
ksm_k8s_namespace = string
76-
ksm_helm_chart_name = string
77-
ksm_helm_chart_version = string
78-
ksm_helm_release_name = string
79-
ksm_helm_repo_url = string
80-
ksm_helm_settings = map(string)
81-
ksm_helm_values = map(any)
82-
83-
ne_create_namespace = bool
84-
ne_k8s_namespace = string
85-
ne_helm_chart_name = string
86-
ne_helm_chart_version = string
87-
ne_helm_release_name = string
88-
ne_helm_repo_url = string
89-
ne_helm_settings = map(string)
90-
ne_helm_values = map(any)
91-
96+
create_namespace = bool
97+
k8s_namespace = string
98+
helm_chart_name = string
99+
helm_chart_version = string
100+
helm_release_name = string
101+
helm_repo_url = string
102+
helm_settings = map(string)
103+
helm_values = map(any)
92104
})
93105

94106
default = {
95-
enable_kube_state_metrics = true
96-
enable_node_exporter = true
97-
98-
helm_config = {}
99-
100-
kms_create_namespace = true
101-
ksm_helm_chart_name = "kube-state-metrics"
102-
ksm_helm_chart_version = "4.9.2"
103-
ksm_helm_release_name = "kube-state-metrics"
104-
ksm_helm_repo_url = "https://prometheus-community.github.io/helm-charts"
105-
ksm_helm_settings = {}
106-
ksm_helm_values = {}
107-
ksm_k8s_namespace = "kube-system"
108-
109-
ne_create_namespace = true
110-
ne_k8s_namespace = "prometheus-node-exporter"
111-
ne_helm_chart_name = "prometheus-node-exporter"
112-
ne_helm_chart_version = "2.0.3"
113-
ne_helm_release_name = "prometheus-node-exporter"
114-
ne_helm_repo_url = "https://prometheus-community.github.io/helm-charts"
115-
ne_helm_settings = {}
116-
ne_helm_values = {}
107+
create_namespace = true
108+
helm_chart_name = "prometheus-node-exporter"
109+
helm_chart_version = "2.0.3"
110+
helm_release_name = "prometheus-node-exporter"
111+
helm_repo_url = "https://prometheus-community.github.io/helm-charts"
112+
helm_settings = {}
113+
helm_values = {}
114+
k8s_namespace = "prometheus-node-exporter"
117115
}
118116
nullable = false
119117
}
120-
121118
variable "tags" {
122119
description = "Additional tags (e.g. `map('BusinessUnit`,`XYZ`)"
123120
type = map(string)

0 commit comments

Comments
 (0)