Create a NAD in the Kuttl namespace

The ctlplane NAD exists in the openstack namespace
https://github.com/openstack-k8s-operators/install_yamls/blob/ba562f76c944c4bc92f7a4efe092e7ec30aebce4/scripts/gen-netatt.sh#L71
and this might be the reason the required NAD is not
being picked up during the metricstorage creation

Try precreating the NAD. Maybe some other resources are needed,
will follow up if that is the case.

Also, get back to updating the existing metricstorage so we
can test that updating the metricstorage when TLS is enabled
doesn't fall in a reconciliation loop.

Author: vkmc

tests/kuttl/suites/tls/tests/03-assert.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: prometheus-telemetry-kuttl-metricstorage-with-nad-0
+  name: prometheus-telemetry-kuttl-metricstorage-0
   ownerReferences:
   - kind: StatefulSet
-    name: prometheus-telemetry-kuttl-metricstorage-with-nad
+    name: prometheus-telemetry-kuttl-metricstorage
   annotations:
     k8s.v1.cni.cncf.io/networks: '[{"name":"ctlplane","namespace":"openstack","interface":"ctlplane"}]'
 spec:
@@ -18,12 +18,12 @@ spec:
         name: tls-assets
         readOnly: true
       - mountPath: /prometheus
-        name: prometheus-telemetry-kuttl-metricstorage-with-nad-db
+        name: prometheus-telemetry-kuttl-metricstorage-db
       - mountPath: /etc/prometheus/secrets/combined-ca-bundle
         name: secret-combined-ca-bundle
         readOnly: true
-      - mountPath: /etc/prometheus/rules/prometheus-telemetry-kuttl-metricstorage-with-nad-rulefiles-0
-        name: prometheus-telemetry-kuttl-metricstorage-with-nad-rulefiles-0
+      - mountPath: /etc/prometheus/rules/prometheus-telemetry-kuttl-metricstorage-rulefiles-0
+        name: prometheus-telemetry-kuttl-metricstorage-rulefiles-0
       - mountPath: /etc/prometheus/web_config/web-config.yaml
         name: web-config
         readOnly: true

tests/kuttl/suites/tls/tests/03-configure-nad-metricstorage.yaml

@@ -1,18 +1,28 @@
-# Kuttl test doesn't seem to wait correctly for the metric
-# storage to reconcile when enabling the NAD
-# Deleting it here and than recreating it in the next step
-# should ensure kuttl waits long enough.
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-delete:
-  - apiVersion: telemetry.openstack.org/v1beta1
-    kind: MetricStorage
-    name: telemetry-kuttl-metricstorage
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  labels:
+    osp/net: ctlplane
+  name: ctlplane
+spec:
+  config: |
+    {
+      "cniVersion": "0.3.1",
+      "name": "ctlplane",
+      "type": "macvlan",
+      "master": "enp7s0",
+      "ipam": {
+        "type": "whereabouts",
+        "range": "172.20.250.0/24",
+        "range_start": "172.20.250.30",
+        "range_end": "172.20.250.70"
+      }
+    }
 ---
 apiVersion: telemetry.openstack.org/v1beta1
 kind: MetricStorage
 metadata:
-  name: telemetry-kuttl-metricstorage-with-nad
+  name: telemetry-kuttl-metricstorage
 spec:
   monitoringStack:
     alertingEnabled: true