Skip to content

Commit cd41524

Browse files
committed
Update ShinyProxy to 3.0.0
1 parent e5fb2f9 commit cd41524

File tree

4 files changed

+39
-42
lines changed

4 files changed

+39
-42
lines changed

overlays/shinyproxy/kustomization.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ kind: Kustomization
33
namespace: shinyproxy-operator
44
resources:
55
- resources/shinyproxy-operator.namespace.yaml
6-
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced/operator?ref=develop
7-
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis?ref=develop
8-
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced/skipper-hpa?ref=develop
9-
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=develop
10-
- resources/nginx-to-skipper-ingress.ingress.yaml
6+
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.0.0
7+
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.0.0
8+
- github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.0.0
119
- resources/shinyproxy1.shinyproxy.yaml
1210
- resources/shinyproxy2.shinyproxy.yaml
1311

overlays/shinyproxy/resources/nginx-to-skipper-ingress.ingress.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ spec:
1818
redis:
1919
configure-action: none
2020
redis:
21-
host: redis
2221
password: ${REDIS_PASSWORD}
23-
database: 2
22+
sentinel:
23+
master: shinyproxy
24+
password: ${REDIS_PASSWORD}
25+
nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379
2426
proxy:
2527
usage-stats-url: micrometer
26-
operator:
27-
force-transfer: true
28+
store-mode: Redis
2829
defaultMaxInstances: -1
2930
title: Open Analytics Shiny Proxy
3031
logo-url: https://www.openanalytics.eu/shinyproxy/logo.png
@@ -77,8 +78,8 @@ spec:
7778
name: REDIS_PASSWORD
7879
valueFrom:
7980
secretKeyRef:
80-
name: redis-password
81-
key: password
81+
name: redis
82+
key: redis-password
8283
- op: add
8384
path: /spec/containers/0/resources
8485
value:
@@ -89,7 +90,17 @@ spec:
8990
- op: add
9091
path: /spec/serviceAccountName
9192
value: shinyproxy-sa
92-
image: openanalytics/shinyproxy:2.6.1
93+
kubernetesIngressPatches: |
94+
- op: add
95+
path: /metadata/annotations
96+
value:
97+
nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
98+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
99+
nginx.ingress.kubernetes.io/proxy-body-size: 300m
100+
- op: add
101+
path: /spec/ingressClassName
102+
value: nginx
103+
image: openanalytics/shinyproxy:3.0.0
93104
imagePullPolicy: Always
94105
fqdn: 'operator-demo.local'
95106
appNamespaces:

overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ spec:
1818
redis:
1919
configure-action: none
2020
redis:
21-
host: redis
2221
password: ${REDIS_PASSWORD}
22+
sentinel:
23+
master: shinyproxy
24+
password: ${REDIS_PASSWORD}
25+
nodes: redis-node-0.redis-headless:26379, redis-node-1.redis-headless:26379, redis-node-2.redis-headless:26379
2326
proxy:
2427
usage-stats-url: micrometer
25-
operator:
26-
force-transfer: true
28+
store-mode: Redis
2729
defaultMaxInstances: -1
2830
title: Open Analytics Shiny Proxy 2
2931
logo-url: https://www.openanalytics.eu/shinyproxy/logo.png
@@ -76,8 +78,8 @@ spec:
7678
name: REDIS_PASSWORD
7779
valueFrom:
7880
secretKeyRef:
79-
name: redis-password
80-
key: password
81+
name: redis
82+
key: redis-password
8183
- op: add
8284
path: /spec/containers/0/resources
8385
value:
@@ -88,6 +90,16 @@ spec:
8890
- op: add
8991
path: /spec/serviceAccountName
9092
value: shinyproxy-sa
91-
image: openanalytics/shinyproxy:2.6.1
93+
kubernetesIngressPatches: |
94+
- op: add
95+
path: /metadata/annotations
96+
value:
97+
nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
98+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
99+
nginx.ingress.kubernetes.io/proxy-body-size: 300m
100+
- op: add
101+
path: /spec/ingressClassName
102+
value: nginx
103+
image: openanalytics/shinyproxy:3.0.0
92104
imagePullPolicy: Always
93105
fqdn: operator-demo.local

0 commit comments

Comments
 (0)