Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added create configmap for custom CA #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added create configmap for custom CA #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deploy/helm/csi-s3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ The following table lists all configuration parameters and their default values.
| `tolerations.all` | Tolerate all taints by the CSI-S3 node driver (mounter) | false |
| `tolerations.node` | Custom tolerations for the CSI-S3 node driver (mounter) | [] |
| `tolerations.controller` | Custom tolerations for the CSI-S3 controller (provisioner) | [] |
| `ca.create` | Create configmap for custom CA cert | false |
| `ca.name` | Configmap name for custom CA cert | ca-custom-pemstore |
| `ca.path` | Configmap path for custom CA cert | ca-custom-cert.pem |
| `ca.certificate` | Configmap string data CA | |
10 changes: 10 additions & 0 deletions deploy/helm/csi-s3/templates/ca-config-map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{{- if .Values.ca.create }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.ca.name }}
namespace: {{ .Release.Namespace }}
data:
{{ .Values.ca.path }}: |-
{{ .Values.ca.certificate | nindent 4 }}
{{- end }}
17 changes: 17 additions & 0 deletions deploy/helm/csi-s3/templates/csi-s3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ spec:
mountPath: /csi
- name: registration-dir
mountPath: /registration/
{{- if and .Values.ca.create .Values.ca.name .Values.ca.path }}
- name: {{ .Values.ca.name}}
mountPath: /etc/ssl/certs/{{ .Values.ca.path }}
subPath: {{ .Values.ca.path }}
readOnly: false
{{- end }}
- name: csi-s3
securityContext:
privileged: true
Expand Down Expand Up @@ -103,6 +109,12 @@ spec:
mountPath: /dev/fuse
- name: systemd-control
mountPath: /run/systemd
{{- if and .Values.ca.create .Values.ca.name .Values.ca.path }}
- name: {{ .Values.ca.name}}
mountPath: /etc/ssl/certs/{{ .Values.ca.path }}
subPath: {{ .Values.ca.path }}
readOnly: false
{{- end }}
volumes:
- name: registration-dir
hostPath:
Expand All @@ -127,3 +139,8 @@ spec:
hostPath:
path: /run/systemd
type: DirectoryOrCreate
{{- if and .Values.ca.create .Values.ca.name }}
- name: {{ .Values.ca.name }}
configMap:
name: {{ .Values.ca.name }}
{{- end }}
17 changes: 17 additions & 0 deletions deploy/helm/csi-s3/templates/provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ spec:
volumeMounts:
- name: socket-dir
mountPath: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi
{{- if and .Values.ca.create .Values.ca.name .Values.ca.path }}
- name: {{ .Values.ca.name}}
mountPath: /etc/ssl/certs/{{ .Values.ca.path }}
subPath: {{ .Values.ca.path }}
readOnly: false
{{- end }}
- name: csi-s3
image: {{ .Values.images.csi }}
imagePullPolicy: IfNotPresent
Expand All @@ -111,6 +117,17 @@ spec:
volumeMounts:
- name: socket-dir
mountPath: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi
{{- if and .Values.ca.create .Values.ca.name .Values.ca.path }}
- name: {{ .Values.ca.name}}
mountPath: /etc/ssl/certs/{{ .Values.ca.path }}
subPath: {{ .Values.ca.path }}
readOnly: false
{{- end }}
volumes:
- name: socket-dir
emptyDir: {}
{{- if and .Values.ca.create .Values.ca.name }}
- name: {{ .Values.ca.name }}
configMap:
name: {{ .Values.ca.name }}
{{- end }}
9 changes: 9 additions & 0 deletions deploy/helm/csi-s3/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,12 @@ tolerations:
nodeSelector: {}

kubeletPath: /var/lib/kubelet

ca:
create: false
name: ca-custom-pemstore
path: ca-custom-cert.pem
certificate: "" #|
# -----BEGIN CERTIFICATE-----
# ...
# -----END CERTIFICATE-----