From 26d014302ec1bcd8bac62b1edeb6ba8fcdcc6789 Mon Sep 17 00:00:00 2001 From: Duan Jiong Date: Wed, 15 Apr 2020 21:26:09 +0800 Subject: [PATCH] namespace: add namespace label in order to select namespace when convert nsnp to k8snp Signed-off-by: Duan Jiong --- pkg/constants/constants.go | 1 + pkg/controller/namespace/namespace_controller.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index c50fe5f94..4fe75a331 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -34,6 +34,7 @@ const ( IngressControllerPrefix = "kubesphere-router-" WorkspaceLabelKey = "kubesphere.io/workspace" + NamespaceLabelKey = "kubesphere.io/namespace" DisplayNameAnnotationKey = "kubesphere.io/alias-name" DescriptionAnnotationKey = "kubesphere.io/description" CreatorAnnotationKey = "kubesphere.io/creator" diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 42af07656..e3cdd94df 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -117,6 +117,10 @@ func (r *ReconcileNamespace) Reconcile(request reconcile.Request) (reconcile.Res // then lets add the finalizer and update the object. if !sliceutil.HasString(instance.ObjectMeta.Finalizers, finalizer) { instance.ObjectMeta.Finalizers = append(instance.ObjectMeta.Finalizers, finalizer) + if instance.Labels == nil { + instance.Labels = make(map[string]string) + } + instance.Labels[constants.NamespaceLabelKey] = instance.Name if err := r.Update(context.Background(), instance); err != nil { return reconcile.Result{}, err }