diff --git a/helm/crabserver/Chart.yaml b/helm/crabserver/Chart.yaml index d9953e1c2..bc73336f5 100644 --- a/helm/crabserver/Chart.yaml +++ b/helm/crabserver/Chart.yaml @@ -15,9 +15,9 @@ 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.1.9 +version: 0.1.10 # 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. -appVersion: "v3.240219.1" +appVersion: "v3.240530" diff --git a/helm/crabserver/templates/configMap.yaml b/helm/crabserver/templates/configMap.yaml index eb872dd1e..102f53ea3 100644 --- a/helm/crabserver/templates/configMap.yaml +++ b/helm/crabserver/templates/configMap.yaml @@ -12,7 +12,11 @@ data: echo 'INFO Files in /etc/grid-security' ls -lahZ /etc/grid-security #su -c "cd /data && /data/run.sh" --preserve-environment _crabserver - cd /data && /data/run.sh + if command -v tini &> /dev/null; then + /data/entrypoint.sh /data/run.sh + else + cd /data && /data/run.sh + fi --- apiVersion: v1 kind: ConfigMap diff --git a/helm/crabserver/values-test12-pypi.yaml b/helm/crabserver/values-test12-pypi.yaml deleted file mode 100644 index f217ec234..000000000 --- a/helm/crabserver/values-test12-pypi.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -environment: "test" - -image: - path: registry.cern.ch/cmscrab/crabserver - pullPolicy: IfNotPresent - tag: "pypi-devthree-1715075269" - command: - - /data/entrypoint.sh - args: - - /bin/bash - - -c - - | - sudo cp /host/etc/grid-security/* /etc/grid-security \ - && echo 'INFO Files in /etc/grid-security' \ - && ls -lahZ /etc/grid-security \ - && /data/run.sh - -# disable liveness/readiness -# https://helm.sh/docs/chart_template_guide/values_files/#deleting-a-default-key -livenessProbePreProd: null -readinessProbePreProd: null -livenessProbeTest: null -readinessProbeTest: null -livenessProbe: null -readinessProbe: null