Merge pull request #15 from hammady/feature/helm3

Add support for hostPath volumes
This commit is contained in:
Matthew Beckett 2020-10-13 14:28:48 +01:00 committed by GitHub
commit 30fafc8937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 13 deletions

View File

@ -74,11 +74,7 @@ spec:
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /home/coder/project mountPath: /home/coder
subPath: project
- name: data
mountPath: /home/coder/.local/share/code-server
subPath: code-server
{{- range .Values.extraConfigmapMounts }} {{- range .Values.extraConfigmapMounts }}
- name: {{ .name }} - name: {{ .name }}
mountPath: {{ .mountPath }} mountPath: {{ .mountPath }}
@ -126,8 +122,14 @@ spec:
volumes: volumes:
- name: data - name: data
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
{{- if not .Values.persistence.hostPath }}
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.persistence.existingClaim | default (include "code-server.fullname" .) }} claimName: {{ .Values.persistence.existingClaim | default (include "code-server.fullname" .) }}
{{- else }}
hostPath:
path: {{ .Values.persistence.hostPath }}
type: Directory
{{- end -}}
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end -}} {{- end -}}
@ -139,6 +141,12 @@ spec:
{{- end }} {{- end }}
{{- range .Values.extraVolumeMounts }} {{- range .Values.extraVolumeMounts }}
- name: {{ .name }} - name: {{ .name }}
{{- if .existingClaim }}
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .existingClaim }} claimName: {{ .existingClaim }}
{{- else }}
hostPath:
path: {{ .hostPath }}
type: Directory
{{- end }}
{{- end }} {{- end }}

View File

@ -1,4 +1,4 @@
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} {{- if and (and .Values.persistence.enabled (not .Values.persistence.existingClaim)) (not .Values.persistence.hostPath) }}
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
apiVersion: v1 apiVersion: v1
metadata: metadata:

View File

@ -115,6 +115,7 @@ persistence:
size: 1Gi size: 1Gi
annotations: {} annotations: {}
# existingClaim: "" # existingClaim: ""
# hostPath: /data
serviceAccount: serviceAccount:
create: true create: true
@ -152,6 +153,7 @@ extraVolumeMounts: []
# mountPath: /mnt/volume # mountPath: /mnt/volume
# readOnly: true # readOnly: true
# existingClaim: volume-claim # existingClaim: volume-claim
# hostPath: ""
extraConfigmapMounts: [] extraConfigmapMounts: []
# - name: certs-configmap # - name: certs-configmap