Skip to content

Extra args and env #56

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

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Extra args and env #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a55eb69
linting
FrankFoerster24 Oct 13, 2023
dc4de64
add injection of extra arguments end environment to s3-operator
FrankFoerster24 Oct 13, 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
2 changes: 1 addition & 1 deletion charts/s3-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.0
version: 0.4.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
9 changes: 8 additions & 1 deletion charts/s3-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ spec:
{{- range .Values.s3.caCertificatesBase64 }}
- --s3-ca-certificate-base64={{ . }}
{{- end }}
{{- if .Values.controllerManager.manager.extraArgs }}
{{- toYaml .Values.controllerManager.manager.extraArgs | nindent 8 }}
{{- end }}
command:
- /manager
env:
Expand All @@ -74,6 +77,10 @@ spec:
{{- else }}
value: {{ .Values.s3.secretKey }}
{{- end }}
{{- range $k, $v := .Values.controllerManager.manager.extraEnv }}
- name: {{ $k }}
value: {{ $v | quote }}
{{- end }}
image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.controllerManager.manager.imagePullPolicy | default "IfNotPresent" | quote }}
livenessProbe:
Expand All @@ -96,4 +103,4 @@ spec:
securityContext:
runAsNonRoot: true
serviceAccountName: {{ include "s3-operator.fullname" . }}-controller-manager
terminationGracePeriodSeconds: 10
terminationGracePeriodSeconds: 10
4 changes: 3 additions & 1 deletion charts/s3-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ controllerManager:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
- ALL
image:
repository: inseefrlab/s3-operator
tag: latest
Expand All @@ -23,6 +23,8 @@ controllerManager:
requests:
cpu: 50m
memory: 64Mi
extraArgs: []
extraEnv: {}
replicas: 1
kubernetesClusterDomain: cluster.local

Expand Down