Skip to content

Commit cbe9ccf

Browse files
author
ceph-csi-bot
committed
Update for helm charts rbd-3.11-canary
1 parent 9e59bbc commit cbe9ccf

File tree

8 files changed

+133
-146
lines changed

8 files changed

+133
-146
lines changed

‎docs/index.yaml

Lines changed: 113 additions & 113 deletions
Large diffs are not rendered by default.

‎docs/rbd/ceph-csi-rbd-3.11-canary.tgz

0 Bytes
Binary file not shown.

‎docs/rbd/ceph-csi-rbd/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
apiVersion: v1
3-
appVersion: canary
3+
appVersion: 3.11-canary
44
description: "Container Storage Interface (CSI) driver,
55
provisioner, snapshotter, resizer and attacher for Ceph RBD"
66
name: ceph-csi-rbd
7-
version: 3-canary
7+
version: 3.11-canary
88
keywords:
99
- ceph
1010
- rbd
1111
- ceph-csi
1212
home: https://github.com/ceph/ceph-csi
1313
sources:
14-
- https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-rbd
15-
icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png
14+
- https://github.com/ceph/ceph-csi/tree/release-v3.11/charts/ceph-csi-rbd
15+
icon: https://raw.githubusercontent.com/ceph/ceph-csi/release-v3.11/assets/ceph-logo.png

‎docs/rbd/ceph-csi-rbd/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ charts and their default values.
131131
| `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` |
132132
| `nodeplugin.plugin.image.tag` | Image tag | `canary` |
133133
| `nodeplugin.plugin.image.pullPolicy` | Image pull policy | `IfNotPresent` |
134-
| `nodeplugin.podSecurityContext` | Specifies pod-level security context. | `{}` |
135134
| `nodeplugin.nodeSelector` | Kubernetes `nodeSelector` to add to the Daemonset | `{}` |
136135
| `nodeplugin.tolerations` | List of Kubernetes `tolerations` to add to the Daemonset | `{}` |
137136
| `nodeplugin.podSecurityPolicy.enabled` | If true, create & use [Pod Security Policy resources](https://kubernetes.io/docs/concepts/policy/pod-security-policy/). | `false` |
@@ -152,10 +151,9 @@ charts and their default values.
152151
| `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` |
153152
| `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` |
154153
| `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` |
155-
| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.0.1` |
154+
| `provisioner.provisioner.image.tag` | Specifies image tag | `v4.0.1` |
156155
| `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
157156
| `provisioner.provisioner.image.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` |
158-
| `provisioner.podSecurityContext` | Specifies pod-level security context. | `{}` |
159157
| `provisioner.snapshotter.args.enableVolumeGroupSnapshots` | enables the creation of volume group snapshots | `false` |
160158
| `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` |
161159
| `provisioner.attacher.image.tag` | Specifies image tag | `v4.5.` |
@@ -164,13 +162,13 @@ charts and their default values.
164162
| `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` |
165163
| `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` |
166164
| `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` |
167-
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.11.1` |
165+
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.10.1` |
168166
| `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
169167
| `provisioner.resizer.image.extraArgs` | Specifies extra arguments for the resizer sidecar | `[]` |
170168
| `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` |
171169
| `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` |
172170
| `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` |
173-
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.0.1` |
171+
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v7.0.2` |
174172
| `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
175173
| `provisioner.snapshotter.image.extraArgs` | Specifies extra arguments for the snapshotter sidecar | `[]` |
176174
| `provisioner.nodeSelector` | Specifies the node selector for provisioner deployment | `{}` |
@@ -229,7 +227,6 @@ charts and their default values.
229227
| `selinuxMount` | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems | `true` |
230228
| `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` |
231229
| `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` |
232-
| `instanceID` | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning. | ` ` |
233230

234231
### Command Line
235232

‎docs/rbd/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ spec:
2828
heritage: {{ .Release.Service }}
2929
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
3030
spec:
31-
securityContext: {{ toYaml .Values.nodeplugin.podSecurityContext | nindent 8 }}
3231
serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }}
3332
hostNetwork: true
3433
hostPID: true
@@ -57,12 +56,9 @@ spec:
5756
- "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"
5857
- "--v={{ .Values.logLevel }}"
5958
- "--drivername=$(DRIVER_NAME)"
60-
{{- if .Values.topology.domainLabels }}
59+
{{- if .Values.topology.enabled }}
6160
- "--domainlabels={{ .Values.topology.domainLabels | join "," }}"
6261
{{- end }}
63-
{{- if .Values.instanceID }}
64-
- "--instanceid={{ .Values.instanceID }}"
65-
{{- end }}
6662
{{- if .Values.nodeplugin.profiling.enabled }}
6763
- "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}"
6864
{{- end }}

