Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ Committing with `git commit -s` will add the sign-off at the end of the commit m
- Joel Saß <[email protected]>
- Patrick Weiss <[email protected]>
- Conleth Kennedy <[email protected]>
- Matus Szepe <[email protected]>
16 changes: 13 additions & 3 deletions operator/templates/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@ spec:
labels:
control-plane: securecodebox-controller-manager
spec:
{{- if .Values.customCACertificate.existingCertificate }}
{{- if or .Values.customCACertificate.existingCertificate .Values.extraVolumes }}
volumes:
{{- if .Values.customCACertificate.existingCertificate }}
- name: ca-certificate
configMap:
name: {{ .Values.customCACertificate.existingCertificate }}
{{- end }}
{{- range .Values.extraVolumes }}
- {{ toYaml . | nindent 10 }}
{{- end }}
{{- end }}
serviceAccountName: {{ .Values.serviceAccount.name }}
securityContext:
Expand All @@ -38,11 +43,16 @@ spec:
args:
- --leader-elect
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.Version }}"
{{- if .Values.customCACertificate.existingCertificate }}
{{- if or .Values.customCACertificate.existingCertificate .Values.extraVolumeMounts }}
volumeMounts:
{{- if .Values.customCACertificate.existingCertificate }}
- name: ca-certificate
mountPath: /etc/ssl/certs/{{ .Values.customCACertificate.certificate }}
subPath: {{ .Values.customCACertificate.certificate }}
{{- end }}
{{- range .Values.extraVolumeMounts }}
- {{ toYaml . | nindent 14 }}
{{- end }}
{{- end }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: manager
Expand Down Expand Up @@ -90,7 +100,7 @@ spec:
value: {{ .Values.s3.bucket }}
{{- if .Values.s3.port }}
- name: S3_PORT
value: {{ .Values.s3.port }}
value: {{ .Values.s3.port | quote }}
{{- end }}
- name: S3_AUTH_TYPE
value: {{ .Values.s3.authType }}
Expand Down
26 changes: 26 additions & 0 deletions operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,32 @@ customCACertificate:
# -- key in the configmap holding the certificate(s)
certificate: "public.crt"


# -- Additional volumes to be mounted to the operator deployment
extraVolumes: [ ]
# Example:
# extraVolumes:
# - name: ssl-certificates
# secret:
# secretName: ssl-cert-secret
# - name: config-volume
# configMap:
# name: operator-config
# - name: cache-volume
# emptyDir: {}

# -- Additional volume mounts to be mounted to the operator deployment
extraVolumeMounts: [ ]
# Example:
# extraVolumeMounts:
# - name: ssl-certificates
# mountPath: /etc/ssl/certs
# readOnly: true
# - name: config-volume
# mountPath: /etc/config
# - name: cache-volume
# mountPath: /cache

serviceAccount:
# -- Name of the serviceAccount the operator uses to talk to the k8s api
name: securecodebox-operator
Expand Down
Loading