Merge branch 'release/2.3.1'

LEDfan · LEDfan · commit c1799bf10392 · 2025-11-12T15:45:17.000+01:00
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -30,9 +30,9 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.13.1
+        uses: manusa/actions-setup-minikube@v2.14.0
         with:
-          minikube version: 'v1.33.0'
+          minikube version: 'v1.37.0'
           kubernetes version:  ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
           container runtime: containerd
diff --git a/docs/deployment/bases/clustered/resources/shinyproxy-operator.deployment.yaml b/docs/deployment/bases/clustered/resources/shinyproxy-operator.deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: shinyproxy-operator
-          image: openanalytics/shinyproxy-operator:2.3.0
+          image: openanalytics/shinyproxy-operator:2.3.1
           imagePullPolicy: Always
           env:
             - name: SPO_MODE
diff --git a/docs/deployment/bases/namespaced/resources/shinyproxy-operator.deployment.yaml b/docs/deployment/bases/namespaced/resources/shinyproxy-operator.deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: shinyproxy-operator
-          image: openanalytics/shinyproxy-operator:2.3.0
+          image: openanalytics/shinyproxy-operator:2.3.1
           imagePullPolicy: Always
           env:
             - name: SPO_MODE
diff --git a/docs/deployment/overlays/1-namespaced/kustomization.yaml b/docs/deployment/overlays/1-namespaced/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy.shinyproxy.yaml
 
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.0
+  image: openanalytics/shinyproxy:3.2.1
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/docs/deployment/overlays/2-clustered/redis/kustomization.yaml b/docs/deployment/overlays/2-clustered/redis/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: redis
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.1
   - resources/redis.namespace.yaml
 
 patches:
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: shinyproxy-dept2
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.1
   - resources/redis.secret.yaml
   - resources/shinyproxy.shinyproxy.yaml
   - resources/shinyproxy.namespace.yaml
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.0
+  image: openanalytics/shinyproxy:3.2.1
   imagePullPolicy: Always
   fqdn: shinyproxy-demo2.local
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-operator/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-operator/kustomization.yaml
@@ -3,5 +3,5 @@ kind: Kustomization
 namespace: shinyproxy-operator
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/clustered?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/clustered?ref=v2.3.1
   - resources/shinyproxy-operator.namespace.yaml
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.1
   - resources/redis.secret.yaml
   - resources/shinyproxy.shinyproxy.yaml
   - resources/shinyproxy.namespace.yaml
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.0
+  image: openanalytics/shinyproxy:3.2.1
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/kustomization.yaml b/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy.shinyproxy.yaml
 
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.0
+  image: openanalytics/shinyproxy:3.2.1
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
   appNamespaces:
diff --git a/docs/deployment/overlays/4-namespaced-multi/kustomization.yaml b/docs/deployment/overlays/4-namespaced-multi/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.3.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.3.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy1.shinyproxy.yaml
   - resources/shinyproxy2.shinyproxy.yaml
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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   imagePullPolicy: Always
   fqdn: shinyproxy-demo.local
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>eu.openanalytics</groupId>
     <artifactId>shinyproxy-operator</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <inceptionYear>2021</inceptionYear>
     <name>ShinyProxy-Operator</name>
 
@@ -32,7 +32,7 @@
         <log4j.version>2.24.3</log4j.version>
         <okhttp.version>4.12.0</okhttp.version>
         <fabric8.client.version>7.1.0</fabric8.client.version>
-        <docker.client.version>7.0.8-OA-4</docker.client.version>
+        <docker.client.version>7.0.8-OA-5</docker.client.version>
         <jersey.version>3.1.10</jersey.version>
         <apache.commons.lang3>3.17.0</apache.commons.lang3>
         <!-- Plugin versions -->
