affinity metrics: add namespaceSelector and namespaces labels; remove stray comments; keep header spacing; docs+tests updated

Author: SoumyaRaikwar

docs/metrics/workload/deployment-metrics.md

@@ -12,7 +12,7 @@
 | kube_deployment_status_condition                            | Gauge       | The current status conditions of a deployment.                                                                                         | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt; <br> `reason`=&lt;deployment-transition-reason&gt; <br> `condition`=&lt;deployment-condition&gt; <br> `status`=&lt;true\|false\|unknown&gt; | STABLE       |
 | kube_deployment_spec_replicas                               | Gauge       | Number of desired pods for a deployment.                                                                                               | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt;                                                                                          | STABLE       |
 | kube_deployment_spec_paused                                 | Gauge       | Whether the deployment is paused and will not be processed by the deployment controller.                                               | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt;                                                                                          | STABLE       |
-| kube_deployment_spec_affinity                               | Gauge       | Pod affinity and anti-affinity rules defined in the deployment's pod template specification.                                           | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt; <br> `affinity`=&lt;podaffinity\|podantiaffinity&gt; <br> `type`=&lt;requiredDuringSchedulingIgnoredDuringExecution\|preferredDuringSchedulingIgnoredDuringExecution&gt; <br> `topology_key`=&lt;topology-key&gt; <br> `label_selector`=&lt;selector-string&gt; | ALPHA |
+| kube_deployment_spec_affinity                               | Gauge       | Pod affinity and anti-affinity rules defined in the deployment's pod template specification.                                           | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt; <br> `affinity`=&lt;podaffinity\|podantiaffinity&gt; <br> `type`=&lt;requiredDuringSchedulingIgnoredDuringExecution\|preferredDuringSchedulingIgnoredDuringExecution&gt; <br> `topology_key`=&lt;topology-key&gt; <br> `label_selector`=&lt;selector-string&gt; <br> `namespace_selector`=&lt;namespace-selector-string&gt; <br> `namespaces`=&lt;comma-separated-namespaces&gt; | ALPHA |
 | kube_deployment_spec_strategy_rollingupdate_max_unavailable | Gauge       | Maximum number of unavailable replicas during a rolling update of a deployment.                                                        | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt;                                                                                          | STABLE       |
 | kube_deployment_spec_strategy_rollingupdate_max_surge       | Gauge       | Maximum number of replicas that can be scheduled above the desired number of replicas during a rolling update of a deployment.        | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt;                                                                                          | STABLE       |
 | kube_deployment_metadata_generation                         | Gauge       | Sequence number representing a specific generation of the desired state.                                                               | `deployment`=&lt;deployment-name&gt; <br> `namespace`=&lt;deployment-namespace&gt;                                                                                          | STABLE       |

internal/store/deployment.go

@@ -18,6 +18,7 @@ package store
 
 import (
 	"context"
+	"strings"
 
 	basemetrics "k8s.io/component-base/metrics"
 
@@ -456,19 +457,23 @@ func generateDeploymentAffinityMetrics(d *v1.Deployment) *metric.Family {
 		// Required affinity rules
 		for _, rule := range d.Spec.Template.Spec.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
 			labelSelector := formatLabelSelector(rule.LabelSelector)
+			namespaceSelector := formatLabelSelector(rule.NamespaceSelector)
+			namespaces := strings.Join(rule.Namespaces, ",")
 			metrics = append(metrics, &metric.Metric{
-				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector"},
-				LabelValues: []string{"podaffinity", "requiredDuringSchedulingIgnoredDuringExecution", rule.TopologyKey, labelSelector},
+				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector", "namespace_selector", "namespaces"},
+				LabelValues: []string{"podaffinity", "requiredDuringSchedulingIgnoredDuringExecution", rule.TopologyKey, labelSelector, namespaceSelector, namespaces},
 				Value:       1,
 			})
 		}
 
 		// Preferred affinity rules
 		for _, rule := range d.Spec.Template.Spec.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
 			labelSelector := formatLabelSelector(rule.PodAffinityTerm.LabelSelector)
+			namespaceSelector := formatLabelSelector(rule.PodAffinityTerm.NamespaceSelector)
+			namespaces := strings.Join(rule.PodAffinityTerm.Namespaces, ",")
 			metrics = append(metrics, &metric.Metric{
-				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector"},
-				LabelValues: []string{"podaffinity", "preferredDuringSchedulingIgnoredDuringExecution", rule.PodAffinityTerm.TopologyKey, labelSelector},
+				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector", "namespace_selector", "namespaces"},
+				LabelValues: []string{"podaffinity", "preferredDuringSchedulingIgnoredDuringExecution", rule.PodAffinityTerm.TopologyKey, labelSelector, namespaceSelector, namespaces},
 				Value:       1,
 			})
 		}
