Merge pull request #479 from karelyatin/OSPRH-12568-cleanup

Do not enable Northd Metrics when exporterImage is unset

Author: openshift-merge-bot[bot]

.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
     - id: destroyed-symlinks
     - id: check-yaml
       args: [-m]
-      exclude: "^templates/(ovnnorthd|openstackconfiggenerator|openstackcontrolplane)/.*$"
+      exclude: "^templates/(ovnnorthd|ovndbcluster|ovncontroller)/.*$"
     - id: check-json
     - id: detect-private-key
     - id: end-of-file-fixer

api/bases/ovn.openstack.org_ovnnorthds.yaml

@@ -53,7 +53,6 @@ spec:
                   environmental default if empty)
                 type: string
               exporterImage:
-                default: quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified
                 description: ExporterImage - Container Image URL for the openstack-network-exporter
                   metrics sidecar (will be set to environmental default if empty)
                 type: string

api/v1beta1/ovnnorthd_types.go

@@ -46,7 +46,6 @@ type OVNNorthdSpec struct {
 	ContainerImage string `json:"containerImage"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default="quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"
 	// ExporterImage - Container Image URL for the openstack-network-exporter metrics sidecar (will be set to environmental default if empty)
 	ExporterImage string `json:"exporterImage,omitempty"`
 

config/crd/bases/ovn.openstack.org_ovnnorthds.yaml

@@ -53,7 +53,6 @@ spec:
                   environmental default if empty)
                 type: string
               exporterImage:
-                default: quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified
                 description: ExporterImage - Container Image URL for the openstack-network-exporter
                   metrics sidecar (will be set to environmental default if empty)
                 type: string

controllers/ovnnorthd_controller.go

@@ -548,8 +548,8 @@ func (r *OVNNorthdReconciler) reconcileNormal(ctx context.Context, instance *ovn
 	}
 	// create Deployment - end
 
-	// Create per-pod metrics services if metrics are enabled
-	if instance.Spec.MetricsEnabled == nil || *instance.Spec.MetricsEnabled {
+	// Create per-pod metrics services if metrics are enabled and exporter image is specified
+	if instance.Spec.ExporterImage != "" && (instance.Spec.MetricsEnabled == nil || *instance.Spec.MetricsEnabled) {
 		ctrlResult, err = r.reconcileMetricsServices(ctx, helper, instance, serviceLabels)
 		if err != nil {
 			Log.Error(err, "Failed to reconcile metrics services")
@@ -609,15 +609,18 @@ func (r *OVNNorthdReconciler) generateServiceConfigMaps(
 			Labels:        cmLabels,
 			ConfigOptions: templateParameters,
 		},
-		// ConfigConfigMap for network exporter
-		{
+	}
+
+	// Add ConfigConfigMap for network exporter only if metrics are enabled and exporter image is specified
+	if instance.Spec.ExporterImage != "" && (instance.Spec.MetricsEnabled == nil || *instance.Spec.MetricsEnabled) {
+		cms = append(cms, util.Template{
 			Name:          fmt.Sprintf("%s-config", instance.Name),
 			Namespace:     instance.Namespace,
 			Type:          util.TemplateTypeConfig,
 			InstanceType:  instance.Kind,
 			Labels:        cmLabels,
 			ConfigOptions: templateParameters,
-		},
+		})
 	}
 	return configmap.EnsureConfigMaps(ctx, h, instance, cms, envVars)
 }
@@ -719,7 +722,6 @@ func (r *OVNNorthdReconciler) cleanupLegacyDeployment(
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			// Deployment doesn't exist, migration already complete
-			Log.V(1).Info("No legacy deployment found, migration already complete")
 			return nil
 		}
 		return fmt.Errorf("failed to check for legacy deployment %s: %w", deploymentName, err)

pkg/ovnnorthd/statefulset.go

@@ -121,8 +121,8 @@ func StatefulSet(
 		},
 	}
 
-	// Add metrics sidecar container if MetricsEnabled is true (default)
-	if instance.Spec.MetricsEnabled == nil || *instance.Spec.MetricsEnabled {
+	// Add metrics sidecar container if MetricsEnabled is true (default) and exporter image is specified
+	if instance.Spec.ExporterImage != "" && (instance.Spec.MetricsEnabled == nil || *instance.Spec.MetricsEnabled) {
 		metricsVolumeMounts := []corev1.VolumeMount{
 			{
 				Name:      "ovn-rundir",