Fix tests

LEDfan · LEDfan · commit d37adcf6a857 · 2026-01-05T16:47:12.000+01:00
diff --git a/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/1-namespaced/resources/shinyproxy.shinyproxy.yaml
@@ -95,6 +95,6 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
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
@@ -94,6 +94,6 @@ spec:
         - hosts:
           - shinyproxy-demo2.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo2.local
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml
@@ -100,6 +100,6 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
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
@@ -99,7 +99,7 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
   appNamespaces:
diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml
@@ -97,6 +97,6 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml
@@ -98,6 +98,6 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml
@@ -98,6 +98,6 @@ spec:
         - hosts:
           - shinyproxy-demo.local
          # secretName: example # uncomment and change this line if needed
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/helpers/DockerAssertions.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/helpers/DockerAssertions.kt
@@ -140,7 +140,7 @@ class DockerAssertions(private val base: IntegrationTestBase,
         assertEnv(mapOf(
             "PROXY_VERSION" to null,
             "PROXY_REALM_ID" to shinyProxyInstance.realmId,
-            "SPRING_CONFIG_IMPORT" to "/opt/shinyproxy/generated.yml"
+            "SPRING_CONFIG_IMPORT_0" to "/opt/shinyproxy/generated.yml"
         ), containerInfo.config().env())
     }
 
diff --git a/src/test/resources/configs/additional_fqdns.yaml b/src/test/resources/configs/additional_fqdns.yaml
@@ -6,7 +6,7 @@ spec:
   fqdn: itest.local
   additionalFqdns:
     - itest2.locals
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/affinity_required.yaml b/src/test/resources/configs/affinity_required.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   antiAffinityRequired: true
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/affinity_topologykey.yaml b/src/test/resources/configs/affinity_topologykey.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   antiAffinityTopologyKey: example.com/custom-topology-key
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/failed_to_start.yaml b/src/test/resources/configs/failed_to_start.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config.yaml b/src/test/resources/configs/simple_config.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   labels:
     some-example-label: label-value
   proxy:
diff --git a/src/test/resources/configs/simple_config_clustered.yaml b/src/test/resources/configs/simple_config_clustered.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest2.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_multiple_namespaces.yaml b/src/test/resources/configs/simple_config_multiple_namespaces.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_subpath1.yaml b/src/test/resources/configs/simple_config_subpath1.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_subpath2.yaml b/src/test/resources/configs/simple_config_subpath2.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_updated.yaml b/src/test/resources/configs/simple_config_updated.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy 2
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_updated_broken.yaml b/src/test/resources/configs/simple_config_updated_broken.yaml
@@ -7,7 +7,7 @@ spec:
     server:
       port: 9091
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy 2
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_with_ingress_patches.yaml b/src/test/resources/configs/simple_config_with_ingress_patches.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_with_patches.yaml b/src/test/resources/configs/simple_config_with_patches.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/configs/simple_config_with_service_patches.yaml b/src/test/resources/configs/simple_config_with_service_patches.yaml
@@ -4,7 +4,7 @@ metadata:
   name: example-shinyproxy
 spec:
   fqdn: itest.local
-  image: openanalytics/shinyproxy:3.2.1
+  image: openanalytics/shinyproxy:3.2.2
   proxy:
     title: Open Analytics Shiny Proxy
     logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
diff --git a/src/test/resources/docker/advanced_caddy_config1.yaml b/src/test/resources/docker/advanced_caddy_config1.yaml
@@ -5,7 +5,7 @@ fqdn: itest.local
 additionalFqdns:
   - my-fqdn1.local
   - my-fqdn2.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 caddyTlsCertFile: "#INPUT_DIR#/cert.pem"
 caddyTlsKeyFile: "#INPUT_DIR#/key.pem"
 caddyRedirects:
diff --git a/src/test/resources/docker/advanced_caddy_config2.yaml b/src/test/resources/docker/advanced_caddy_config2.yaml
@@ -5,7 +5,7 @@ fqdn: itest2.local
 additionalFqdns:
   - my-fqdn3.local
   - my-fqdn4.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 caddyRedirects:
   - from: /other-sub-path1
     to: /other-absolute-url
diff --git a/src/test/resources/docker/simple_config.yaml b/src/test/resources/docker/simple_config.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm1
diff --git a/src/test/resources/docker/simple_config_failure.yaml b/src/test/resources/docker/simple_config_failure.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm1
diff --git a/src/test/resources/docker/simple_config_input_error.yaml b/src/test/resources/docker/simple_config_input_error.yaml
@@ -2,7 +2,7 @@ spring
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm1
diff --git a/src/test/resources/docker/simple_config_none.yaml b/src/test/resources/docker/simple_config_none.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest2.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm2
diff --git a/src/test/resources/docker/simple_config_public_subpath.yaml b/src/test/resources/docker/simple_config_public_subpath.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm2
diff --git a/src/test/resources/docker/simple_config_public_subpath2.yaml b/src/test/resources/docker/simple_config_public_subpath2.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm2
diff --git a/src/test/resources/docker/simple_config_updated.yaml b/src/test/resources/docker/simple_config_updated.yaml
@@ -2,7 +2,7 @@ spring:
   session:
     store-type: redis
 fqdn: itest.local
-image: openanalytics/shinyproxy:3.2.1
+image: openanalytics/shinyproxy:3.2.2
 proxy:
   store-mode: Redis
   realm-id: realm1

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class DockerAssertions(private val base: IntegrationTestBase,`
`140`	`140`	`assertEnv(mapOf(`
`141`	`141`	`"PROXY_VERSION" to null,`
`142`	`142`	`"PROXY_REALM_ID" to shinyProxyInstance.realmId,`
`143`		`- "SPRING_CONFIG_IMPORT" to "/opt/shinyproxy/generated.yml"`
	`143`	`+ "SPRING_CONFIG_IMPORT_0" to "/opt/shinyproxy/generated.yml"`
`144`	`144`	`), containerInfo.config().env())`
`145`	`145`	`}`
`146`	`146`