Fix #32380: fix tests

Author: LEDfan

src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt

@@ -880,7 +880,7 @@ class MainIntegrationTest : IntegrationTestBase() {
     fun `operator should properly handle 409 conflicts by replacing the resource`() =
         setup(Mode.NAMESPACED) { namespace, shinyProxyClient, namespacedClient, stableClient, operator, reconcileListener, _ ->
             // 1. create conflicting resources
-            stableClient.load(this.javaClass.getResourceAsStream("/config/conflict.yaml")).serverSideApply()
+            stableClient.load(this.javaClass.getResourceAsStream("/configs/conflict.yaml")).serverSideApply()
 
             // 2. create a SP instance
             val spTestInstance = ShinyProxyTestInstance(

src/test/resources/configs/conflict.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sp-example-shinyproxy-cm-abfc24c726e9e87ea7c633384f2a6599352490
+  name: sp-example-shinyproxy-cm-502467f68c769f1a6a3f641603ec053e15a350
   namespace: itest
 data:
   application.yml: |
@@ -10,7 +10,7 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sp-example-shinyproxy-svc-abfc24c726e9e87ea7c633384f2a659935249
+  name: sp-example-shinyproxy-svc
   namespace: itest
 spec:
   type: ClusterIP
@@ -25,7 +25,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: sp-example-shinyproxy-ing-abfc24c726e9e87ea7c633384f2a659935249
+  name: sp-example-shinyproxy-ing
   namespace: itest
 spec:
   rules:

src/test/resources/configs/simple_config_with_patches.yaml

@@ -44,7 +44,7 @@ spec:
         failureThreshold: 1
         httpGet:
           path: /actuator/health/liveness
-          port: 9090
+          port: "9090"
           scheme: HTTP
         periodSeconds: 1
         initialDelaySeconds: 30
@@ -56,7 +56,7 @@ spec:
         failureThreshold: 1
         httpGet:
           path: /actuator/health/readiness
-          port: 9090
+          port: "9090"
           scheme: HTTP
         periodSeconds: 1
         initialDelaySeconds: 30