Fix examples

openanalytics · May 7, 2024 · f19e516 · f19e516
1 parent 912b002
commit f19e516
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,15 +44,15 @@ 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
             path: /metadata/namespace
             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
@@ -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
@@ -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
@@ -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