From a55eb69c22db544721235230873aa611c5f97f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20F=C3=B6rster?= Date: Fri, 13 Oct 2023 11:41:40 +0200 Subject: [PATCH 1/2] linting --- charts/s3-operator/templates/deployment.yaml | 2 +- charts/s3-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/s3-operator/templates/deployment.yaml b/charts/s3-operator/templates/deployment.yaml index 89972ef..ca2e3d0 100644 --- a/charts/s3-operator/templates/deployment.yaml +++ b/charts/s3-operator/templates/deployment.yaml @@ -96,4 +96,4 @@ spec: securityContext: runAsNonRoot: true serviceAccountName: {{ include "s3-operator.fullname" . }}-controller-manager - terminationGracePeriodSeconds: 10 \ No newline at end of file + terminationGracePeriodSeconds: 10 diff --git a/charts/s3-operator/values.yaml b/charts/s3-operator/values.yaml index a6d3e8b..fe58a20 100644 --- a/charts/s3-operator/values.yaml +++ b/charts/s3-operator/values.yaml @@ -10,7 +10,7 @@ controllerManager: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL image: repository: inseefrlab/s3-operator tag: latest From dc4de64cb6fc6db27ec0e16d801afb64c64e89e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20F=C3=B6rster?= Date: Fri, 13 Oct 2023 11:42:15 +0200 Subject: [PATCH 2/2] add injection of extra arguments end environment to s3-operator --- charts/s3-operator/Chart.yaml | 2 +- charts/s3-operator/templates/deployment.yaml | 7 +++++++ charts/s3-operator/values.yaml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/s3-operator/Chart.yaml b/charts/s3-operator/Chart.yaml index 2171653..e078d75 100644 --- a/charts/s3-operator/Chart.yaml +++ b/charts/s3-operator/Chart.yaml @@ -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. diff --git a/charts/s3-operator/templates/deployment.yaml b/charts/s3-operator/templates/deployment.yaml index ca2e3d0..8aa4179 100644 --- a/charts/s3-operator/templates/deployment.yaml +++ b/charts/s3-operator/templates/deployment.yaml @@ -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: @@ -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: diff --git a/charts/s3-operator/values.yaml b/charts/s3-operator/values.yaml index fe58a20..a6414cf 100644 --- a/charts/s3-operator/values.yaml +++ b/charts/s3-operator/values.yaml @@ -23,6 +23,8 @@ controllerManager: requests: cpu: 50m memory: 64Mi + extraArgs: [] + extraEnv: {} replicas: 1 kubernetesClusterDomain: cluster.local