Update ShinyProxy to 3.0.0

openanalytics · Mar 20, 2023 · cd41524 · cd41524
1 parent e5fb2f9
commit cd41524
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 42 deletions.
diff --git a/overlays/shinyproxy/kustomization.yaml b/overlays/shinyproxy/kustomization.yaml
@@ -3,11 +3,9 @@ kind: Kustomization
 namespace: shinyproxy-operator
 resources:
   - resources/shinyproxy-operator.namespace.yaml
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced/operator?ref=develop
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis?ref=develop
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced/skipper-hpa?ref=develop
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=develop
-  - resources/nginx-to-skipper-ingress.ingress.yaml
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.0.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.0.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.0.0
   - resources/shinyproxy1.shinyproxy.yaml
   - resources/shinyproxy2.shinyproxy.yaml
 

diff --git a/overlays/shinyproxy/resources/nginx-to-skipper-ingress.ingress.yaml b/overlays/shinyproxy/resources/nginx-to-skipper-ingress.ingress.yaml
diff --git a/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml b/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml
@@ -18,13 +18,14 @@ spec:
       redis:
         configure-action: none
     redis:
-      host: redis
       password: ${REDIS_PASSWORD}
-      database: 2
+      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:
     usage-stats-url: micrometer
-    operator:
-      force-transfer: true
+    store-mode: Redis
     defaultMaxInstances: -1
     title: Open Analytics Shiny Proxy
     logo-url: https://www.openanalytics.eu/shinyproxy/logo.png
@@ -77,8 +78,8 @@ spec:
         name: REDIS_PASSWORD
         valueFrom:
           secretKeyRef:
-            name: redis-password
-            key: password
+            name: redis
+            key: redis-password
     - op: add
       path: /spec/containers/0/resources
       value:
@@ -89,7 +90,17 @@ spec:
     - op: add
       path: /spec/serviceAccountName
       value: shinyproxy-sa
-  image: openanalytics/shinyproxy:2.6.1
+  kubernetesIngressPatches: |
+    - op: add
+      path: /metadata/annotations
+      value:
+        nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
+        nginx.ingress.kubernetes.io/ssl-redirect: "true"
+        nginx.ingress.kubernetes.io/proxy-body-size: 300m
+    - op: add
+      path: /spec/ingressClassName
+      value: nginx
+  image: openanalytics/shinyproxy:3.0.0
   imagePullPolicy: Always
   fqdn: 'operator-demo.local'
   appNamespaces:

diff --git a/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml b/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml
@@ -18,12 +18,14 @@ spec:
       redis:
         configure-action: none
     redis:
-      host: redis
       password: ${REDIS_PASSWORD}
+      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:
     usage-stats-url: micrometer
-    operator:
-      force-transfer: true
+    store-mode: Redis
     defaultMaxInstances: -1
     title: Open Analytics Shiny Proxy 2
     logo-url: https://www.openanalytics.eu/shinyproxy/logo.png
@@ -76,8 +78,8 @@ spec:
         name: REDIS_PASSWORD
         valueFrom:
           secretKeyRef:
-            name: redis-password
-            key: password
+            name: redis
+            key: redis-password
     - op: add
       path: /spec/containers/0/resources
       value:
@@ -88,6 +90,16 @@ spec:
     - op: add
       path: /spec/serviceAccountName
       value: shinyproxy-sa
-  image: openanalytics/shinyproxy:2.6.1
+  kubernetesIngressPatches: |
+    - op: add
+      path: /metadata/annotations
+      value:
+        nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
+        nginx.ingress.kubernetes.io/ssl-redirect: "true"
+        nginx.ingress.kubernetes.io/proxy-body-size: 300m
+    - op: add
+      path: /spec/ingressClassName
+      value: nginx
+  image: openanalytics/shinyproxy:3.0.0
   imagePullPolicy: Always
   fqdn: operator-demo.local