2019-09-26 09:55:12 +00:00
|
|
|
kind: Deployment
|
2019-06-19 09:05:44 +00:00
|
|
|
apiVersion: apps/v1
|
2018-12-10 19:25:34 +00:00
|
|
|
metadata:
|
|
|
|
name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
|
2019-07-29 10:36:24 +00:00
|
|
|
namespace: {{ .Release.Namespace }}
|
2018-12-10 19:25:34 +00:00
|
|
|
labels:
|
|
|
|
app: {{ include "ceph-csi-rbd.name" . }}
|
|
|
|
chart: {{ include "ceph-csi-rbd.chart" . }}
|
|
|
|
component: {{ .Values.provisioner.name }}
|
|
|
|
release: {{ .Release.Name }}
|
|
|
|
heritage: {{ .Release.Service }}
|
|
|
|
spec:
|
2019-07-29 10:36:24 +00:00
|
|
|
replicas: {{ .Values.provisioner.replicaCount }}
|
2021-08-03 11:11:51 +00:00
|
|
|
strategy:
|
|
|
|
type: {{ .Values.provisioner.strategy.type }}
|
|
|
|
{{- if eq .Values.provisioner.strategy.type "RollingUpdate" }}
|
|
|
|
rollingUpdate:
|
|
|
|
maxUnavailable: {{ .Values.provisioner.strategy.rollingUpdate.maxUnavailable }}
|
|
|
|
{{- end }}
|
2019-01-19 01:06:32 +00:00
|
|
|
selector:
|
|
|
|
matchLabels:
|
|
|
|
app: {{ include "ceph-csi-rbd.name" . }}
|
|
|
|
component: {{ .Values.provisioner.name }}
|
|
|
|
release: {{ .Release.Name }}
|
2018-12-10 19:25:34 +00:00
|
|
|
template:
|
|
|
|
metadata:
|
|
|
|
labels:
|
|
|
|
app: {{ include "ceph-csi-rbd.name" . }}
|
|
|
|
chart: {{ include "ceph-csi-rbd.chart" . }}
|
|
|
|
component: {{ .Values.provisioner.name }}
|
|
|
|
release: {{ .Release.Name }}
|
|
|
|
heritage: {{ .Release.Service }}
|
|
|
|
spec:
|
2020-09-20 01:00:51 +00:00
|
|
|
{{- if gt (int .Values.provisioner.replicaCount) 1 }}
|
|
|
|
affinity:
|
|
|
|
podAntiAffinity:
|
|
|
|
requiredDuringSchedulingIgnoredDuringExecution:
|
|
|
|
- labelSelector:
|
|
|
|
matchExpressions:
|
|
|
|
- key: app
|
|
|
|
operator: In
|
|
|
|
values:
|
|
|
|
- {{ include "ceph-csi-rbd.name" . }}
|
|
|
|
- key: component
|
|
|
|
operator: In
|
|
|
|
values:
|
|
|
|
- {{ .Values.provisioner.name }}
|
|
|
|
topologyKey: "kubernetes.io/hostname"
|
|
|
|
{{- end }}
|
2018-12-10 19:25:34 +00:00
|
|
|
serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }}
|
2020-05-05 08:28:39 +00:00
|
|
|
{{- if .Values.provisioner.priorityClassName }}
|
|
|
|
priorityClassName: {{ .Values.provisioner.priorityClassName }}
|
|
|
|
{{- end }}
|
2018-12-10 19:25:34 +00:00
|
|
|
containers:
|
|
|
|
- name: csi-provisioner
|
2019-07-29 10:36:24 +00:00
|
|
|
image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}"
|
|
|
|
imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }}
|
2018-12-10 19:25:34 +00:00
|
|
|
args:
|
|
|
|
- "--csi-address=$(ADDRESS)"
|
2020-10-20 06:49:10 +00:00
|
|
|
- "--v={{ .Values.logLevel }}"
|
2019-09-26 09:55:12 +00:00
|
|
|
- "--timeout={{ .Values.provisioner.timeout }}"
|
2020-09-30 04:58:08 +00:00
|
|
|
- "--leader-election=true"
|
Move locks to more granular locking than CPU count based
As detailed in issue #279, current lock scheme has hash
buckets that are count of CPUs. This causes a lot of contention
when parallel requests are made to the CSI plugin. To reduce
lock contention, this commit introduces granular locks per
identifier.
The commit also changes the timeout for gRPC requests to Create
and Delete volumes, as the current timeout is 10s (kubernetes
documentation says 15s but code defaults are 10s). A virtual
setup takes about 12-15s to complete a request at times, that leads
to unwanted retries of the same request, hence the increased
timeout to enable operation completion with minimal retries.
Tests to create PVCs before and after these changes look like so,
Before:
Default master code + sidecar provisioner --timeout option set
to 30 seconds
20 PVCs
Creation: 3 runs, 396/391/400 seconds
Deletion: 3 runs, 218/271/118 seconds
- Once was stalled for more than 8 minutes and cancelled the run
After:
Current commit + sidecar provisioner --timeout option set to 30 sec
20 PVCs
Creation: 3 runs, 42/59/65 seconds
Deletion: 3 runs, 32/32/31 seconds
Fixes: #279
Signed-off-by: ShyamsundarR <srangana@redhat.com>
2019-06-22 16:43:28 +00:00
|
|
|
- "--retry-interval-start=500ms"
|
2020-12-08 10:49:39 +00:00
|
|
|
- "--default-fstype={{ .Values.provisioner.defaultFSType }}"
|
2020-10-22 05:07:05 +00:00
|
|
|
- "--extra-create-metadata=true"
|
2020-03-18 17:38:40 +00:00
|
|
|
{{- if .Values.topology.enabled }}
|
|
|
|
- "--feature-gates=Topology=true"
|
|
|
|
{{- end }}
|
2018-12-10 19:25:34 +00:00
|
|
|
env:
|
|
|
|
- name: ADDRESS
|
2019-09-26 09:55:12 +00:00
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
2018-12-10 19:25:34 +00:00
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
2019-09-26 09:55:12 +00:00
|
|
|
mountPath: /csi
|
2018-12-10 19:25:34 +00:00
|
|
|
resources:
|
2019-07-29 10:36:24 +00:00
|
|
|
{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
|
2019-11-27 12:15:27 +00:00
|
|
|
{{- if .Values.provisioner.resizer.enabled }}
|
|
|
|
- name: csi-resizer
|
|
|
|
image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
|
|
|
|
imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }}
|
|
|
|
args:
|
2020-10-20 06:49:10 +00:00
|
|
|
- "--v={{ .Values.logLevel }}"
|
2019-11-27 12:15:27 +00:00
|
|
|
- "--csi-address=$(ADDRESS)"
|
2020-09-30 04:58:08 +00:00
|
|
|
- "--timeout={{ .Values.provisioner.timeout }}"
|
2019-11-27 12:15:27 +00:00
|
|
|
- "--leader-election"
|
2020-05-27 11:02:08 +00:00
|
|
|
- "--retry-interval-start=500ms"
|
2020-09-30 04:58:08 +00:00
|
|
|
- "--handle-volume-inuse-error=false"
|
2019-11-27 12:15:27 +00:00
|
|
|
env:
|
|
|
|
- name: ADDRESS
|
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
|
|
|
mountPath: /csi
|
|
|
|
resources:
|
|
|
|
{{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
|
|
|
|
{{- end }}
|
2019-02-05 21:29:16 +00:00
|
|
|
- name: csi-snapshotter
|
2019-07-29 10:36:24 +00:00
|
|
|
image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
|
|
|
|
imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
|
2019-02-05 21:29:16 +00:00
|
|
|
args:
|
|
|
|
- "--csi-address=$(ADDRESS)"
|
2020-10-20 06:49:10 +00:00
|
|
|
- "--v={{ .Values.logLevel }}"
|
2019-09-26 09:55:12 +00:00
|
|
|
- "--timeout={{ .Values.provisioner.timeout }}"
|
2019-12-17 11:20:37 +00:00
|
|
|
- "--leader-election=true"
|
2019-02-05 21:29:16 +00:00
|
|
|
env:
|
|
|
|
- name: ADDRESS
|
2019-09-26 09:55:12 +00:00
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
2019-02-05 21:29:16 +00:00
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
2019-09-26 09:55:12 +00:00
|
|
|
mountPath: /csi
|
2019-02-05 21:29:16 +00:00
|
|
|
resources:
|
2019-07-29 10:36:24 +00:00
|
|
|
{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
|
|
|
|
{{- if .Values.provisioner.attacher.enabled }}
|
2019-03-27 06:03:09 +00:00
|
|
|
- name: csi-attacher
|
2019-07-29 10:36:24 +00:00
|
|
|
image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}"
|
|
|
|
imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }}
|
2019-03-27 06:03:09 +00:00
|
|
|
args:
|
2020-10-20 06:49:10 +00:00
|
|
|
- "--v={{ .Values.logLevel }}"
|
2019-03-27 06:03:09 +00:00
|
|
|
- "--csi-address=$(ADDRESS)"
|
2019-09-26 09:55:12 +00:00
|
|
|
- "--leader-election=true"
|
2020-05-27 11:02:08 +00:00
|
|
|
- "--retry-interval-start=500ms"
|
2019-03-27 06:03:09 +00:00
|
|
|
env:
|
|
|
|
- name: ADDRESS
|
2019-09-26 09:55:12 +00:00
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
2019-03-27 06:03:09 +00:00
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
2019-09-26 09:55:12 +00:00
|
|
|
mountPath: /csi
|
2019-07-29 10:36:24 +00:00
|
|
|
resources:
|
|
|
|
{{ toYaml .Values.provisioner.attacher.resources | indent 12 }}
|
|
|
|
{{- end }}
|
2019-01-19 01:06:32 +00:00
|
|
|
- name: csi-rbdplugin
|
|
|
|
image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
|
2019-07-29 10:36:24 +00:00
|
|
|
imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
|
2019-09-26 09:55:12 +00:00
|
|
|
args:
|
2019-01-19 01:06:32 +00:00
|
|
|
- "--nodeid=$(NODE_ID)"
|
2019-05-24 11:03:33 +00:00
|
|
|
- "--type=rbd"
|
2019-08-14 06:42:17 +00:00
|
|
|
- "--controllerserver=true"
|
2019-09-26 09:55:12 +00:00
|
|
|
- "--pidlimit=-1"
|
2019-01-19 01:06:32 +00:00
|
|
|
- "--endpoint=$(CSI_ENDPOINT)"
|
2021-12-22 07:09:27 +00:00
|
|
|
- "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"
|
2020-10-20 06:49:10 +00:00
|
|
|
- "--v={{ .Values.logLevel }}"
|
2019-03-13 05:09:58 +00:00
|
|
|
- "--drivername=$(DRIVER_NAME)"
|
2020-06-24 06:44:02 +00:00
|
|
|
- "--rbdhardmaxclonedepth={{ .Values.provisioner.hardMaxCloneDepth }}"
|
|
|
|
- "--rbdsoftmaxclonedepth={{ .Values.provisioner.softMaxCloneDepth }}"
|
2020-07-01 05:27:11 +00:00
|
|
|
- "--maxsnapshotsonimage={{ .Values.provisioner.maxSnapshotsOnImage }}"
|
2020-11-17 03:34:29 +00:00
|
|
|
- "--minsnapshotsonimage={{ .Values.provisioner.minSnapshotsOnImage }}"
|
2020-06-24 08:12:12 +00:00
|
|
|
{{- if .Values.provisioner.skipForceFlatten }}
|
|
|
|
- "--skipforceflatten={{ .Values.provisioner.skipForceFlatten }}"
|
|
|
|
{{- end }}
|
2021-03-25 11:14:46 +00:00
|
|
|
{{- if .Values.provisioner.profiling.enabled }}
|
|
|
|
- "--enableprofiling={{ .Values.provisioner.profiling.enabled }}"
|
|
|
|
{{- end }}
|
2019-01-19 01:06:32 +00:00
|
|
|
env:
|
2019-08-21 09:28:02 +00:00
|
|
|
- name: POD_IP
|
|
|
|
valueFrom:
|
|
|
|
fieldRef:
|
|
|
|
fieldPath: status.podIP
|
2019-03-13 05:09:58 +00:00
|
|
|
- name: DRIVER_NAME
|
|
|
|
value: {{ .Values.driverName }}
|
2019-01-19 01:06:32 +00:00
|
|
|
- name: NODE_ID
|
|
|
|
valueFrom:
|
|
|
|
fieldRef:
|
|
|
|
fieldPath: spec.nodeName
|
|
|
|
- name: CSI_ENDPOINT
|
2019-09-26 09:55:12 +00:00
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
2021-12-22 07:09:27 +00:00
|
|
|
- name: CSI_ADDONS_ENDPOINT
|
|
|
|
value: "unix:///csi/csi-addons.sock"
|
2019-01-19 01:06:32 +00:00
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
2019-09-26 09:55:12 +00:00
|
|
|
mountPath: /csi
|
|
|
|
- mountPath: /dev
|
|
|
|
name: host-dev
|
|
|
|
- mountPath: /sys
|
|
|
|
name: host-sys
|
|
|
|
- mountPath: /lib/modules
|
|
|
|
name: lib-modules
|
|
|
|
readOnly: true
|
2019-04-22 21:35:39 +00:00
|
|
|
- name: ceph-csi-config
|
|
|
|
mountPath: /etc/ceph-csi-config/
|
2021-09-01 14:56:15 +00:00
|
|
|
- name: ceph-config
|
|
|
|
mountPath: /etc/ceph/
|
2020-01-29 11:44:45 +00:00
|
|
|
- name: ceph-csi-encryption-kms-config
|
|
|
|
mountPath: /etc/ceph-csi-encryption-kms-config/
|
2019-06-25 19:29:17 +00:00
|
|
|
- name: keys-tmp-dir
|
|
|
|
mountPath: /tmp/csi/keys
|
2022-03-02 10:30:48 +00:00
|
|
|
- name: oidc-token
|
2022-03-23 05:31:25 +00:00
|
|
|
mountPath: /run/secrets/tokens
|
2022-03-02 10:30:48 +00:00
|
|
|
readOnly: true
|
2019-01-19 01:06:32 +00:00
|
|
|
resources:
|
2019-06-20 19:30:40 +00:00
|
|
|
{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
|
2020-11-17 06:25:30 +00:00
|
|
|
{{- if .Values.provisioner.deployController }}
|
|
|
|
- name: csi-rbdplugin-controller
|
|
|
|
image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
|
|
|
|
imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
|
|
|
|
args:
|
|
|
|
- "--type=controller"
|
|
|
|
- "--v={{ .Values.logLevel }}"
|
|
|
|
- "--drivername=$(DRIVER_NAME)"
|
|
|
|
- "--drivernamespace=$(DRIVER_NAMESPACE)"
|
|
|
|
env:
|
|
|
|
- name: DRIVER_NAMESPACE
|
|
|
|
valueFrom:
|
|
|
|
fieldRef:
|
|
|
|
fieldPath: metadata.namespace
|
|
|
|
- name: DRIVER_NAME
|
|
|
|
value: {{ .Values.driverName }}
|
|
|
|
volumeMounts:
|
|
|
|
- name: ceph-csi-config
|
|
|
|
mountPath: /etc/ceph-csi-config/
|
|
|
|
- name: keys-tmp-dir
|
|
|
|
mountPath: /tmp/csi/keys
|
2021-09-01 14:56:15 +00:00
|
|
|
- name: ceph-config
|
|
|
|
mountPath: /etc/ceph/
|
2020-11-17 06:25:30 +00:00
|
|
|
resources:
|
|
|
|
{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
|
|
|
|
{{- end }}
|
2019-09-26 09:55:12 +00:00
|
|
|
{{- if .Values.provisioner.httpMetrics.enabled }}
|
2019-06-20 19:30:40 +00:00
|
|
|
- name: liveness-prometheus
|
|
|
|
image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
|
|
|
|
imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
|
2019-08-15 08:00:25 +00:00
|
|
|
args:
|
|
|
|
- "--type=liveness"
|
|
|
|
- "--endpoint=$(CSI_ENDPOINT)"
|
2019-09-26 09:55:12 +00:00
|
|
|
- "--metricsport={{ .Values.provisioner.httpMetrics.containerPort }}"
|
2019-08-21 09:28:02 +00:00
|
|
|
- "--metricspath=/metrics"
|
2019-08-15 08:00:25 +00:00
|
|
|
- "--polltime=60s"
|
|
|
|
- "--timeout=3s"
|
|
|
|
env:
|
|
|
|
- name: CSI_ENDPOINT
|
2019-09-26 09:55:12 +00:00
|
|
|
value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
|
2019-08-15 08:00:25 +00:00
|
|
|
- name: POD_IP
|
|
|
|
valueFrom:
|
|
|
|
fieldRef:
|
2019-06-20 19:30:40 +00:00
|
|
|
fieldPath: status.podIP
|
2022-02-04 11:18:59 +00:00
|
|
|
ports:
|
|
|
|
- containerPort: {{ .Values.provisioner.httpMetrics.containerPort }}
|
|
|
|
name: metrics
|
|
|
|
protocol: TCP
|
2019-06-20 19:30:40 +00:00
|
|
|
volumeMounts:
|
|
|
|
- name: socket-dir
|
2019-09-26 09:55:12 +00:00
|
|
|
mountPath: /csi
|
2019-06-20 19:30:40 +00:00
|
|
|
resources:
|
2019-01-19 01:06:32 +00:00
|
|
|
{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
|
2019-09-26 09:55:12 +00:00
|
|
|
{{- end }}
|
2018-12-10 19:25:34 +00:00
|
|
|
volumes:
|
|
|
|
- name: socket-dir
|
2020-01-13 04:05:50 +00:00
|
|
|
emptyDir: {
|
|
|
|
medium: "Memory"
|
|
|
|
}
|
2019-09-26 09:55:12 +00:00
|
|
|
- name: host-dev
|
|
|
|
hostPath:
|
|
|
|
path: /dev
|
|
|
|
- name: host-sys
|
|
|
|
hostPath:
|
|
|
|
path: /sys
|
|
|
|
- name: lib-modules
|
|
|
|
hostPath:
|
|
|
|
path: /lib/modules
|
2021-09-01 14:56:15 +00:00
|
|
|
- name: ceph-config
|
|
|
|
configMap:
|
2022-02-12 17:01:10 +00:00
|
|
|
name: {{ .Values.cephConfConfigMapName | quote }}
|
2019-04-22 21:35:39 +00:00
|
|
|
- name: ceph-csi-config
|
|
|
|
configMap:
|
|
|
|
name: {{ .Values.configMapName | quote }}
|
2020-04-10 15:55:21 +00:00
|
|
|
{{- if .Values.configMapKey }}
|
|
|
|
items:
|
|
|
|
- key: {{ .Values.configMapKey | quote }}
|
|
|
|
path: config.json
|
|
|
|
{{- end }}
|
2020-01-29 11:44:45 +00:00
|
|
|
- name: ceph-csi-encryption-kms-config
|
|
|
|
configMap:
|
|
|
|
name: {{ .Values.kmsConfigMapName | quote }}
|
2019-06-25 19:29:17 +00:00
|
|
|
- name: keys-tmp-dir
|
|
|
|
emptyDir: {
|
|
|
|
medium: "Memory"
|
|
|
|
}
|
2022-03-02 10:30:48 +00:00
|
|
|
- name: oidc-token
|
|
|
|
projected:
|
|
|
|
sources:
|
|
|
|
- serviceAccountToken:
|
|
|
|
path: oidc-token
|
|
|
|
expirationSeconds: 3600
|
|
|
|
audience: ceph-csi-kms
|
2019-07-29 10:36:24 +00:00
|
|
|
{{- if .Values.provisioner.affinity }}
|
2018-12-10 19:25:34 +00:00
|
|
|
affinity:
|
2019-12-03 08:18:59 +00:00
|
|
|
{{ toYaml .Values.provisioner.affinity | indent 8 -}}
|
2019-07-29 10:36:24 +00:00
|
|
|
{{- end -}}
|
|
|
|
{{- if .Values.provisioner.nodeSelector }}
|
2018-12-10 19:25:34 +00:00
|
|
|
nodeSelector:
|
2019-07-29 10:36:24 +00:00
|
|
|
{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}}
|
|
|
|
{{- end -}}
|
|
|
|
{{- if .Values.provisioner.tolerations }}
|
2018-12-10 19:25:34 +00:00
|
|
|
tolerations:
|
2019-07-29 10:36:24 +00:00
|
|
|
{{ toYaml .Values.provisioner.tolerations | indent 8 -}}
|
|
|
|
{{- end -}}
|