clusterworkspacetypes: simplify system types

kcp-dev · Jul 23, 2022 · bd2ead8 · bd2ead8
1 parent d1d516e
commit bd2ead8
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 213 deletions.
diff --git a/config/home/bootstrap.go b/config/home/bootstrap.go
diff --git a/config/organization/bootstrap.go b/config/organization/bootstrap.go
diff --git a/config/organization/clusterworkspacetype-use-clusterrole.yaml b/config/organization/clusterworkspacetype-use-clusterrole.yaml
diff --git a/config/organization/clusterworkspacetype-use-clusterrolebinding.yaml b/config/organization/clusterworkspacetype-use-clusterrolebinding.yaml
diff --git a/config/root/clusterworkspacetype-home.yaml b/config/root/clusterworkspacetype-home.yaml
@@ -3,7 +3,10 @@ kind: ClusterWorkspaceType
 metadata:
   name: home
 spec:
-  initializer: true
+  extend:
+    with:
+    - name: universal
+      path: root
   defaultChildWorkspaceType:
     name: universal
     path: root

diff --git a/config/root/clusterworkspacetype-organization.yaml b/config/root/clusterworkspacetype-organization.yaml
@@ -3,14 +3,15 @@ kind: ClusterWorkspaceType
 metadata:
   name: organization
 spec:
-  initializer: true
+  extend:
+    with:
+    - name: universal
+      path: root
   defaultChildWorkspaceType:
     name: universal
     path: root
   limitAllowedChildren:
     types:
-    - name: team
-      path: root
     - name: universal
       path: root
   limitAllowedParents:

diff --git a/config/root/clusterworkspacetype-team.yaml b/config/root/clusterworkspacetype-team.yaml
@@ -3,11 +3,16 @@ kind: ClusterWorkspaceType
 metadata:
   name: team
 spec:
-  initializer: true
+  extend:
+    with:
+    - name: universal
+      path: root
   defaultChildWorkspaceType:
     name: universal
     path: root
   limitAllowedParents:
     types:
     - name: organization
       path: root
+    - name: team
+      path: root
diff --git a/config/team/bootstrap.go b/config/team/bootstrap.go
diff --git a/config/team/clusterworkspacetype-use-clusterrole.yaml b/config/team/clusterworkspacetype-use-clusterrole.yaml
diff --git a/config/team/clusterworkspacetype-use-clusterrolebinding.yaml b/config/team/clusterworkspacetype-use-clusterrolebinding.yaml
diff --git a/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go b/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go
@@ -34,9 +34,6 @@ func (c *controller) reconcile(ctx context.Context, workspace *tenancyv1alpha1.C
 	if workspace.Status.Phase != tenancyv1alpha1.ClusterWorkspacePhaseInitializing {
 		return nil
 	}
-	if workspace.Spec.Type != c.workspaceType {
-		return nil
-	}
 
 	// have we done our work before?
 	initializerName := initialization.InitializerForReference(c.workspaceType)

diff --git a/pkg/server/controllers.go b/pkg/server/controllers.go
@@ -47,11 +47,8 @@ import (
 	serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 
-	confighome "github.com/kcp-dev/kcp/config/home"
 	confighomebucket "github.com/kcp-dev/kcp/config/homebucket"
 	confighomeroot "github.com/kcp-dev/kcp/config/homeroot"
-	configorganization "github.com/kcp-dev/kcp/config/organization"
-	configteam "github.com/kcp-dev/kcp/config/team"
 	configuniversal "github.com/kcp-dev/kcp/config/universal"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1"
 	kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned"
@@ -404,32 +401,6 @@ func (s *Server) installWorkspaceScheduler(ctx context.Context, config *rest.Con
 		return err
 	}
 
-	organizationController, err := bootstrap.NewController(
-		config,
-		dynamicClusterClient,
-		crdClusterClient,
-		kcpClusterClient,
-		s.kcpSharedInformerFactory.Tenancy().V1alpha1().ClusterWorkspaces(),
-		tenancyv1alpha1.ClusterWorkspaceTypeReference{Path: "root", Name: "organization"},
-		configorganization.Bootstrap,
-	)
-	if err != nil {
-		return err
-	}
-
-	teamController, err := bootstrap.NewController(
-		config,
-		dynamicClusterClient,
-		crdClusterClient,
-		kcpClusterClient,
-		s.kcpSharedInformerFactory.Tenancy().V1alpha1().ClusterWorkspaces(),
-		tenancyv1alpha1.ClusterWorkspaceTypeReference{Path: "root", Name: "team"},
-		configteam.Bootstrap,
-	)
-	if err != nil {
-		return err
-	}
-
 	universalController, err := bootstrap.NewController(
 		config,
 		dynamicClusterClient,
@@ -455,8 +426,6 @@ func (s *Server) installWorkspaceScheduler(ctx context.Context, config *rest.Con
 			go workspaceShardController.Start(ctx, 2)
 		}
 		go workspaceTypeController.Start(ctx, 2)
-		go organizationController.Start(ctx, 2)
-		go teamController.Start(ctx, 2)
 		go universalController.Start(ctx, 2)
 
 		return nil
@@ -508,19 +477,6 @@ func (s *Server) installHomeWorkspaces(ctx context.Context, config *rest.Config)
 		return err
 	}
 
-	homeController, err := bootstrap.NewController(
-		config,
-		dynamicClusterClient,
-		crdClusterClient,
-		kcpClusterClient,
-		s.kcpSharedInformerFactory.Tenancy().V1alpha1().ClusterWorkspaces(),
-		tenancyv1alpha1.ClusterWorkspaceTypeReference{Path: "root", Name: "home"},
-		confighome.Bootstrap,
-	)
-	if err != nil {
-		return err
-	}
-
 	s.AddPostStartHook("kcp-install-home-workspaces", func(hookContext genericapiserver.PostStartHookContext) error {
 		if err := s.waitForSync(hookContext.StopCh); err != nil {
 			klog.Errorf("failed to finish post-start-hook kcp-install-home-workspaces: %v", err)
@@ -530,7 +486,6 @@ func (s *Server) installHomeWorkspaces(ctx context.Context, config *rest.Config)
 
 		go homerootController.Start(ctx, 2)
 		go homebucketController.Start(ctx, 2)
-		go homeController.Start(ctx, 2)
 
 		return nil
 	})