mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate grpc metrics in ceph-csi

Browse Source 
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>
This commit is contained in:
Madhu Rajanna
2020-03-31 11:29:29 +05:30
committed by mergify[bot]
parent f2e98a19e8
commit bcd646ee55
21 changed files with 12 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
View File

@ -76,11 +76,6 @@ spec:
- "--type=cephfs"
- "--nodeserver=true"
- "--pidlimit=-1"
{{- if .Values.nodeplugin.grpcMetrics.enabled }}
- "--metricsport={{ .Values.nodeplugin.grpcMetrics.containerPort }}"
- "--metricspath=/metrics"
- "--enablegrpcmetrics=true"
{{- end }}
{{- if .Values.nodeplugin.forcecephkernelclient }}
- "--forcecephkernelclient={{ .Values.nodeplugin.forcecephkernelclient }}"
{{- end }}

41
charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml
View File

@ -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-cephfs.nodeplugin.fullname" . }}-grpc-metrics
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "ceph-csi-cephfs.fullname" . }}
chart: {{ include "ceph-csi-cephfs.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-cephfs.name" . }}
component: {{ .Values.nodeplugin.name }}
release: {{ .Release.Name }}
type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}"
{{- end -}}

5
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
View File

@ -90,11 +90,6 @@ spec:
- "--type=cephfs"
- "--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)"

41
charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml
View File

@ -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-cephfs.provisioner.fullname" . }}-grpc-metrics
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "ceph-csi-cephfs.fullname" . }}
chart: {{ include "ceph-csi-cephfs.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-cephfs.name" . }}
component: {{ .Values.provisioner.name }}
release: {{ .Release.Name }}
type: "{{ .Values.provisioner.grpcMetrics.service.type }}"
{{- end -}}

62
charts/ceph-csi-cephfs/values.yaml
View File

@ -63,37 +63,6 @@ nodeplugin:
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: 8091
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: "9090"
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
@ -160,37 +129,6 @@ provisioner:
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: 8091
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: "9090"
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

5
charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
View File

@ -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)"

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

@ -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 -}}

5
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
View File

@ -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)"

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

@ -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 -}}

62
charts/ceph-csi-rbd/values.yaml
View File

@ -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