@@ -66,6 +66,12 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <!-- Used for our own docker client version. -->
+            <id>oa-nexus-snapshots</id>
+            <name>OpenAnalytics Snapshots Repository</name>
+            <url>https://nexus.openanalytics.eu/repository/snapshots</url>
+        </repository>
         <repository>
             <!-- Used for our own docker client version. -->
             <id>oa-nexus-releases</id>
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/AwaitableEvenController.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/AwaitableEvenController.kt
@@ -22,11 +22,14 @@ package eu.openanalytics.shinyproxyoperator.helpers
 
 import eu.openanalytics.shinyproxyoperator.IEventController
 import eu.openanalytics.shinyproxyoperator.model.ShinyProxyInstance
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.CompletableDeferred
 
 
 class AwaitableEvenController : IEventController {
 
+    private val logger = KotlinLogging.logger {  }
+
     private val listeners = Listener<String>()
     private val deleteListeners = Listener<Unit>()
     private val newInstanceListeners = Listener<ShinyProxyInstance>()
@@ -42,11 +45,13 @@ class AwaitableEvenController : IEventController {
     }
 
     suspend fun waitForNewInstance(hash: String, revision: Int = 0): ShinyProxyInstance {
+        logger.info { "--> waiting for NewInstance: hash: $hash, revision: $revision" }
         return newInstanceListeners.add(hash, revision).awaitWithTimeout()
     }
 
     override fun createNewInstanceEvent(shinyProxyInstance: ShinyProxyInstance) {
         delegate.createNewInstanceEvent(shinyProxyInstance)
+        logger.info { "<-- event NewInstance: hash: ${shinyProxyInstance.hashOfSpec}, revision: ${shinyProxyInstance.revision}" }
         newInstanceListeners.complete(shinyProxyInstance, shinyProxyInstance)
     }
 
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/MainIntegrationTest.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/MainIntegrationTest.kt
@@ -28,14 +28,12 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 import org.junit.jupiter.api.Assertions.assertNull
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
-import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
@@ -360,6 +358,7 @@ class MainIntegrationTest : IntegrationTestBase() {
         val operator2 = DockerOperator(config, eventController, recyclableChecker)
         eventController.setDelegate(EventController(operator2.orchestrator))
         scope.launch {
+            delay(5_000) // wait with starting operator, until event listener is created
             eventController.setDelegate(EventController(operator2.orchestrator))
             operator2.init()
             operator2.run()
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/MainIntegrationTest.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/MainIntegrationTest.kt
@@ -166,7 +166,7 @@ class MainIntegrationTest : IntegrationTestBase() {
             // 4. assert correctness
             spTestInstance.assertInstanceIsCorrect()
 
-            // wait for additionale reconcile to complete
+            // wait for additional reconcile to complete
             eventController.waitForNextReconcile(spTestInstance.hash)
 
             // 5. Delete Replicaset -> reconcile -> assert it is still ok
@@ -178,23 +178,17 @@ class MainIntegrationTest : IntegrationTestBase() {
                 }
             }
             logger.info { "ReplicaSet was deleted" }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting RS" }
 
-            withTimeout(10_000) {
-                while (stableClient.apps().replicaSets().withName(replicaSetName)?.get()?.status?.readyReplicas != 1) {
-                    delay(100)
-                }
-            }
-
             spTestInstance.assertInstanceIsCorrect()
 
             // 6. Delete ConfigMap -> reconcile -> assert it is still ok
             executeAsyncAfter100ms {
                 getAndDelete(stableClient.configMaps().withName("sp-${sp.name}-cm-${spTestInstance.hash}".take(63)))
                 logger.info { "Deleted ConfigMap" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting CM" }
             spTestInstance.assertInstanceIsCorrect()
 
@@ -203,7 +197,7 @@ class MainIntegrationTest : IntegrationTestBase() {
                 getAndDelete(stableClient.services().withName("sp-${sp.name}-svc".take(63)))
                 logger.info { "Deleted Service" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting SVC" }
             spTestInstance.assertInstanceIsCorrect()
 
@@ -212,7 +206,7 @@ class MainIntegrationTest : IntegrationTestBase() {
                 getAndDelete(stableClient.network().v1().ingresses().withName("sp-${sp.name}-ing".take(63)))
                 logger.info { "Deleted Ingress" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             spTestInstance.assertInstanceIsCorrect()
             logger.info { "Reconciled after deleting Ingress" }
         }
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/helpers/IntegrationTestBase.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/helpers/IntegrationTestBase.kt
@@ -234,4 +234,18 @@ abstract class IntegrationTestBase {
         resource.delete()
     }
 
+    protected suspend fun waitForNextReconcileAndReady(stableClient: NamespacedKubernetesClient, sp: ShinyProxy, spTestInstance: ShinyProxyTestInstance, eventController: AwaitableEvenController) {
+        eventController.waitForNextReconcile(spTestInstance.hash)
+        for (i in 0..2) {
+            val replicaSetName = "sp-${sp.name}-rs-0-${spTestInstance.hash}".take(63)
+            if (stableClient.apps().replicaSets().withName(replicaSetName)?.get()?.status?.readyReplicas == 1
+                && stableClient.configMaps().withName("sp-${sp.name}-cm-${spTestInstance.hash}".take(63)).get() != null
+                && stableClient.services().withName("sp-${sp.name}-svc".take(63)) != null
+                && stableClient.network().v1().ingresses().withName("sp-${sp.name}-ing".take(63)).get() != null) {
+                return
+            }
+            eventController.waitForNextReconcile(spTestInstance.hash)
+        }
+    }
+
 }
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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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/conflict.yaml b/src/test/resources/configs/conflict.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sp-example-shinyproxy-cm-731bfcbdfc78f220025ed5b1ee40a74cdf4581
+  name: sp-example-shinyproxy-cm-1e6e918b7c1346f00016ec33628704a71bbce6
   namespace: itest
 data:
   application.yml: |
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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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.0
+  image: openanalytics/shinyproxy:3.2.1
   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
diff --git a/src/test/resources/configs/simple_config_updated.yaml b/src/test/resources/configs/simple_config_updated.yaml
diff --git a/src/test/resources/configs/simple_config_updated_broken.yaml b/src/test/resources/configs/simple_config_updated_broken.yaml
diff --git a/src/test/resources/configs/simple_config_with_ingress_patches.yaml b/src/test/resources/configs/simple_config_with_ingress_patches.yaml
diff --git a/src/test/resources/configs/simple_config_with_patches.yaml b/src/test/resources/configs/simple_config_with_patches.yaml
diff --git a/src/test/resources/configs/simple_config_with_service_patches.yaml b/src/test/resources/configs/simple_config_with_service_patches.yaml
diff --git a/src/test/resources/docker/advanced_caddy_config1.yaml b/src/test/resources/docker/advanced_caddy_config1.yaml
diff --git a/src/test/resources/docker/advanced_caddy_config2.yaml b/src/test/resources/docker/advanced_caddy_config2.yaml
diff --git a/src/test/resources/docker/simple_config.yaml b/src/test/resources/docker/simple_config.yaml
diff --git a/src/test/resources/docker/simple_config_failure.yaml b/src/test/resources/docker/simple_config_failure.yaml
diff --git a/src/test/resources/docker/simple_config_input_error.yaml b/src/test/resources/docker/simple_config_input_error.yaml
diff --git a/src/test/resources/docker/simple_config_none.yaml b/src/test/resources/docker/simple_config_none.yaml
diff --git a/src/test/resources/docker/simple_config_public_subpath.yaml b/src/test/resources/docker/simple_config_public_subpath.yaml
diff --git a/src/test/resources/docker/simple_config_public_subpath2.yaml b/src/test/resources/docker/simple_config_public_subpath2.yaml
diff --git a/src/test/resources/docker/simple_config_updated.yaml b/src/test/resources/docker/simple_config_updated.yaml
