From 96d9fb38b027daec38854d6892b16bfdc3dec2ff Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Fri, 8 Sep 2023 14:42:29 +0200 Subject: [PATCH] cleanup(rsyncd) defer default command to container image (#688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cleanup(rsyncd) defer default command to container image Signed-off-by: Damien Duportal * bump chart version --------- Signed-off-by: Damien Duportal Co-authored-by: Hervé Le Meur <91831478+lemeurherve@users.noreply.github.com> --- charts/rsyncd/Chart.yaml | 2 +- charts/rsyncd/templates/deployment.yaml | 2 -- charts/rsyncd/tests/defaults_test.yaml | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/rsyncd/Chart.yaml b/charts/rsyncd/Chart.yaml index 6cd652bf7..bb988c21a 100644 --- a/charts/rsyncd/Chart.yaml +++ b/charts/rsyncd/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 description: rsyncd helm chart for Kubernetes name: rsyncd -version: 1.1.1 +version: 1.1.2 diff --git a/charts/rsyncd/templates/deployment.yaml b/charts/rsyncd/templates/deployment.yaml index 223ee7357..7af0dfa48 100644 --- a/charts/rsyncd/templates/deployment.yaml +++ b/charts/rsyncd/templates/deployment.yaml @@ -29,8 +29,6 @@ spec: - name: rsyncd image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["/bin/tini","--"] - args: ["/usr/bin/rsync", "--verbose", "--no-detach","--daemon","--config","/etc/rsyncd.conf"] {{- with .Values.containerSecurityContext }} securityContext: {{- toYaml . | nindent 12 }} diff --git a/charts/rsyncd/tests/defaults_test.yaml b/charts/rsyncd/tests/defaults_test.yaml index dcbda9c78..2eeb65c10 100644 --- a/charts/rsyncd/tests/defaults_test.yaml +++ b/charts/rsyncd/tests/defaults_test.yaml @@ -77,6 +77,11 @@ tests: path: spec.template.spec.containers[0].volumeMounts[3] - notExists: path: spec.template.spec.volumes[2] + # No custom entrypoint/command by default + - notExists: + path: spec.template.spec.containers[0].command + - notExists: + path: spec.template.spec.containers[0].args - it: should create a default rsyncd-conf config map template: configmap.rsyncd-conf.yaml asserts: