Skip to content

Update deployment.yaml #65

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

Open
dberardo-com wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Update deployment.yaml #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f2b3a36
Update deployment.yaml
dberardo-com Dec 20, 2023
304ed6a
Merge pull request #1 from dberardo-com/dberardo-com-patch-1
dberardo-com Dec 20, 2023
218bd13
Update deployment.yaml
dberardo-com Dec 20, 2023
471132a
Update values.yaml
dberardo-com Dec 20, 2023
339d59b
Update values.yaml
dberardo-com Dec 20, 2023
d185af6
Update deployment.yaml
dberardo-com Dec 20, 2023
e5b4511
Update deployment.yaml
dberardo-com Dec 20, 2023
747aee9
depl
Dec 20, 2023
089dca5
Merge branch 'master' of https://github.com/dberardo-com/helm-charts-…
Dec 20, 2023
5dafbd4
fix in cert path
Dec 20, 2023
f8c7adf
fix in deployment
Dec 20, 2023
60d0303
fix in deployment
Dec 20, 2023
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
21 changes: 18 additions & 3 deletions charts/s3-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ spec:
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.s3.mountCertsFromSecret }}
volumes:
- name: ca-certs
secret:
secretName: "{{.Values.s3.mountCertsFromSecret}}"
{{- end }}
containers:
- args:
- --health-probe-bind-address=:8081
Expand All @@ -45,11 +51,20 @@ spec:
{{- if .Values.s3.caCertificateBundlePath }}
- --s3-ca-certificate-bundle-path={{ .Values.s3.caCertificateBundlePath }}
{{- end }}
{{- if .Values.s3.disableTls }}
- --useSsl=false
{{- end }}
{{- range .Values.s3.caCertificatesBase64 }}
- --s3-ca-certificate-base64={{ . }}
{{- end }}
command:
- /manager
{{- if .Values.s3.mountCertsFromSecret }}
volumeMounts:
- name: ca-certs
mountPath: "{{.Values.s3.caCertificateBundlePath}}"
subPath: {{.Values.s3.mountCertsFromSecretKey | default "public.crt" }}
{{- end }}
env:
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ quote .Values.kubernetesClusterDomain }}
Expand All @@ -58,7 +73,7 @@ spec:
valueFrom:
secretKeyRef:
name: {{ .Values.s3.existingSecret }}
key: S3_ACCESS_KEY
key: {{ .Values.s3.accessKeyName }}
{{- else }}
value: {{ .Values.s3.accessKey }}
{{- end }}
Expand All @@ -67,7 +82,7 @@ spec:
valueFrom:
secretKeyRef:
name: {{ .Values.s3.existingSecret }}
key: S3_SECRET_KEY
key: {{ .Values.s3.secretKeyName }}
{{- else }}
value: {{ .Values.s3.secretKey }}
{{- end }}
Expand All @@ -93,4 +108,4 @@ spec:
securityContext:
runAsNonRoot: true
serviceAccountName: {{ include "s3-operator.fullname" . }}-controller-manager
terminationGracePeriodSeconds: 10
terminationGracePeriodSeconds: 10
5 changes: 5 additions & 0 deletions charts/s3-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ controllerManager:
kubernetesClusterDomain: cluster.local
s3:
endpointUrl: "localhost:9000"
disableTls: false
# mountCertsFromSecret:
# mountCertsFromSecretKey
accessKeyName: S3_ACCESS_KEY
secretKeyName: S3_SECRET_KEY

# To manage access/secret keys, two options :
# - (Poor) Directly set them using the accessKey/secretKey parameters below.
Expand Down