Ref #26984: Use ingressClassName instead of annotation

Author: LEDfan

.gitignore

@@ -228,3 +228,4 @@ buildNumber.properties
 .project
 
 docs/deployment/overlays/0-dev/**
+build.sh

src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressFactory.kt

@@ -56,7 +56,6 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
 
         val annotations = if (isLatest) {
             mapOf(
-                "kubernetes.io/ingress.class" to "skipper",
                 "zalando.org/skipper-predicate" to "True()",
                 "zalando.org/skipper-filter" to
                     """setRequestHeader("X-ShinyProxy-Instance", "$hashOfSpec")""" +
@@ -70,7 +69,6 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
             )
         } else {
             mapOf(
-                "kubernetes.io/ingress.class" to "skipper",
                 "zalando.org/skipper-predicate" to """True() && Cookie("sp-instance", "$hashOfSpec")""",
                 "zalando.org/skipper-filter" to
                     """setRequestHeader("X-ShinyProxy-Instance", "$hashOfSpec")""" +
@@ -105,6 +103,7 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
                             .addToPaths(createPathV1(shinyProxy, shinyProxyInstance))
                         .endHttp()
                     .endRule()
+                    .withIngressClassName("skipper")
                 .endSpec()
                 .build()
         //@formatter:on

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

@@ -684,8 +684,9 @@ class MainIntegrationTest : IntegrationTestBase() {
             ingress.metadata.ownerReferences[0].name
         )
 
+        assertEquals(ingress.spec.ingressClassName, "skipper")
+
         assertEquals(mapOf(
-            "kubernetes.io/ingress.class" to "skipper",
             "zalando.org/skipper-predicate" to "True()",
             "zalando.org/skipper-filter" to
                 """setRequestHeader("X-ShinyProxy-Instance", "${sp.hashOfCurrentSpec}")""" +
@@ -757,8 +758,9 @@ class MainIntegrationTest : IntegrationTestBase() {
             ingress.metadata.ownerReferences[0].name
         )
 
+        assertEquals(ingress.spec.ingressClassName, "skipper")
+
         assertEquals(mapOf(
-            "kubernetes.io/ingress.class" to "skipper",
             "zalando.org/skipper-predicate" to "True()",
             "zalando.org/skipper-filter" to
                 """setRequestHeader("X-ShinyProxy-Instance", "${sp.hashOfCurrentSpec}")""" +
@@ -1080,7 +1082,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("/configs/conflict_v1_ingress.yaml")).createOrReplace()
+            stableClient.load(this.javaClass.getResourceAsStream("/config/conflict.yaml")).createOrReplace()
 
             // 2. create a SP instance
             val spTestInstance = ShinyProxyTestInstance(

src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt

@@ -98,9 +98,10 @@ class ShinyProxyTestInstance(private val namespace: String,
         assertEquals("apps/v1", ingress.metadata.ownerReferences[0].apiVersion)
         assertEquals("sp-${sp.metadata.name}-rs-${hash}".take(63), ingress.metadata.ownerReferences[0].name)
 
+        assertEquals(ingress.spec.ingressClassName, "skipper")
+
         if (isLatest) {
             assertEquals(mapOf(
-                "kubernetes.io/ingress.class" to "skipper",
                 "zalando.org/skipper-predicate" to "True()",
                 "zalando.org/skipper-filter" to
                     """setRequestHeader("X-ShinyProxy-Instance", "${sp.hashOfCurrentSpec}")""" +
@@ -113,7 +114,6 @@ class ShinyProxyTestInstance(private val namespace: String,
             ), ingress.metadata.annotations)
         } else {
             assertEquals(mapOf(
-                "kubernetes.io/ingress.class" to "skipper",
                 "zalando.org/skipper-predicate" to """True() && Cookie("sp-instance", "$hash")""",
                 "zalando.org/skipper-filter" to
                     """setRequestHeader("X-ShinyProxy-Instance", "$hash")""" +

src/test/resources/configs/conflict.yaml

@@ -22,7 +22,7 @@ spec:
   selector:
     app.kubernetes.io/name: myname
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: sp-example-shinyproxy-ing-abfc24c726e9e87ea7c633384f2a659935249
@@ -33,6 +33,9 @@ spec:
       http:
         paths:
           - path: /
+            pathType: ImplementationSpecific
             backend:
-              serviceName: my-service-name
-              servicePort: 8081
+              service:
+                name: my-service-name
+                port:
+                  number: 8081