pull labels from namespace objects, handling default ns labels in kube 1.21

Author: mattfenwick

pkg/connectivity/probe/resources.go

@@ -39,6 +39,9 @@ func NewDefaultResources(kubernetes kube.IKubernetes, namespaces []string, podNa
 	if err := r.getPodIPsFromKube(kubernetes); err != nil {
 		return nil, err
 	}
+	if err := r.getNamespaceLabelsFromKube(kubernetes); err != nil {
+		return nil, err
+	}
 
 	return r, nil
 }
@@ -95,6 +98,23 @@ func (r *Resources) getPodIPsFromKube(kubernetes kube.IKubernetes) error {
 	return nil
 }
 
+func (r *Resources) getNamespaceLabelsFromKube(kubernetes kube.IKubernetes) error {
+	nsList, err := kubernetes.GetAllNamespaces()
+	if err != nil {
+		return err
+	}
+
+	for _, kubeNs := range nsList.Items {
+		for label, value := range kubeNs.Labels {
+			if ns, ok := r.Namespaces[kubeNs.Name]; ok {
+				ns[label] = value
+			}
+		}
+	}
+
+	return nil
+}
+
 func (r *Resources) GetPod(ns string, name string) (*Pod, error) {
 	for _, pod := range r.Pods {
 		if pod.Namespace == ns && pod.Name == name {

pkg/kube/ikubernetes.go

@@ -14,6 +14,7 @@ type IKubernetes interface {
 	GetNamespace(namespace string) (*v1.Namespace, error)
 	SetNamespaceLabels(namespace string, labels map[string]string) (*v1.Namespace, error)
 	DeleteNamespace(namespace string) error
+	GetAllNamespaces() (*v1.NamespaceList, error)
 
 	CreateNetworkPolicy(kubePolicy *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolicy, error)
 	GetNetworkPoliciesInNamespace(namespace string) ([]networkingv1.NetworkPolicy, error)
@@ -144,6 +145,16 @@ func (m *MockKubernetes) DeleteNamespace(ns string) error {
 	return nil
 }
 
+func (m *MockKubernetes) GetAllNamespaces() (*v1.NamespaceList, error) {
+	var namespaces []v1.Namespace
+	for _, ns := range m.Namespaces {
+		namespaces = append(namespaces, *ns.NamespaceObject)
+	}
+	return &v1.NamespaceList{
+		Items: namespaces,
+	}, nil
+}
+
 func (m *MockKubernetes) CreateNamespace(ns *v1.Namespace) (*v1.Namespace, error) {
 	if _, ok := m.Namespaces[ns.Name]; ok {
 		return nil, errors.Errorf("namespace %s already present", ns.Name)