Remove default NAD

vkmc · vkmc · commit a994cc8f9821 · 2025-01-08T23:19:13.000+01:00
Avoid setting a default value for NAD. NADs are created
beforehand, so the selected naming might vary.

Also, allow opting for running without NAD and using
only pod network.
diff --git a/api/bases/telemetry.openstack.org_metricstorages.yaml b/api/bases/telemetry.openstack.org_metricstorages.yaml
@@ -1304,8 +1304,6 @@ 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:
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -1866,8 +1866,6 @@ 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:
diff --git a/api/v1beta1/metricstorage_types.go b/api/v1beta1/metricstorage_types.go
@@ -92,7 +92,6 @@ type MetricStorageSpec struct {
 
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={"ctlplane"}
 	NetworkAttachments []string `json:"networkAttachments"`
 
 	// MonitoringStack allows to define a metric storage with
diff --git a/api/v1beta1/metricstorage_webhook.go b/api/v1beta1/metricstorage_webhook.go
@@ -59,9 +59,7 @@ func (spec *MetricStorageSpec) Default() {
 	if *spec.DataplaneNetwork == "" {
 		*spec.DataplaneNetwork = "ctlplane"
 	}
-	if len(spec.NetworkAttachments) == 0 {
-		spec.NetworkAttachments = []string{"ctlplane"}
-	}
+
 	if spec.MonitoringStack != nil {
 		spec.MonitoringStack.Default()
 	}
diff --git a/config/crd/bases/telemetry.openstack.org_metricstorages.yaml b/config/crd/bases/telemetry.openstack.org_metricstorages.yaml
@@ -1304,8 +1304,6 @@ 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:
diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -1866,8 +1866,6 @@ 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:

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ func (spec *MetricStorageSpec) Default() {`
`59`	`59`	`if *spec.DataplaneNetwork == "" {`
`60`	`60`	`*spec.DataplaneNetwork = "ctlplane"`
`61`	`61`	`}`
`62`		`- if len(spec.NetworkAttachments) == 0 {`
`63`		`- spec.NetworkAttachments = []string{"ctlplane"}`
`64`		`- }`
	`62`	`+`
`65`	`63`	`if spec.MonitoringStack != nil {`
`66`	`64`	`spec.MonitoringStack.Default()`
`67`	`65`	`}`