feat(teams) Add team controller responsibility to team membership upd…

…ater (#723)
cloudoperators · Dec 18, 2024 · 9e4b56e · 9e4b56e
1 parent aed3ad7
commit 9e4b56e
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 270 deletions.
diff --git a/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml b/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_clusters.yaml b/charts/manager/crds/greenhouse.sap_clusters.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_organizations.yaml b/charts/manager/crds/greenhouse.sap_organizations.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_plugindefinitions.yaml b/charts/manager/crds/greenhouse.sap_plugindefinitions.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_pluginpresets.yaml b/charts/manager/crds/greenhouse.sap_pluginpresets.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_plugins.yaml b/charts/manager/crds/greenhouse.sap_plugins.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_teammemberships.yaml b/charts/manager/crds/greenhouse.sap_teammemberships.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_teamrolebindings.yaml b/charts/manager/crds/greenhouse.sap_teamrolebindings.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_teamroles.yaml b/charts/manager/crds/greenhouse.sap_teamroles.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/crds/greenhouse.sap_teams.yaml b/charts/manager/crds/greenhouse.sap_teams.yaml
@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/manager/templates/role.yaml b/charts/manager/templates/role.yaml
@@ -123,13 +123,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - greenhouse.sap
-  resources:
-  - teammemberships=
-  verbs:
-  - get
-  - list
 - apiGroups:
   - rbac
   resources:

diff --git a/cmd/greenhouse/controllers.go b/cmd/greenhouse/controllers.go
@@ -23,7 +23,6 @@ var knownControllers = map[string]func(controllerName string, mgr ctrl.Manager)
 	"organizationController": startOrganizationReconciler,
 
 	// Team controllers.
-	"teamController":  (&teamcontrollers.TeamReconciler{}).SetupWithManager,
 	"teamPropagation": (&teamcontrollers.TeamPropagationReconciler{}).SetupWithManager,
 
 	// TeamMembership controllers.

diff --git a/pkg/controllers/team/suite_test.go b/pkg/controllers/team/suite_test.go
diff --git a/pkg/controllers/team/team_controller.go b/pkg/controllers/team/team_controller.go
diff --git a/pkg/controllers/team/team_controller_test.go b/pkg/controllers/team/team_controller_test.go
diff --git a/pkg/controllers/teammembership/suite_test.go b/pkg/controllers/teammembership/suite_test.go
@@ -10,7 +10,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/cloudoperators/greenhouse/pkg/controllers/team"
 	"github.com/cloudoperators/greenhouse/pkg/controllers/teammembership"
 	"github.com/cloudoperators/greenhouse/pkg/scim"
 	"github.com/cloudoperators/greenhouse/pkg/test"
@@ -31,7 +30,6 @@ var _ = BeforeSuite(func() {
 
 	test.RegisterController("teammembershipUpdaterController",
 		(&teammembership.TeamMembershipUpdaterController{}).SetupWithManager)
-	test.RegisterController("teamController", (&team.TeamReconciler{}).SetupWithManager)
 	test.TestBeforeSuite()
 })