diff --git a/images/Dockerfile b/images/Dockerfile index 12d939c..6174a27 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11-jre -ARG SHINYPROXY_VERSION=2.4.3 +ARG SHINYPROXY_VERSION=2.5.0 RUN useradd -s /bin/bash shiny RUN mkdir -p /opt/shinyproxy/ && chown shiny /opt/shinyproxy diff --git a/shinyproxy/Chart.yaml b/shinyproxy/Chart.yaml index ee00d5c..5a67160 100644 --- a/shinyproxy/Chart.yaml +++ b/shinyproxy/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: shinyproxy description: A Helm chart to install Shinyproxy type: application -version: 0.4.5 -appVersion: 2.4.3 +version: 0.4.6 +appVersion: 2.5.0 diff --git a/shinyproxy/templates/configmap.yaml b/shinyproxy/templates/configmap.yaml index 7cc92cf..2d1dd94 100644 --- a/shinyproxy/templates/configmap.yaml +++ b/shinyproxy/templates/configmap.yaml @@ -5,7 +5,7 @@ metadata: labels: {{- include "shinyproxy.labels" . | nindent 4 }} data: -{{- $values := pick .Values "proxy" "logging" }} +{{- $values := pick .Values "proxy" "logging" "management" }} {{- $_ := set $values "proxy" (omit $values.proxy "image" "annotations" "labels" "nodeSelector" "resources" "service" "ldap" "kerberos" "keycloak" "openid" "saml" "social" "users") }} {{- range .Values.proxy.specs }} {{- if not (index . "container-memory-request") }} diff --git a/shinyproxy/templates/deployment.yaml b/shinyproxy/templates/deployment.yaml index 2d06b29..a7a9b02 100644 --- a/shinyproxy/templates/deployment.yaml +++ b/shinyproxy/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: readinessProbe: httpGet: path: /actuator/health/readiness - port: 8080 + port: 9090 periodSeconds: 20 initialDelaySeconds: 40 timeoutSeconds: 5 @@ -58,7 +58,7 @@ spec: livenessProbe: httpGet: path: /actuator/health/liveness - port: 8080 + port: 9090 periodSeconds: 20 initialDelaySeconds: 40 timeoutSeconds: 5 diff --git a/shinyproxy/values.yaml b/shinyproxy/values.yaml index 5bae35b..2870f64 100644 --- a/shinyproxy/values.yaml +++ b/shinyproxy/values.yaml @@ -31,7 +31,7 @@ proxy: # proxy.image -- ShinyProxy Docker image to use image: name: remche/shinyproxy - tag: 2.4.3 + tag: 2.5.0 # proxy.labels -- ShinyProxy deployment labels labels: {} # proxy.annotations -- ShinyProxy deployment annotations