github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-10 19:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

keep namespace

Browse Source
This commit is contained in:
liuwei
2020-06-30 12:07:57 +08:00
parent 64968c8f02
commit 3de9f2f2e5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/hub/managedcluster/controller.go
View File

@@ -30,7 +30,6 @@ const (
var staticFiles = []string{
"manifests/managedcluster-clusterrole.yaml",
"manifests/managedcluster-clusterrolebinding.yaml",
"manifests/managedcluster-namespace.yaml",
"manifests/managedcluster-registration-role.yaml",
"manifests/managedcluster-registration-rolebinding.yaml",
"manifests/managedcluster-work-role.yaml",
@@ -127,6 +126,13 @@ func (c *managedClusterController) sync(ctx context.Context, syncCtx factory.Syn
return err
}
// TODO: we will add the managedcluster-namespace.yaml back to staticFiles
// in next release, currently, we need keep the namespace after the managed
// cluster is deleted, see the issue
// https://github.com/open-cluster-management/backlog/issues/2648
applyFiles := []string{"manifests/managedcluster-namespace.yaml"}
applyFiles = append(applyFiles, staticFiles...)
// Hub cluster-admin accepts the spoke cluster, we apply
// 1. clusterrole and clusterrolebinding for this spoke cluster.
// 2. namespace for this spoke cluster.
@@ -135,7 +141,7 @@ func (c *managedClusterController) sync(ctx context.Context, syncCtx factory.Syn
resourceapply.NewKubeClientHolder(c.kubeClient),
syncCtx.Recorder(),
helpers.ManagedClusterAssetFn(manifestDir, managedClusterName),
staticFiles...,
applyFiles...,
)
errs := []error{}
for _, result := range resourceResults {