Merge pull request #168 from sunya-ch/v1.2.2

check active namespace before creating NAD
foundation-model-stack · Jan 10, 2024 · 77176db · 77176db
2 parents 7d0ee02 + ce7c7b8
commit 77176db
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/plugin/net_attach_def.go b/plugin/net_attach_def.go
@@ -14,6 +14,7 @@ import (
 	"github.com/containernetworking/cni/pkg/types"
 	multinicv1 "github.com/foundation-model-stack/multi-nic-cni/api/v1"
 	"github.com/foundation-model-stack/multi-nic-cni/controllers/vars"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -147,7 +148,9 @@ func (h *NetAttachDefHandler) getNamespace(net *multinicv1.MultiNicNetwork) ([]s
 		namespaceList, err := h.Clientset.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
 		if err == nil {
 			for _, ns := range namespaceList.Items {
-				namespaces = append(namespaces, ns.Name)
+				if ns.Status.Phase == v1.NamespaceActive {
+					namespaces = append(namespaces, ns.Name)
+				}
 			}
 		} else {
 			return namespaces, err