Merge pull request #827 from openstack-k8s-operators/OSPRH-22189/use-dataplane-nw-default-nad

Default MetricStorage NetworkAttachments to ctlplane

Author: openshift-merge-bot[bot]

api/bases/telemetry.openstack.org_metricstorages.yaml

@@ -1839,6 +1839,8 @@ spec:
                     type: object
                 type: object
               networkAttachments:
+                default:
+                - ctlplane
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
                 items:

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -3232,6 +3232,8 @@ spec:
                         type: object
                     type: object
                   networkAttachments:
+                    default:
+                    - ctlplane
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
                     items:

api/v1beta1/metricstorage_types.go

@@ -97,7 +97,8 @@ type MetricStorageSpec struct {
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
 	// +kubebuilder:validation:Optional
 	// +listType=atomic
-	NetworkAttachments []string `json:"networkAttachments,omitempty"`
+	// +kubebuilder:default:={"ctlplane"}
+	NetworkAttachments []string `json:"networkAttachments"`
 
 	// MonitoringStack allows to define a metric storage with
 	// options supported by Red Hat

config/crd/bases/telemetry.openstack.org_metricstorages.yaml

@@ -1839,6 +1839,8 @@ spec:
                     type: object
                 type: object
               networkAttachments:
+                default:
+                - ctlplane
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
                 items:

config/crd/bases/telemetry.openstack.org_telemetries.yaml

@@ -3232,6 +3232,8 @@ spec:
                         type: object
                     type: object
                   networkAttachments:
+                    default:
+                    - ctlplane
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
                     items:

test/kuttl/tests/cloudkitty/01-deploy-dependencies.yaml

@@ -49,6 +49,7 @@ spec:
       retention: 24h
       persistent:
         pvcStorageRequest: 20G
+  networkAttachments: []
 ---
 # minio
 apiVersion: v1

test/kuttl/tests/default/01-deploy.yaml

@@ -15,6 +15,7 @@ spec:
         retention: 24h
         persistent:
           pvcStorageRequest: 20G
+    networkAttachments: []
   autoscaling:
     enabled: true
     aodh:

test/kuttl/tests/metricstorage/01-deploy.yaml

@@ -13,6 +13,7 @@ spec:
       retention: 24h
       persistent:
         pvcStorageRequest: 20G
+  networkAttachments: []
 ---
 # Required, so that the mysqld_exporter scrapeconfig is created
 apiVersion: telemetry.openstack.org/v1beta1

test/kuttl/tests/metricstorage/04-custom-monitoring-stack.yaml

@@ -14,3 +14,4 @@ spec:
       matchLabels:
         app: custom-monitoring-stack
     retention: 1d
+  networkAttachments: []

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

@@ -14,3 +14,4 @@ spec:
       retention: 24h
       persistent:
         pvcStorageRequest: 20G
+  networkAttachments: []