Use op-rs release. Also fix tests

Author: sbernauer

Cargo.lock

@@ -21,7 +21,7 @@ prost = "0.13"
 prost-types = "0.13"
 serde = "1.0"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.81.0" }
 strum = { version = "0.26", features = ["derive"] }
 socket2 = { version = "0.5", features = ["all"] }
 tokio = { version = "1.40", features = ["full"] }
@@ -34,4 +34,3 @@ tracing = "0.1.40"
 [patch."https://github.com/stackabletech/operator-rs.git"]
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
 # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feature/smart-preferred-address-type" }

Cargo.nix

@@ -0,0 +1,5 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: envsubst '$NAMESPACE' < 05_listenerclass.yaml | kubectl apply -n $NAMESPACE -f -

Cargo.toml

@@ -2,7 +2,7 @@
 apiVersion: listeners.stackable.tech/v1alpha1
 kind: ListenerClass
 metadata:
-  name: listener-operator-test-smoke-nodeport
+  name: listener-operator-test-smoke-nodeport-$NAMESPACE
 spec:
   serviceType: NodePort
   preferredAddressType: {{ test_scenario['values']['addressType'] }}

crate-hashes.json

@@ -13,4 +13,10 @@ metadata:
   name: listener-nginx-long-name-approaching-k8s-limits-0
 status:
   ingressAddresses:
+# FIXME: This test seems to assume that Nodes always have a hostname *and* a IP address (which should be the case on
+# e.g. kind)! We probably need to relax this assertion at a later point of time
+{% if test_scenario['values']['addressType'] == 'HostnameConservative' %}
+    - addressType: IP
+{% else %}
     - addressType: {{ test_scenario['values']['addressType'] }}
+{% endif %}

tests/templates/kuttl/smoke-nodeport/05-create-listenerclass.yaml

@@ -1,47 +1,5 @@
 ---
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  # Intentionally long name to trigger #110
-  name: nginx-long-name-approaching-k8s-limits
-spec:
-  serviceName: nginx
-  selector:
-    matchLabels:
-      app: nginx
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-        - name: nginx
-          image: nginxinc/nginx-unprivileged:1.25.2
-          ports:
-            - name: http
-              containerPort: 8080
-          volumeMounts:
-            - name: listener
-              mountPath: /listener
-            - name: metadata
-              mountPath: /usr/share/nginx/html/
-      volumes:
-        - name: metadata
-          downwardAPI:
-            items:
-              - path: pod-name
-                fieldRef:
-                  fieldPath: metadata.name
-  volumeClaimTemplates:
-    - metadata:
-        name: listener
-        annotations:
-          listeners.stackable.tech/listener-class: listener-operator-test-smoke-nodeport
-      spec:
-        accessModes:
-          - ReadWriteMany
-        storageClassName: listeners.stackable.tech
-        resources:
-          requests:
-            storage: 1
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: envsubst '$NAMESPACE' < 10_nginx-statefulset.yaml | kubectl apply -n $NAMESPACE -f -

tests/templates/kuttl/smoke-nodeport/05-create-listenerclass.yaml.j2 renamed to tests/templates/kuttl/smoke-nodeport/05_listenerclass.yaml.j2

@@ -0,0 +1,47 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  # Intentionally long name to trigger #110
+  name: nginx-long-name-approaching-k8s-limits
+spec:
+  serviceName: nginx
+  selector:
+    matchLabels:
+      app: nginx
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+        - name: nginx
+          image: nginxinc/nginx-unprivileged:1.25.2
+          ports:
+            - name: http
+              containerPort: 8080
+          volumeMounts:
+            - name: listener
+              mountPath: /listener
+            - name: metadata
+              mountPath: /usr/share/nginx/html/
+      volumes:
+        - name: metadata
+          downwardAPI:
+            items:
+              - path: pod-name
+                fieldRef:
+                  fieldPath: metadata.name
+  volumeClaimTemplates:
+    - metadata:
+        name: listener
+        annotations:
+          listeners.stackable.tech/listener-class: listener-operator-test-smoke-nodeport-$NAMESPACE
+      spec:
+        accessModes:
+          - ReadWriteMany
+        storageClassName: listeners.stackable.tech
+        resources:
+          requests:
+            storage: 1

tests/templates/kuttl/smoke-nodeport/10-assert.yaml.j2

@@ -7,6 +7,7 @@ dimensions:
     values:
       - IP
       - Hostname
+      - HostnameConservative
 tests:
   - name: smoke-nodeport
     dimensions: