Skip to content

Commit db22ec8

Browse files
authored
bug: add server_side_apply option to kube-prometheus-stack-crd resources (#248)
1 parent a53bea1 commit db22ec8

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

terraform/layer2-k8s/eks-kube-prometheus-stack.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ locals {
2323
kube_prometheus_stack_prometheus_domain_name = "prometheus-${local.domain_suffix}"
2424
kube_prometheus_stack_values = <<VALUES
2525
# Prometheus Server parameters
26+
##############################
27+
### EKS specific configuration
28+
##############################
29+
kubeControllerManager:
30+
enabled: false
31+
## Component scraping kube scheduler
32+
##
33+
kubeScheduler:
34+
enabled: false
35+
## Component scraping kube proxy
36+
##
37+
kubeProxy:
38+
enabled: false
39+
############
40+
defaultRules:
41+
disabled:
42+
KubeProxyDown: true
43+
2644
prometheus:
2745
ingress:
2846
enabled: true

terraform/layer2-k8s/eks-prometheus-operator-crds.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ data "http" "kube_prometheus_stack_operator_crds" {
1616
}
1717

1818
resource "kubectl_manifest" "kube_prometheus_stack_operator_crds" {
19-
for_each = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled) ? { for k, v in data.http.kube_prometheus_stack_operator_crds : yamldecode(v.body).metadata.name => v.body } : {}
20-
yaml_body = each.value
19+
for_each = (local.victoria_metrics_k8s_stack.enabled || local.kube_prometheus_stack.enabled) ? { for k, v in data.http.kube_prometheus_stack_operator_crds : yamldecode(v.body).metadata.name => v.body } : {}
20+
yaml_body = each.value
21+
server_side_apply = true
2122
}

terraform/layer2-k8s/helm-releases.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ releases:
105105
enabled: false
106106
chart: kube-prometheus-stack
107107
repository: https://prometheus-community.github.io/helm-charts
108-
chart_version: 19.3.0 #https://github.com/prometheus-community/helm-charts/issues/1500
108+
chart_version: 30.1.0
109109
namespace: monitoring
110110
- id: loki-stack
111111
enabled: true

0 commit comments

Comments
 (0)