From f19e5163887e5b43e6abebb6947566bf141ea422 Mon Sep 17 00:00:00 2001 From: Tobia De Koninck Date: Tue, 7 May 2024 12:11:44 +0200 Subject: [PATCH] Fix examples --- .../resources/shinyproxy.shinyproxy.yaml | 11 ++++++----- .../resources/shinyproxy.shinyproxy.yaml | 15 ++++++++------- .../resources/shinyproxy.shinyproxy.yaml | 15 ++++++++------- .../resources/shinyproxy.shinyproxy.yaml | 15 ++++++++------- .../resources/shinyproxy1.shinyproxy.yaml | 15 ++++++++------- .../resources/shinyproxy2.shinyproxy.yaml | 17 +++++++++-------- .../resources/shinyproxy3.shinyproxy.yaml | 17 +++++++++-------- 7 files changed, 56 insertions(+), 49 deletions(-) diff --git a/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml index 3b67397..6d3687a 100644 --- a/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml +++ b/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml @@ -11,12 +11,13 @@ spec: spring: session: store-type: redis - redis: - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml index 333db03..01ed78b 100644 --- a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml +++ b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml @@ -10,12 +10,13 @@ spec: spring: session: store-type: redis - redis: - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless.redis:26379, redis-node-1.redis-headless.redis:26379, redis-node-2.redis-headless.redis:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless.redis:26379, redis-node-1.redis-headless.redis:26379, redis-node-2.redis-headless.redis:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -42,11 +43,11 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [scientists, mathematicians] - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio diff --git a/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml index 62c60d3..db0dd12 100644 --- a/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml +++ b/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml @@ -10,12 +10,13 @@ spec: spring: session: store-type: redis - redis: - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless.redis:26379, redis-node-1.redis-headless.redis:26379, redis-node-2.redis-headless.redis:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless.redis:26379, redis-node-1.redis-headless.redis:26379, redis-node-2.redis-headless.redis:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -42,11 +43,11 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [scientists, mathematicians] - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio diff --git a/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml index 5a36bd5..4f5d266 100644 --- a/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml +++ b/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml @@ -11,12 +11,13 @@ spec: spring: session: store-type: redis - redis: - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -43,7 +44,7 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [ scientists, mathematicians ] kubernetes-pod-patches: | - op: replace @@ -51,7 +52,7 @@ spec: value: my-namespace - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml index 72e513b..4cae4e5 100644 --- a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml +++ b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml @@ -13,12 +13,13 @@ spec: spring: session: store-type: redis - redis: - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -45,11 +46,11 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [scientists, mathematicians] - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml index 659692a..4010f9b 100644 --- a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml +++ b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml @@ -13,13 +13,14 @@ spec: spring: session: store-type: redis - redis: - host: redis - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: + host: redis password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -46,11 +47,11 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [scientists, mathematicians] - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml index c9489f1..3f6ef7a 100644 --- a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml +++ b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml @@ -13,13 +13,14 @@ spec: spring: session: store-type: redis - redis: - host: redis - password: ${REDIS_PASSWORD} - sentinel: - master: shinyproxy + data: + redis: + host: redis password: ${REDIS_PASSWORD} - nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 + sentinel: + master: shinyproxy + password: ${REDIS_PASSWORD} + nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379 proxy: store-mode: Redis stop-proxies-on-shutdown: false @@ -46,11 +47,11 @@ spec: display-name: Hello Application description: Application which demonstrates the basics of a Shiny app container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: [scientists, mathematicians] - id: 06_tabsets container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"] - container-image: openanalytics/shinyproxy-integration-test-app + container-image: openanalytics/shinyproxy-demo access-groups: scientists - id: rstudio displayName: RStudio