From b87807f86040857622b2403dd2c90fd2409c9718 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 7 Jul 2023 09:34:09 +0200
Subject: [PATCH] Do not enforce command, should be set at Dockerfile level
---
shiny-server/Chart.yaml | 2 +-
shiny-server/templates/NOTES.txt | 3 ---
shiny-server/templates/deployment.yaml | 3 ---
shiny-server/values.yaml | 5 +----
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/shiny-server/Chart.yaml b/shiny-server/Chart.yaml
index 284b1b5..2fa0165 100644
--- a/shiny-server/Chart.yaml
+++ b/shiny-server/Chart.yaml
@@ -15,7 +15,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.4.3
+version: 0.4.4
# 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
diff --git a/shiny-server/templates/NOTES.txt b/shiny-server/templates/NOTES.txt
index 1e21372..486150d 100644
--- a/shiny-server/templates/NOTES.txt
+++ b/shiny-server/templates/NOTES.txt
@@ -14,6 +14,3 @@ Settings:
{{- if .Values.registry.private }}
- Registry is private
{{- end}}
-{{- if .Values.shinyServer.enforceCommand }}
-- Image command is overridden to "shiny-server"
-{{- end}}
diff --git a/shiny-server/templates/deployment.yaml b/shiny-server/templates/deployment.yaml
index 41551c6..06dc656 100644
--- a/shiny-server/templates/deployment.yaml
+++ b/shiny-server/templates/deployment.yaml
@@ -29,9 +29,6 @@ spec:
containers:
- name: rshiny-pod
image: {{ .Values.imageFullNameAndTag }}
- {{- if .Values.shinyServer.enforceCommand }}
- command: ["shiny-server"]
- {{- end }}
securityContext:
runAsGroup: 999
runAsUser: 999
diff --git a/shiny-server/values.yaml b/shiny-server/values.yaml
index c42f704..3d73785 100644
--- a/shiny-server/values.yaml
+++ b/shiny-server/values.yaml
@@ -31,7 +31,4 @@ ingress:
registry:
- private: false
-
-shinyServer:
- enforceCommand: true
\ No newline at end of file
+ private: false
\ No newline at end of file
--
GitLab