Merge pull request #1609 from miguellavalle/collector-ovndbcluster

Enable OVNDBCluster metrics collection

Author: openshift-merge-bot[bot]

pkg/openstack/ovn.go

@@ -137,6 +137,7 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 		if !instance.Spec.Ovn.Enabled {
 			instance.Status.ContainerImages.OvnNbDbclusterImage = nil
 			instance.Status.ContainerImages.OvnSbDbclusterImage = nil
+			instance.Status.ContainerImages.OpenstackNetworkExporterImage = nil
 			if _, err := EnsureDeleted(ctx, helper, OVNDBCluster); err != nil {
 				return false, conditions, err
 			}
@@ -223,6 +224,8 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 				OVNDBCluster.Spec.ContainerImage = *version.Status.ContainerImages.OvnSbDbclusterImage
 			}
 
+			OVNDBCluster.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault)
+
 			if OVNDBCluster.Spec.StorageClass == "" {
 				OVNDBCluster.Spec.StorageClass = instance.Spec.StorageClass
 			}
@@ -248,6 +251,7 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 	if OVNDBClustersReady {
 		instance.Status.ContainerImages.OvnNbDbclusterImage = version.Status.ContainerImages.OvnNbDbclusterImage
 		instance.Status.ContainerImages.OvnSbDbclusterImage = version.Status.ContainerImages.OvnSbDbclusterImage
+		instance.Status.ContainerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage
 	}
 
 	return OVNDBClustersReady, conditions, nil

tests/kuttl/common/osp_check_noapi_service_certs.sh

@@ -37,6 +37,21 @@ for service in "${!services_secrets[@]}"; do
     for port in $ports; do
         echo "Connecting to $service on port $port..."
 
+        # Use different secret for metrics port 1981
+        current_secret="$secret"
+        if [[ "$port" == "1981" && ("$service" == "ovsdbserver-nb-0" || "$service" == "ovsdbserver-sb-0") ]]; then
+            current_secret="cert-ovn-metrics"
+            # Fetch the certificate from the metrics secret
+            current_secret_cert=$(oc get secret "$current_secret" -n "$NAMESPACE" -o jsonpath="{.data['tls\.crt']}" | base64 --decode 2>&1)
+        else
+            current_secret_cert="$secret_cert"
+        fi
+
+        if [[ -z "$current_secret_cert" ]]; then
+            echo "Error retrieving or decoding certificate from secret $current_secret for service $service port $port."
+            continue
+        fi
+
         # Captures the certificate section from the openssl output
         pod_cert=$(oc rsh -n "$NAMESPACE" openstackclient openssl s_client -connect "$cluster_ip:$port" -servername "$cluster_ip" </dev/null 2>/dev/null | sed -ne '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p')
 
@@ -45,7 +60,7 @@ for service in "${!services_secrets[@]}"; do
             continue
         fi
 
-        if [[ "$pod_cert" == "$secret_cert" ]]; then
+        if [[ "$pod_cert" == "$current_secret_cert" ]]; then
             echo "Certificates for $service on port $port match the secret."
         else
             echo "Certificates for $service on port $port DO NOT match the secret."