mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-01-18 02:39:30 +00:00
Merge pull request #315 from red-hat-storage/sync_us--devel
Syncing latest changes from upstream devel for ceph-csi
This commit is contained in:
openshift-merge-bot[bot]
GitHub
commit
5f1299e37d
@ -4,4 +4,7 @@
|
||||
|
||||
## Features
|
||||
|
||||
- deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664).
|
||||
- deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668)
|
||||
|
||||
## NOTE
|
||||
|
||||
@ -129,6 +129,7 @@ charts and their default values.
|
||||
| `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` |
|
||||
| `nodeplugin.plugin.image.tag` | Image tag | `canary` |
|
||||
| `nodeplugin.plugin.image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `nodeplugin.podSecurityContext` | Specifies pod-level security context. | `{}` |
|
||||
| `nodeplugin.nodeSelector` | Kubernetes `nodeSelector` to add to the Daemonset | `{}` |
|
||||
| `nodeplugin.tolerations` | List of Kubernetes `tolerations` to add to the Daemonset | `{}` |
|
||||
| `nodeplugin.forcecephkernelclient` | Set to true to enable Ceph Kernel clients on kernel < 4.17 which support quotas | `true` |
|
||||
@ -163,6 +164,7 @@ charts and their default values.
|
||||
| `provisioner.tolerations` | Specifies the tolerations for provisioner deployment | `{}` |
|
||||
| `provisioner.affinity` | Specifies the affinity for provisioner deployment | `{}` |
|
||||
| `provisioner.podSecurityPolicy.enabled` | Specifies whether podSecurityPolicy is enabled | `false` |
|
||||
| `provisioner.podSecurityContext` | Specifies pod-level security context. | `{}` |
|
||||
| `provisionerSocketFile` | The filename of the provisioner socket | `csi-provisioner.sock` |
|
||||
| `pluginSocketFile` | The filename of the plugin socket | `csi.sock` |
|
||||
| `readAffinity.enabled` | Enable read affinity for CephFS subvolumes. Recommended to set to true if running kernel 5.8 or newer. | `false` |
|
||||
|
||||
@ -28,6 +28,7 @@ spec:
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
|
||||
spec:
|
||||
securityContext: {{ toYaml .Values.nodeplugin.podSecurityContext | nindent 8 }}
|
||||
serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }}
|
||||
{{- if .Values.nodeplugin.priorityClassName }}
|
||||
priorityClassName: {{ .Values.nodeplugin.priorityClassName }}
|
||||
|
||||
@ -57,6 +57,7 @@ spec:
|
||||
{{ toYaml .Values.provisioner.affinity | indent 8 -}}
|
||||
{{- end -}}
|
||||
{{- end }}
|
||||
securityContext: {{ toYaml .Values.provisioner.podSecurityContext | nindent 8 }}
|
||||
serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }}
|
||||
hostNetwork: {{ .Values.provisioner.enableHostNetwork }}
|
||||
{{- if .Values.provisioner.priorityClassName }}
|
||||
|
||||
@ -127,6 +127,8 @@ nodeplugin:
|
||||
|
||||
affinity: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
|
||||
# Set to true to enable Ceph Kernel clients
|
||||
# on kernel < 4.17 which support quotas
|
||||
# forcecephkernelclient: true
|
||||
@ -244,6 +246,8 @@ provisioner:
|
||||
|
||||
affinity: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
|
||||
# readAffinity:
|
||||
# Enable read affinity for CephFS subvolumes. Recommended to
|
||||
# set to true if running kernel 5.8 or newer.
|
||||
|
||||
@ -131,6 +131,7 @@ charts and their default values.
|
||||
| `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` |
|
||||
| `nodeplugin.plugin.image.tag` | Image tag | `canary` |
|
||||
| `nodeplugin.plugin.image.pullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `nodeplugin.podSecurityContext` | Specifies pod-level security context. | `{}` |
|
||||
| `nodeplugin.nodeSelector` | Kubernetes `nodeSelector` to add to the Daemonset | `{}` |
|
||||
| `nodeplugin.tolerations` | List of Kubernetes `tolerations` to add to the Daemonset | `{}` |
|
||||
| `nodeplugin.podSecurityPolicy.enabled` | If true, create & use [Pod Security Policy resources](https://kubernetes.io/docs/concepts/policy/pod-security-policy/). | `false` |
|
||||
@ -154,6 +155,7 @@ charts and their default values.
|
||||
| `provisioner.provisioner.image.tag` | Specifies image tag | `v4.0.1` |
|
||||
| `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
|
||||
| `provisioner.provisioner.image.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` |
|
||||
| `provisioner.podSecurityContext` | Specifies pod-level security context. | `{}` |
|
||||
| `provisioner.snapshotter.args.enableVolumeGroupSnapshots` | enables the creation of volume group snapshots | `false` |
|
||||
| `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` |
|
||||
| `provisioner.attacher.image.tag` | Specifies image tag | `v4.5.` |
|
||||
|
||||
@ -28,6 +28,7 @@ spec:
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
|
||||
spec:
|
||||
securityContext: {{ toYaml .Values.nodeplugin.podSecurityContext | nindent 8 }}
|
||||
serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }}
|
||||
hostNetwork: true
|
||||
hostPID: true
|
||||
|
||||
@ -57,6 +57,7 @@ spec:
|
||||
{{ toYaml .Values.provisioner.affinity | indent 8 -}}
|
||||
{{- end -}}
|
||||
{{- end }}
|
||||
securityContext: {{ toYaml .Values.provisioner.podSecurityContext | nindent 8 }}
|
||||
serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }}
|
||||
hostNetwork: {{ .Values.provisioner.enableHostNetwork }}
|
||||
{{- if .Values.provisioner.priorityClassName }}
|
||||
|
||||
@ -156,6 +156,8 @@ nodeplugin:
|
||||
|
||||
affinity: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
|
||||
provisioner:
|
||||
name: provisioner
|
||||
replicaCount: 3
|
||||
@ -295,6 +297,8 @@ provisioner:
|
||||
|
||||
affinity: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
|
||||
topology:
|
||||
# Specifies whether topology based provisioning support should
|
||||
# be exposed by CSI
|
||||
|
||||
Loading…
Reference in New Issue
Block a user