From bedad81d26749c6952e6cae2ea43346a7b06a7eb Mon Sep 17 00:00:00 2001 From: Abdullah Alaqeel Date: Sun, 8 Sep 2024 15:02:01 +0300 Subject: [PATCH] chore: add the relabeling action Kubernetes automatically adds the action, which makes the application always out of sync in argocd or any tool that diffs the application state with the manifest. This commit solves this issue. --- charts/datahub/Chart.yaml | 8 ++++---- charts/datahub/subcharts/datahub-frontend/Chart.yaml | 2 +- .../datahub-frontend/templates/servicemonitor.yaml | 3 ++- charts/datahub/subcharts/datahub-gms/Chart.yaml | 2 +- .../subcharts/datahub-gms/templates/servicemonitor.yaml | 3 ++- charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml | 2 +- .../datahub-mae-consumer/templates/servicemonitor.yaml | 3 ++- charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml | 2 +- .../datahub-mce-consumer/templates/servicemonitor.yaml | 3 ++- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 6c8e61be8..4167921e3 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -10,19 +10,19 @@ version: 0.4.25 appVersion: 0.14.0.2 dependencies: - name: datahub-gms - version: 0.2.172 + version: 0.2.173 repository: file://./subcharts/datahub-gms condition: datahub-gms.enabled - name: datahub-frontend - version: 0.2.159 + version: 0.2.160 repository: file://./subcharts/datahub-frontend condition: datahub-frontend.enabled - name: datahub-mae-consumer - version: 0.2.161 + version: 0.2.162 repository: file://./subcharts/datahub-mae-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-mce-consumer - version: 0.2.163 + version: 0.2.164 repository: file://./subcharts/datahub-mce-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-ingestion-cron diff --git a/charts/datahub/subcharts/datahub-frontend/Chart.yaml b/charts/datahub/subcharts/datahub-frontend/Chart.yaml index e650ad14f..779186b50 100644 --- a/charts/datahub/subcharts/datahub-frontend/Chart.yaml +++ b/charts/datahub/subcharts/datahub-frontend/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.159 +version: 0.2.160 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: v0.13.1 diff --git a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml index 44455da3e..b61f0fa97 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml @@ -16,7 +16,8 @@ spec: endpoints: - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - - separator: / + - action: replace + separator: / sourceLabels: - namespace - pod diff --git a/charts/datahub/subcharts/datahub-gms/Chart.yaml b/charts/datahub/subcharts/datahub-gms/Chart.yaml index 58b41eea7..01bfb7dba 100644 --- a/charts/datahub/subcharts/datahub-gms/Chart.yaml +++ b/charts/datahub/subcharts/datahub-gms/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for DataHub's datahub-gms component type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.172 +version: 0.2.173 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: v0.13.1 diff --git a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml index b8e5bf922..529cf99c0 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml @@ -16,7 +16,8 @@ spec: endpoints: - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - - separator: / + - action: replace + separator: / sourceLabels: - namespace - pod diff --git a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml index 3535533a2..ec7e40d29 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.161 +version: 0.2.162 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: v0.13.1 diff --git a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml index c237ba247..1e383b8e6 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml @@ -16,7 +16,8 @@ spec: endpoints: - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - - separator: / + - action: replace + separator: / sourceLabels: - namespace - pod diff --git a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml index f2085d2d1..bc8e060bc 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.163 +version: 0.2.164 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: v0.13.1 diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml index ceeffa662..5043cb3f0 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml @@ -16,7 +16,8 @@ spec: endpoints: - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - - separator: / + - action: replace + separator: / sourceLabels: - namespace - pod