@@ -479,19 +484,23 @@ func generateDeploymentAffinityMetrics(d *v1.Deployment) *metric.Family {
 		// Required anti-affinity rules
 		for _, rule := range d.Spec.Template.Spec.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
 			labelSelector := formatLabelSelector(rule.LabelSelector)
+			namespaceSelector := formatLabelSelector(rule.NamespaceSelector)
+			namespaces := strings.Join(rule.Namespaces, ",")
 			metrics = append(metrics, &metric.Metric{
-				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector"},
-				LabelValues: []string{"podantiaffinity", "requiredDuringSchedulingIgnoredDuringExecution", rule.TopologyKey, labelSelector},
+				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector", "namespace_selector", "namespaces"},
+				LabelValues: []string{"podantiaffinity", "requiredDuringSchedulingIgnoredDuringExecution", rule.TopologyKey, labelSelector, namespaceSelector, namespaces},
 				Value:       1,
 			})
 		}
 
 		// Preferred anti-affinity rules
 		for _, rule := range d.Spec.Template.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
 			labelSelector := formatLabelSelector(rule.PodAffinityTerm.LabelSelector)
+			namespaceSelector := formatLabelSelector(rule.PodAffinityTerm.NamespaceSelector)
+			namespaces := strings.Join(rule.PodAffinityTerm.Namespaces, ",")
 			metrics = append(metrics, &metric.Metric{
-				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector"},
-				LabelValues: []string{"podantiaffinity", "preferredDuringSchedulingIgnoredDuringExecution", rule.PodAffinityTerm.TopologyKey, labelSelector},
+				LabelKeys:   []string{"affinity", "type", "topology_key", "label_selector", "namespace_selector", "namespaces"},
+				LabelValues: []string{"podantiaffinity", "preferredDuringSchedulingIgnoredDuringExecution", rule.PodAffinityTerm.TopologyKey, labelSelector, namespaceSelector, namespaces},
 				Value:       1,
 			})
 		}
@@ -505,6 +514,5 @@ func formatLabelSelector(selector *metav1.LabelSelector) string {
 	if selector == nil {
 		return ""
 	}
-	// Use Kubernetes helper function as suggested by @mrueg
 	return metav1.FormatLabelSelector(selector)
 }

internal/store/deployment_test.go

@@ -198,9 +198,9 @@ func TestDeploymentStore(t *testing.T) {
 			Want: metadata + `
         kube_deployment_metadata_generation{deployment="depl-with-affinity",namespace="ns1"} 1
         kube_deployment_spec_paused{deployment="depl-with-affinity",namespace="ns1"} 0
-        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podaffinity",type="requiredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/zone",label_selector="app=cache"} 1
-        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podaffinity",type="preferredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/hostname",label_selector="app=web"} 1
-        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podantiaffinity",type="requiredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/hostname",label_selector="app=depl-with-affinity"} 1
+        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podaffinity",type="requiredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/zone",label_selector="app=cache",namespace_selector="",namespaces=""} 1
+        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podaffinity",type="preferredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/hostname",label_selector="app=web",namespace_selector="",namespaces=""} 1
+        kube_deployment_spec_affinity{deployment="depl-with-affinity",namespace="ns1",affinity="podantiaffinity",type="requiredDuringSchedulingIgnoredDuringExecution",topology_key="kubernetes.io/hostname",label_selector="app=depl-with-affinity",namespace_selector="",namespaces=""} 1
         kube_deployment_spec_replicas{deployment="depl-with-affinity",namespace="ns1"} 3
         kube_deployment_status_observed_generation{deployment="depl-with-affinity",namespace="ns1"} 1
         kube_deployment_status_replicas_available{deployment="depl-with-affinity",namespace="ns1"} 3