- made changes to install metrics services through helm chart

linode · Oct 8, 2024 · 9d97d6e · 9d97d6e
1 parent 6fe3e49
commit 9d97d6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/hack/install-prometheus.sh b/hack/install-prometheus.sh
@@ -39,10 +39,6 @@ helm repo add prometheus-community https://prometheus-community.github.io/helm-c
 echo "Updating Helm repositories..."
 helm repo update
 
-# Create service to export the metrics for Prometheus to scrape from the sidecars
-echo "Applying CSI Linode Controller Metrics Service..."
-kubectl apply -f observability/metrics/csi-linode-controller-metrics-service.yaml || true
-
 # Create a namespace for monitoring tools
 echo "Creating namespace '${NAMESPACE}'..."
 kubectl create namespace ${NAMESPACE} --dry-run=client -o yaml | kubectl apply -f -

diff --git a/...si-linode-controller-metrics-service.yaml → ...plates/csi-linode-controller-metrics.yaml b/...si-linode-controller-metrics-service.yaml → ...plates/csi-linode-controller-metrics.yaml
@@ -1,11 +1,13 @@
+{{- if .Values.enable_metrics }}
+---
 apiVersion: v1
 kind: Service
 metadata:
-  name: csi-linode-controller-metrics-10248
+  name: csi-provisioner-metrics
   namespace: kube-system
   labels:
     app: csi-linode-controller
-    service: csi-linode-controller-metrics-10248
+    service: csi-provisioner-metrics
   annotations:
     prometheus.io/scrape: 'true'
     prometheus.io/port: '10248'
@@ -22,11 +24,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: csi-linode-controller-metrics-10249
+  name: csi-attacher-metrics
   namespace: kube-system
   labels:
     app: csi-linode-controller
-    service: csi-linode-controller-metrics-10249
+    service: csi-attacher-metrics
   annotations:
     prometheus.io/scrape: 'true'
     prometheus.io/port: '10249'
@@ -43,11 +45,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: csi-linode-controller-metrics-10250
+  name: csi-resizer-metrics
   namespace: kube-system
   labels:
     app: csi-linode-controller
-    service: csi-linode-controller-metrics-10250
+    service: csi-resizer-metrics
   annotations:
     prometheus.io/scrape: 'true'
     prometheus.io/port: '10250'
@@ -60,3 +62,4 @@ spec:
       port: 10250
       targetPort: 10250
       protocol: TCP
+{{- end }}