mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-26 00:00:23 +00:00
Update helm chart to match static files
This updates the helm chart to match all the changes that have been made to the static manifest files. Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
This commit is contained in:
parent
d03b36dd62
commit
f172f089cc
@ -2,7 +2,7 @@ apiVersion: v1
|
|||||||
appVersion: "1.0.0"
|
appVersion: "1.0.0"
|
||||||
description: Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph RBD
|
description: Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph RBD
|
||||||
name: ceph-csi-rbd
|
name: ceph-csi-rbd
|
||||||
version: 0.2.0
|
version: 0.3.0
|
||||||
keywords:
|
keywords:
|
||||||
- ceph
|
- ceph
|
||||||
- rbd
|
- rbd
|
||||||
|
@ -22,4 +22,7 @@ rules:
|
|||||||
- apiGroups: ["storage.k8s.io"]
|
- apiGroups: ["storage.k8s.io"]
|
||||||
resources: ["volumeattachments"]
|
resources: ["volumeattachments"]
|
||||||
verbs: ["get", "list", "watch", "update"]
|
verbs: ["get", "list", "watch", "update"]
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["configmaps"]
|
||||||
|
verbs: ["get", "list"]
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
@ -34,21 +34,21 @@ spec:
|
|||||||
image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}"
|
image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}"
|
||||||
args:
|
args:
|
||||||
- "--v=5"
|
- "--v=5"
|
||||||
- "--csi-address=$(ADDRESS)"
|
- "--csi-address=/csi/{{ .Values.socketFile }}"
|
||||||
- "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
|
- "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.socketFile }}"
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command: ["/bin/sh", "-c", "rm -rf /registration/csi-rbdplugin /registration/csi-rbdplugin-reg.sock"]
|
||||||
env:
|
env:
|
||||||
- name: ADDRESS
|
|
||||||
value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
|
|
||||||
- name: DRIVER_REG_SOCK_PATH
|
|
||||||
value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
|
|
||||||
- name: KUBE_NODE_NAME
|
- name: KUBE_NODE_NAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
fieldPath: spec.nodeName
|
fieldPath: spec.nodeName
|
||||||
imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }}
|
imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: socket-dir
|
- name: plugin-dir
|
||||||
mountPath: {{ .Values.socketDir }}
|
mountPath: /csi
|
||||||
- name: registration-dir
|
- name: registration-dir
|
||||||
mountPath: /registration
|
mountPath: /registration
|
||||||
resources:
|
resources:
|
||||||
@ -114,10 +114,6 @@ spec:
|
|||||||
hostPath:
|
hostPath:
|
||||||
path: /var/lib/kubelet/pods
|
path: /var/lib/kubelet/pods
|
||||||
type: Directory
|
type: Directory
|
||||||
- name: socket-dir
|
|
||||||
hostPath:
|
|
||||||
path: {{ .Values.socketDir }}
|
|
||||||
type: DirectoryOrCreate
|
|
||||||
- name: host-dev
|
- name: host-dev
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /dev
|
path: /dev
|
||||||
|
@ -28,4 +28,19 @@ rules:
|
|||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["endpoints"]
|
resources: ["endpoints"]
|
||||||
verbs: ["get", "create", "update"]
|
verbs: ["get", "create", "update"]
|
||||||
|
- apiGroups: ["snapshot.storage.k8s.io"]
|
||||||
|
resources: ["volumesnapshots"]
|
||||||
|
verbs: ["get", "list", "watch", "update"]
|
||||||
|
- apiGroups: [""]
|
||||||
|
resources: ["configmaps"]
|
||||||
|
verbs: ["get", "list", "create", "delete"]
|
||||||
|
- apiGroups: ["snapshot.storage.k8s.io"]
|
||||||
|
resources: ["volumesnapshotcontents"]
|
||||||
|
verbs: ["create", "get", "list", "watch", "update", "delete"]
|
||||||
|
- apiGroups: ["snapshot.storage.k8s.io"]
|
||||||
|
resources: ["volumesnapshotclasses"]
|
||||||
|
verbs: ["get", "list", "watch"]
|
||||||
|
- apiGroups: ["apiextensions.k8s.io"]
|
||||||
|
resources: ["customresourcedefinitions"]
|
||||||
|
verbs: ["create"]
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
@ -41,6 +41,23 @@ spec:
|
|||||||
mountPath: {{ .Values.socketDir }}
|
mountPath: {{ .Values.socketDir }}
|
||||||
resources:
|
resources:
|
||||||
{{ toYaml .Values.provisioner.resources | indent 12 }}
|
{{ toYaml .Values.provisioner.resources | indent 12 }}
|
||||||
|
- name: csi-snapshotter
|
||||||
|
image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }}
|
||||||
|
imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
|
||||||
|
args:
|
||||||
|
- "--csi-address=$(ADDRESS)"
|
||||||
|
- "--connection-timeout=15s"
|
||||||
|
- "--v=5"
|
||||||
|
env:
|
||||||
|
- name: ADDRESS
|
||||||
|
value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
|
||||||
|
securityContext:
|
||||||
|
privileged: true
|
||||||
|
volumeMounts:
|
||||||
|
- name: socket-dir
|
||||||
|
mountPath: {{ .Values.socketDir }}
|
||||||
|
resources:
|
||||||
|
{{ toYaml .Values.snapshotter.resources | indent 12 }}
|
||||||
- name: csi-rbdplugin
|
- name: csi-rbdplugin
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
|
@ -12,7 +12,7 @@ serviceAccounts:
|
|||||||
create: true
|
create: true
|
||||||
name:
|
name:
|
||||||
|
|
||||||
socketDir: /var/lib/kubelet/plugins_registry/csi-rbdplugin
|
socketDir: /var/lib/kubelet/plugins/csi-rbdplugin
|
||||||
socketFile: csi.sock
|
socketFile: csi.sock
|
||||||
registrationDir: /var/lib/kubelet/plugins_registry
|
registrationDir: /var/lib/kubelet/plugins_registry
|
||||||
volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
|
volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
|
||||||
@ -24,7 +24,7 @@ attacher:
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: quay.io/k8scsi/csi-attacher
|
repository: quay.io/k8scsi/csi-attacher
|
||||||
tag: v1.0.0
|
tag: v1.0.1
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
@ -40,8 +40,8 @@ nodeplugin:
|
|||||||
|
|
||||||
registrar:
|
registrar:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/k8scsi/driver-registrar
|
repository: quay.io/k8scsi/csi-node-driver-registrar
|
||||||
tag: canary
|
tag: v1.0.2
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
@ -67,7 +67,7 @@ provisioner:
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: quay.io/k8scsi/csi-provisioner
|
repository: quay.io/k8scsi/csi-provisioner
|
||||||
tag: canary
|
tag: v1.0.1
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
@ -77,3 +77,11 @@ provisioner:
|
|||||||
tolerations: []
|
tolerations: []
|
||||||
|
|
||||||
affinity: {}
|
affinity: {}
|
||||||
|
|
||||||
|
snapshotter:
|
||||||
|
image:
|
||||||
|
repository: quay.io/k8scsi/csi-snapshotter
|
||||||
|
tag: v1.0.1
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
|
resources: {}
|
||||||
|
Loading…
Reference in New Issue
Block a user