Merge pull request #733 from openstack-k8s-operators/OSPRH-14663/add-network-attachment-kuttl-test

Update metricStorage NAD kuttl tests

Author: openshift-merge-bot[bot]

tests/kuttl/suites/metricstorage/tests/06-deploy-edpm-resources.yaml

@@ -14,5 +14,3 @@ spec:
       retention: 24h
       persistent:
         pvcStorageRequest: 20G
-  networkAttachments:
-  - ctlplane

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

@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: prometheus-telemetry-kuttl-metricstorage-0
+  ownerReferences:
+  - kind: StatefulSet
+    name: prometheus-telemetry-kuttl-metricstorage
+  annotations:
+    k8s.v1.cni.cncf.io/networks: '[{"name":"ctlplane","namespace":"telemetry-kuttl-tests","interface":"ctlplane"}]'
+spec:
+    containers:
+    - name: prometheus
+      volumeMounts:
+      - mountPath: /etc/prometheus/config_out
+        name: config-out
+        readOnly: true
+      - mountPath: /etc/prometheus/certs
+        name: tls-assets
+        readOnly: true
+      - mountPath: /prometheus
+        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-rulefiles-0
+        name: prometheus-telemetry-kuttl-metricstorage-rulefiles-0
+      - mountPath: /etc/prometheus/web_config/web-config.yaml
+        name: web-config
+        readOnly: true
+        subPath: web-config.yaml
+      - mountPath: /etc/prometheus/web_config/secret/cert-metric-storage-prometheus-svc-key
+        readOnly: true
+      - mountPath: /etc/prometheus/web_config/secret/cert-metric-storage-prometheus-svc-cert
+        readOnly: true
+      - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+        readOnly: true
+    - name: config-reloader
+    - name: thanos-sidecar

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

@@ -0,0 +1,40 @@
+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
+spec:
+  monitoringStack:
+    alertingEnabled: true
+    scrapeInterval: 30s
+    storage:
+      strategy: persistent
+      retention: 24h
+      persistent:
+        pvcStorageRequest: 20G
+  prometheusTls:
+    caBundleSecretName: combined-ca-bundle
+    secretName: cert-metric-storage-prometheus-svc
+  dataplaneNetwork: ctlplane
+  networkAttachments:
+  - ctlplane