From a982b0b34559363f1c5c5322ccb6c45b71898579 Mon Sep 17 00:00:00 2001 From: Quentin Bisson Date: Mon, 1 Apr 2024 01:35:37 +0200 Subject: [PATCH 1/3] Remove deprecated giant swarm monitoring labels This PR removes the deprecated Giant Swarm monitoring labels --- helm/coredns-app/templates/deployment-workers.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/helm/coredns-app/templates/deployment-workers.yaml b/helm/coredns-app/templates/deployment-workers.yaml index 6af0e76..7063fde 100644 --- a/helm/coredns-app/templates/deployment-workers.yaml +++ b/helm/coredns-app/templates/deployment-workers.yaml @@ -19,11 +19,8 @@ spec: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" prometheus.io/scrape: "true" prometheus.io/port: "{{ .Values.ports.prometheus }}" - giantswarm.io/monitoring-path: /metrics - giantswarm.io/monitoring-port: "{{ .Values.ports.prometheus }}" labels: {{- include "labels.common" . | nindent 8 }} - giantswarm.io/monitoring: "true" app.kubernetes.io/component: workers spec: serviceAccountName: {{ .Values.name }} From 50be3bec55bf1bb9102d0ae3d5304e8bccdaf162 Mon Sep 17 00:00:00 2001 From: Quentin Bisson Date: Mon, 1 Apr 2024 01:36:09 +0200 Subject: [PATCH 2/3] Update deployment-masters.yaml --- helm/coredns-app/templates/deployment-masters.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/helm/coredns-app/templates/deployment-masters.yaml b/helm/coredns-app/templates/deployment-masters.yaml index 111fab4..c32d65e 100644 --- a/helm/coredns-app/templates/deployment-masters.yaml +++ b/helm/coredns-app/templates/deployment-masters.yaml @@ -20,11 +20,8 @@ spec: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" prometheus.io/scrape: "true" prometheus.io/port: "{{ .Values.ports.prometheus }}" - giantswarm.io/monitoring-path: /metrics - giantswarm.io/monitoring-port: "{{ .Values.ports.prometheus }}" labels: {{- include "labels.common" . | nindent 8 }} - giantswarm.io/monitoring: "true" app.kubernetes.io/component: control-plane spec: serviceAccountName: {{ .Values.name }} From b0a40466a6124c85ff3125707ed06b5713d9e68f Mon Sep 17 00:00:00 2001 From: Quentin Bisson Date: Mon, 1 Apr 2024 01:38:20 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 545458b..2a1da18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s - Update `architect-orb` to 5.1.0. +### Removed + +- Removed legacy Giant Swarm monitoring labels as coredns is monitored through a prometheus-operator generated servicemonitor. + ## [1.21.0] - 2024-01-09 ### Changed