From 44b32263bb93c7ba3ff88928a3b408b31d233348 Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia.dekoninck@openanalytics.eu>
Date: Fri, 23 Jun 2023 13:42:04 +0200
Subject: [PATCH] Small improvements

---
 overlays/shinyproxy/kustomization.yaml                        | 2 +-
 ...ole rules.role.yaml => shinyproxy-operator-role.role.yaml} | 0
 overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml     | 4 +---
 overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml     | 4 +---
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename overlays/shinyproxy/patches/{shinyproxy-operator-role rules.role.yaml => shinyproxy-operator-role.role.yaml} (100%)

diff --git a/overlays/shinyproxy/kustomization.yaml b/overlays/shinyproxy/kustomization.yaml
index eb81864..c3500bb 100644
--- a/overlays/shinyproxy/kustomization.yaml
+++ b/overlays/shinyproxy/kustomization.yaml
@@ -10,4 +10,4 @@ resources:
   - resources/shinyproxy2.shinyproxy.yaml
 
 patchesStrategicMerge:
-  - patches/shinyproxy-operator-role rules.role.yaml
+  - patches/shinyproxy-operator-role.role.yaml
diff --git a/overlays/shinyproxy/patches/shinyproxy-operator-role rules.role.yaml b/overlays/shinyproxy/patches/shinyproxy-operator-role.role.yaml
similarity index 100%
rename from overlays/shinyproxy/patches/shinyproxy-operator-role rules.role.yaml
rename to overlays/shinyproxy/patches/shinyproxy-operator-role.role.yaml
diff --git a/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml b/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml
index c98a7d4..c6690fc 100644
--- a/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml
+++ b/overlays/shinyproxy/resources/shinyproxy1.shinyproxy.yaml
@@ -1,4 +1,4 @@
-apiVersion: openanalytics.eu/v1alpha1
+apiVersion: openanalytics.eu/v1
 kind: ShinyProxy
 metadata:
   name: shinyproxy1
@@ -15,8 +15,6 @@ spec:
   spring:
     session:
       store-type: redis
-      redis:
-        configure-action: none
     redis:
       password: ${REDIS_PASSWORD}
       sentinel:
diff --git a/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml b/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml
index 3161e59..f95631d 100644
--- a/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml
+++ b/overlays/shinyproxy/resources/shinyproxy2.shinyproxy.yaml
@@ -1,4 +1,4 @@
-apiVersion: openanalytics.eu/v1alpha1
+apiVersion: openanalytics.eu/v1
 kind: ShinyProxy
 metadata:
   name: shinyproxy2
@@ -15,8 +15,6 @@ spec:
   spring:
     session:
       store-type: redis
-      redis:
-        configure-action: none
     redis:
       password: ${REDIS_PASSWORD}
       sentinel: