Runtime refactoring and NetworkPolicy support (#2016)

runtime/kubernetes/namespace.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/micro/go-micro/v3/logger"
+	"github.com/micro/go-micro/v3/runtime"
 	"github.com/micro/go-micro/v3/util/kubernetes/client"
 )
 
@@ -24,7 +25,7 @@ func (k *kubernetes) ensureNamepaceExists(ns string) error {
 		return err
 	}
 
-	if err := k.createNamespace(namespace); err != nil {
+	if err := k.autoCreateNamespace(namespace); err != nil {
 		if logger.V(logger.WarnLevel, logger.DefaultLogger) {
 			logger.Warnf("Error creating namespace %v: %v", namespace, err)
 		}
@@ -64,8 +65,8 @@ func (k *kubernetes) namespaceExists(name string) (bool, error) {
 	return false, nil
 }
 
-// createNamespace creates a new k8s namespace
-func (k *kubernetes) createNamespace(namespace string) error {
+// autoCreateNamespace creates a new k8s namespace
+func (k *kubernetes) autoCreateNamespace(namespace string) error {
 	ns := client.Namespace{Metadata: &client.Metadata{Name: namespace}}
 	err := k.client.Create(&client.Resource{Kind: "namespace", Value: ns})
 
@@ -75,38 +76,54 @@ func (k *kubernetes) createNamespace(namespace string) error {
 		err = nil
 	}
 
-	// add to cache
+	// add to cache and create networkpolicy
 	if err == nil && k.namespaces != nil {
 		k.namespaces = append(k.namespaces, ns)
+
+		if networkPolicy, err := runtime.NewNetworkPolicy("ingress", namespace, map[string]string{"owner": "micro"}); err != nil {
+			return err
+		} else {
+			return k.create(networkPolicy)
+		}
 	}
 
 	return err
 }
 
-func (k *kubernetes) CreateNamespace(ns string) error {
+// createNamespace creates a namespace resource
+func (k *kubernetes) createNamespace(namespace *runtime.Namespace) error {
 	err := k.client.Create(&client.Resource{
 		Kind: "namespace",
+		Name: namespace.Name,
 		Value: client.Namespace{
 			Metadata: &client.Metadata{
-				Name: ns,
+				Name: namespace.Name,
 			},
 		},
-	})
+	}, client.CreateNamespace(namespace.Name))
 	if err != nil {
 		if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-			logger.Errorf("Error creating namespace %v: %v", ns, err)
+			logger.Errorf("Error creating namespace %s: %v", namespace.String(), err)
 		}
 	}
 	return err
 }
 
-func (k *kubernetes) DeleteNamespace(ns string) error {
+// deleteNamespace deletes a namespace resource
+func (k *kubernetes) deleteNamespace(namespace *runtime.Namespace) error {
 	err := k.client.Delete(&client.Resource{
 		Kind: "namespace",
-		Name: ns,
-	})
-	if err != nil && logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-		logger.Errorf("Error deleting namespace %v: %v", ns, err)
+		Name: namespace.Name,
+		Value: client.Namespace{
+			Metadata: &client.Metadata{
+				Name: namespace.Name,
+			},
+		},
+	}, client.DeleteNamespace(namespace.Name))
+	if err != nil {
+		if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+			logger.Errorf("Error deleting namespace %s: %v", namespace.String(), err)
+		}
 	}
 	return err
 }