Deprecate grpc metrics in ceph-csi

As kubernetes CSI sidecar is exposing the
GRPC mertics we can make use of the same in
ceph-csi we dont need to expose our own.

update: #881

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml

@@ -77,11 +77,6 @@ spec:
             - "--type=rbd"
             - "--nodeserver=true"
             - "--pidlimit=-1"
-{{- if .Values.nodeplugin.grpcMetrics.enabled }}
-            - "--metricsport={{ .Values.nodeplugin.grpcMetrics.containerPort }}"
-            - "--metricspath=/metrics"
-            - "--enablegrpcmetrics=true"
-{{- end }}
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--v=5"
             - "--drivername=$(DRIVER_NAME)"

charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.nodeplugin.grpcMetrics.service.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.nodeplugin.grpcMetrics.service.annotations }}
-  annotations:
-{{ toYaml .Values.nodeplugin.grpcMetrics.service.annotations | indent 4 }}
-{{- end }}
-  name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}-grpc-metrics
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ include "ceph-csi-rbd.fullname" . }}
-    chart: {{ include "ceph-csi-rbd.chart" . }}
-    component: {{ .Values.nodeplugin.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-{{- if .Values.nodeplugin.grpcMetrics.service.clusterIP }}
-  clusterIP: "{{ .Values.nodeplugin.grpcMetrics.service.clusterIP }}"
-{{- end }}
-{{- if .Values.nodeplugin.grpcMetrics.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.nodeplugin.grpcMetrics.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.nodeplugin.grpcMetrics.service.loadBalancerIP }}
-  loadBalancerIP: "{{ .Values.nodeplugin.grpcMetrics.service.loadBalancerIP }}"
-{{- end }}
-{{- if .Values.nodeplugin.grpcMetrics.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.nodeplugin.grpcMetrics.service.loadBalancerSourceRanges | indent 4 }}
-{{- end }}
-  ports:
-    - name: grpc-metrics
-      port: {{ .Values.nodeplugin.grpcMetrics.service.servicePort }}
-      targetPort: {{ .Values.nodeplugin.grpcMetrics.containerPort }}
-  selector:
-    app: {{ include "ceph-csi-rbd.name" . }}
-    component: {{ .Values.nodeplugin.name }}
-    release: {{ .Release.Name }}
-  type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}"
-{{- end -}}

charts/ceph-csi-rbd/templates/provisioner-deployment.yaml

@@ -106,11 +106,6 @@ spec:
             - "--type=rbd"
             - "--controllerserver=true"
             - "--pidlimit=-1"
-{{- if .Values.provisioner.grpcMetrics.enabled }}
-            - "--metricsport={{ .Values.nodeplugin.grpcMetrics.containerPort }}"
-            - "--metricspath=/metrics"
-            - "--enablegrpcmetrics=true"
-{{- end }}
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--v=5"
             - "--drivername=$(DRIVER_NAME)"

charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.provisioner.grpcMetrics.service.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.provisioner.grpcMetrics.service.annotations }}
-  annotations:
-{{ toYaml .Values.provisioner.grpcMetrics.service.annotations | indent 4 }}
-{{- end }}
-  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-grpc-metrics
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ include "ceph-csi-rbd.fullname" . }}
-    chart: {{ include "ceph-csi-rbd.chart" . }}
-    component: {{ .Values.provisioner.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-{{- if .Values.provisioner.grpcMetrics.service.clusterIP }}
-  clusterIP: "{{ .Values.provisioner.grpcMetrics.service.clusterIP }}"
-{{- end }}
-{{- if .Values.provisioner.grpcMetrics.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.provisioner.grpcMetrics.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.provisioner.grpcMetrics.service.loadBalancerIP }}
-  loadBalancerIP: "{{ .Values.provisioner.grpcMetrics.service.loadBalancerIP }}"
-{{- end }}
-{{- if .Values.provisioner.grpcMetrics.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.provisioner.grpcMetrics.service.loadBalancerSourceRanges | indent 4 }}
-{{- end }}
-  ports:
-    - name: grpc-metrics
-      port: {{ .Values.provisioner.grpcMetrics.service.servicePort }}
-      targetPort: {{ .Values.provisioner.grpcMetrics.containerPort }}
-  selector:
-    app: {{ include "ceph-csi-rbd.name" . }}
-    component: {{ .Values.provisioner.name }}
-    release: {{ .Release.Name }}
-  type: "{{ .Values.provisioner.grpcMetrics.service.type }}"
-{{- end -}}

charts/ceph-csi-rbd/values.yaml

@@ -77,37 +77,6 @@ nodeplugin:
       loadBalancerIP: ""
       loadBalancerSourceRanges: []
 
-  grpcMetrics:
-    # Metrics only available for cephcsi/cephcsi => 1.2.0
-    # Specifies whether grpc metrics should be exposed
-    enabled: true
-    # The port of the container to expose the metrics
-    containerPort: 8090
-
-    service:
-      # Specifies whether a service should be created for the metrics
-      enabled: true
-      # The port to use for the service
-      servicePort: 8090
-      type: ClusterIP
-
-      # Annotations for the service
-      # Example:
-      # annotations:
-      #   prometheus.io/scrape: "true"
-      #   prometheus.io/port: "8090"
-      annotations: {}
-
-      clusterIP: ""
-
-      ## List of IP addresses at which the stats-exporter service is available
-      ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-      ##
-      externalIPs: []
-
-      loadBalancerIP: ""
-      loadBalancerSourceRanges: []
-
   registrar:
     image:
       repository: quay.io/k8scsi/csi-node-driver-registrar
@@ -170,37 +139,6 @@ provisioner:
       loadBalancerIP: ""
       loadBalancerSourceRanges: []
 
-  grpcMetrics:
-    # Metrics only available for cephcis/cephsi => 1.2.0
-    # Specifies whether grpc metrics should be exposed
-    enabled: true
-    # The port of the container to expose the metrics
-    containerPort: 8090
-
-    service:
-      # Specifies whether a service should be created for the metrics
-      enabled: true
-      # The port to use for the service
-      servicePort: 8090
-      type: ClusterIP
-
-      # Annotations for the service
-      # Example:
-      # annotations:
-      #   prometheus.io/scrape: "true"
-      #   prometheus.io/port: "8090"
-      annotations: {}
-
-      clusterIP: ""
-
-      ## List of IP addresses at which the stats-exporter service is available
-      ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-      ##
-      externalIPs: []
-
-      loadBalancerIP: ""
-      loadBalancerSourceRanges: []
-
   provisioner:
     image:
       repository: quay.io/k8scsi/csi-provisioner