‎docs/rbd/ceph-csi-rbd/templates/provisioner-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ rules:
8181
resources: ["persistentvolumeclaims/status"]
8282
verbs: ["update", "patch"]
8383
{{- end }}
84-
{{- if .Values.topology.domainLabels }}
84+
{{- if .Values.topology.enabled }}
8585
- apiGroups: [""]
8686
resources: ["nodes"]
8787
verbs: ["get", "list","watch"]

‎docs/rbd/ceph-csi-rbd/templates/provisioner-deployment.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ spec:
5757
{{ toYaml .Values.provisioner.affinity | indent 8 -}}
5858
{{- end -}}
5959
{{- end }}
60-
securityContext: {{ toYaml .Values.provisioner.podSecurityContext | nindent 8 }}
6160
serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }}
6261
hostNetwork: {{ .Values.provisioner.enableHostNetwork }}
6362
{{- if .Values.provisioner.priorityClassName }}
@@ -87,9 +86,6 @@ spec:
8786
{{- if .Values.provisioner.skipForceFlatten }}
8887
- "--skipforceflatten={{ .Values.provisioner.skipForceFlatten }}"
8988
{{- end }}
90-
{{- if .Values.instanceID }}
91-
- "--instanceid={{ .Values.instanceID }}"
92-
{{- end }}
9389
{{- if .Values.provisioner.profiling.enabled }}
9490
- "--enableprofiling={{ .Values.provisioner.profiling.enabled }}"
9591
{{- end }}
@@ -148,6 +144,9 @@ spec:
148144
- "--extra-create-metadata=true"
149145
- "--feature-gates=HonorPVReclaimPolicy=true"
150146
- "--prevent-volume-mode-conversion=true"
147+
{{- if .Values.topology.enabled }}
148+
- "--feature-gates=Topology=true"
149+
{{- end }}
151150
{{- range .Values.provisioner.provisioner.extraArgs }}
152151
- "--{{ . }}"
153152
{{- end }}

‎docs/rbd/ceph-csi-rbd/values.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ serviceAccounts:
2727
# - "<MONValue2>"
2828
# rbd:
2929
# netNamespaceFilePath: "{{ .kubeletDir }}/plugins/{{ .driverName }}/net"
30-
# mirrorDaemonCount: 1
3130
# readAffinity:
3231
# enabled: true
3332
# crushLocationLabels:
@@ -146,7 +145,7 @@ nodeplugin:
146145
plugin:
147146
image:
148147
repository: quay.io/cephcsi/cephcsi
149-
tag: canary
148+
tag: v3.11-canary
150149
pullPolicy: IfNotPresent
151150
resources: {}
152151

@@ -156,8 +155,6 @@ nodeplugin:
156155

157156
affinity: {}
158157

159-
podSecurityContext: {}
160-
161158
provisioner:
162159
name: provisioner
163160
replicaCount: 3
@@ -243,7 +240,7 @@ provisioner:
243240
provisioner:
244241
image:
245242
repository: registry.k8s.io/sig-storage/csi-provisioner
246-
tag: v5.0.1
243+
tag: v4.0.1
247244
pullPolicy: IfNotPresent
248245
resources: {}
249246
## For further options, check
@@ -258,7 +255,7 @@ provisioner:
258255
enabled: true
259256
image:
260257
repository: registry.k8s.io/sig-storage/csi-attacher
261-
tag: v4.6.1
258+
tag: v4.5.1
262259
pullPolicy: IfNotPresent
263260
resources: {}
264261
## For further options, check
@@ -270,7 +267,7 @@ provisioner:
270267
enabled: true
271268
image:
272269
repository: registry.k8s.io/sig-storage/csi-resizer
273-
tag: v1.11.1
270+
tag: v1.10.1
274271
pullPolicy: IfNotPresent
275272
resources: {}
276273
## For further options, check
@@ -280,7 +277,7 @@ provisioner:
280277
snapshotter:
281278
image:
282279
repository: registry.k8s.io/sig-storage/csi-snapshotter
283-
tag: v8.0.1
280+
tag: v7.0.2
284281
pullPolicy: IfNotPresent
285282
resources: {}
286283
## For further options, check
@@ -297,9 +294,10 @@ provisioner:
297294

298295
affinity: {}
299296

300-
podSecurityContext: {}
301-
302297
topology:
298+
# Specifies whether topology based provisioning support should
299+
# be exposed by CSI
300+
enabled: false
303301
# domainLabels define which node labels to use as domains
304302
# for CSI nodeplugins to advertise their domains
305303
# NOTE: the value here serves as an example and needs to be
@@ -553,6 +551,3 @@ externallyManagedConfigmap: false
553551
cephConfConfigMapName: ceph-config
554552
# Name of the configmap used for encryption kms configuration
555553
kmsConfigMapName: ceph-csi-encryption-kms-config
556-
# Unique ID distinguishing this instance of Ceph CSI among other instances,
557-
# when sharing Ceph clusters across CSI instances for provisioning
558-
# instanceID: default

0 commit comments

Comments
 (0)