Skip to content

Commit 9f53e7d

Browse files
authored
chore: Bump nginx ingress version, remove service monitor support from prometheus setup as it's now created by the ingress module (#196)
1 parent f6ab30b commit 9f53e7d

2 files changed

Lines changed: 1 addition & 19 deletions

File tree

templates/kubernetes/terraform/modules/kubernetes/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module "metrics_prometheus" {
2828

2929
module "ingress" {
3030
source = "commitdev/zero/aws//modules/kubernetes/ingress_nginx"
31-
version = "0.2.0"
31+
version = "0.2.1"
3232

3333
replica_count = var.nginx_ingress_replicas
3434
enable_metrics = var.metrics_type == "prometheus"

templates/kubernetes/terraform/modules/kubernetes/metrics/prometheus/files/prometheus_operator_helm_values.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,3 @@ prometheus:
142142
# Don't apply a selector when looking for service and pod monitors, just discover all of them
143143
serviceMonitorSelectorNilUsesHelmValues: false
144144
podMonitorSelectorNilUsesHelmValues: false
145-
146-
147-
## Additional ServiceMonitors to create
148-
additionalServiceMonitors:
149-
- name: "nginx-ingress-controller-metrics"
150-
151-
## Label selector for services to which this ServiceMonitor applies
152-
selector:
153-
matchLabels:
154-
app.kubernetes.io/name: ingress-nginx
155-
156-
namespaceSelector:
157-
matchNames: [ ingress-nginx ]
158-
159-
## Endpoints of the selected service to be monitored
160-
endpoints:
161-
- port: "metrics"
162-
interval: 30s

0 commit comments

Comments
 (0)