fix namespace creation for deployment operator (#507)

Author: zreigz

cmd/plural/bootstrap.go

@@ -252,7 +252,7 @@ func (p *Plural) handleCreateNamespace(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if err := p.CreateNamespace(name); err != nil {
+	if err := p.CreateNamespace(name, true); err != nil {
 		if apierrors.IsAlreadyExists(err) {
 			return nil
 		}

cmd/plural/cd.go

@@ -116,7 +116,7 @@ func (p *Plural) doInstallOperator(url, token, values string) error {
 	if err != nil {
 		return err
 	}
-	err = p.Kube.CreateNamespace(console.OperatorNamespace)
+	err = p.Kube.CreateNamespace(console.OperatorNamespace, false)
 	if err != nil && !apierrors.IsAlreadyExists(err) {
 		return err
 	}

pkg/kubernetes/kube.go

@@ -66,7 +66,7 @@ type Kube interface {
 	WireguardPeerCreate(namespace string, wireguardPeer *vpnv1alpha1.WireguardPeer) (*vpnv1alpha1.WireguardPeer, error)
 	WireguardPeerDelete(namespace string, name string) error
 	Apply(path string, force bool) error
-	CreateNamespace(namespace string) error
+	CreateNamespace(namespace string, managedByPlural bool) error
 	GetClient() *kubernetes.Clientset
 	GetRestClient() *restclient.RESTClient
 }
@@ -324,22 +324,24 @@ func (k *kube) Apply(path string, force bool) error {
 	return nil
 }
 
-func (k *kube) CreateNamespace(namespace string) error {
+func (k *kube) CreateNamespace(namespace string, managedByPlural bool) error {
 	ctx := context.Background()
 	_, err := k.Kube.CoreV1().Namespaces().Get(ctx, namespace, metav1.GetOptions{})
 	if err == nil {
 		return nil
 	}
-
-	_, err = k.Kube.CoreV1().Namespaces().Create(ctx, &v1.Namespace{
+	ns := &v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: namespace,
 			Labels: map[string]string{
-				"app.kubernetes.io/managed-by": "plural",
-				"app.plural.sh/name":           namespace,
+				"app.plural.sh/name": namespace,
 			},
 		},
-	}, metav1.CreateOptions{})
+	}
+	if managedByPlural {
+		ns.Labels["app.kubernetes.io/managed-by"] = "plural"
+	}
+	_, err = k.Kube.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{})
 
 	return err
 }