From 237b3dd8e17fc7f3871cd741bee90a4787300598 Mon Sep 17 00:00:00 2001
From: Ahmad Karimi <ak12hastam@gmail.com>
Date: Tue, 5 Sep 2023 13:44:55 +0330
Subject: [PATCH] fix manager metrics service name

---
 config/prometheus/monitor.yaml                              | 4 ++--
 config/rbac/auth_proxy_service.yaml                         | 4 ++--
 deploy/charts/route-to-contour-httpproxy/Chart.yaml         | 2 +-
 .../{metrics-service.yaml => manager-metrics-service.yaml}  | 6 +++---
 deploy/charts/route-to-contour-httpproxy/values.yaml        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename deploy/charts/route-to-contour-httpproxy/templates/{metrics-service.yaml => manager-metrics-service.yaml} (69%)

diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
index 254eecb..8f6cf8d 100644
--- a/config/prometheus/monitor.yaml
+++ b/config/prometheus/monitor.yaml
@@ -6,12 +6,12 @@ metadata:
   labels:
     control-plane: controller-manager
     app.kubernetes.io/name: servicemonitor
-    app.kubernetes.io/instance: controller-manager-metrics-monitor
+    app.kubernetes.io/instance: manager-metrics-monitor
     app.kubernetes.io/component: metrics
     app.kubernetes.io/created-by: route-to-contour-httpproxy
     app.kubernetes.io/part-of: route-to-contour-httpproxy
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-monitor
+  name: manager-metrics-monitor
   namespace: system
 spec:
   endpoints:
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index 1c17b89..4715cfe 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -4,12 +4,12 @@ metadata:
   labels:
     control-plane: controller-manager
     app.kubernetes.io/name: service
-    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/instance: manager-metrics-service
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: route-to-contour-httpproxy
     app.kubernetes.io/part-of: route-to-contour-httpproxy
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-service
+  name: manager-metrics-service
   namespace: system
 spec:
   ports:
diff --git a/deploy/charts/route-to-contour-httpproxy/Chart.yaml b/deploy/charts/route-to-contour-httpproxy/Chart.yaml
index 00678d2..366b41a 100644
--- a/deploy/charts/route-to-contour-httpproxy/Chart.yaml
+++ b/deploy/charts/route-to-contour-httpproxy/Chart.yaml
@@ -13,7 +13,7 @@ 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/deploy/charts/route-to-contour-httpproxy/templates/metrics-service.yaml b/deploy/charts/route-to-contour-httpproxy/templates/manager-metrics-service.yaml
similarity index 69%
rename from deploy/charts/route-to-contour-httpproxy/templates/metrics-service.yaml
rename to deploy/charts/route-to-contour-httpproxy/templates/manager-metrics-service.yaml
index 413b1f2..d8e3a76 100644
--- a/deploy/charts/route-to-contour-httpproxy/templates/metrics-service.yaml
+++ b/deploy/charts/route-to-contour-httpproxy/templates/manager-metrics-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "route-to-contour-httpproxy.fullname" . }}-controller-manager-metrics-service
+  name: {{ include "route-to-contour-httpproxy.fullname" . }}-manager-metrics-service
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: route-to-contour-httpproxy
@@ -9,9 +9,9 @@ metadata:
     control-plane: controller-manager
   {{- include "route-to-contour-httpproxy.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.metricsService.type }}
+  type: {{ .Values.managerMetricsService.type }}
   selector:
     control-plane: controller-manager
   {{- include "route-to-contour-httpproxy.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
\ No newline at end of file
+	{{- .Values.managerMetricsService.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/deploy/charts/route-to-contour-httpproxy/values.yaml b/deploy/charts/route-to-contour-httpproxy/values.yaml
index 698d559..1e49424 100644
--- a/deploy/charts/route-to-contour-httpproxy/values.yaml
+++ b/deploy/charts/route-to-contour-httpproxy/values.yaml
@@ -25,7 +25,7 @@ controllerManagerConfig:
       interDcClass: 5s
       defaultClass: 30s
 kubernetesClusterDomain: cluster.local
-metricsService:
+managerMetricsService:
   ports:
   - name: https
     port: 8443