Skip to content

Commit 0748ec9

Browse files
authored
revert: "feat: add managed resource webhook" (#1168)
2 parents 5433581 + 0be3c62 commit 0748ec9

File tree

9 files changed

+11
-465
lines changed

9 files changed

+11
-465
lines changed

pkg/webhook/add_handler.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"go.goms.io/fleet/pkg/webhook/clusterresourceplacementdisruptionbudget"
77
"go.goms.io/fleet/pkg/webhook/clusterresourceplacementeviction"
88
"go.goms.io/fleet/pkg/webhook/fleetresourcehandler"
9-
"go.goms.io/fleet/pkg/webhook/managedresource"
109
"go.goms.io/fleet/pkg/webhook/membercluster"
1110
"go.goms.io/fleet/pkg/webhook/pod"
1211
"go.goms.io/fleet/pkg/webhook/replicaset"
@@ -16,8 +15,6 @@ import (
1615
func init() {
1716
// AddToManagerFleetResourceValidator is a function to register fleet guard rail resource validator to the webhook server
1817
AddToManagerFleetResourceValidator = fleetresourcehandler.Add
19-
// AddtoManagerManagedResource is a function to register managed resource validator to the webhook server
20-
AddtoManagerManagedResource = managedresource.Add
2118
// AddToManagerFuncs is a list of functions to register webhook validators and mutators to the webhook server
2219
AddToManagerFuncs = append(AddToManagerFuncs, clusterresourceplacement.AddMutating)
2320
AddToManagerFuncs = append(AddToManagerFuncs, clusterresourceplacement.AddV1Alpha1)

pkg/webhook/managedresource/managedresource_validating_webhook.go

Lines changed: 0 additions & 99 deletions
This file was deleted.

pkg/webhook/managedresource/managedresource_validating_webhook_test.go

Lines changed: 0 additions & 228 deletions
This file was deleted.

pkg/webhook/validation/uservalidation.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var (
5151
func ValidateUserForFleetCRD(req admission.Request, whiteListedUsers []string, group string) admission.Response {
5252
namespacedName := types.NamespacedName{Name: req.Name, Namespace: req.Namespace}
5353
userInfo := req.UserInfo
54-
if checkCRDGroup(group) && !IsAdminGroupUserOrWhiteListedUser(whiteListedUsers, userInfo) {
54+
if checkCRDGroup(group) && !isAdminGroupUserOrWhiteListedUser(whiteListedUsers, userInfo) {
5555
klog.V(2).InfoS(deniedModifyResource, "user", userInfo.Username, "groups", userInfo.Groups, "operation", req.Operation, "GVK", req.RequestKind, "subResource", req.SubResource, "namespacedName", namespacedName)
5656
return admission.Denied(fmt.Sprintf(ResourceDeniedFormat, userInfo.Username, utils.GenerateGroupString(userInfo.Groups), req.Operation, req.RequestKind, req.SubResource, namespacedName))
5757
}
@@ -63,7 +63,7 @@ func ValidateUserForFleetCRD(req admission.Request, whiteListedUsers []string, g
6363
func ValidateUserForResource(req admission.Request, whiteListedUsers []string) admission.Response {
6464
namespacedName := types.NamespacedName{Name: req.Name, Namespace: req.Namespace}
6565
userInfo := req.UserInfo
66-
if IsAdminGroupUserOrWhiteListedUser(whiteListedUsers, userInfo) || isUserAuthenticatedServiceAccount(userInfo) || isUserKubeScheduler(userInfo) || isUserKubeControllerManager(userInfo) || isUserInGroup(userInfo, nodeGroup) || isAKSSupportUser(userInfo) {
66+
if isAdminGroupUserOrWhiteListedUser(whiteListedUsers, userInfo) || isUserAuthenticatedServiceAccount(userInfo) || isUserKubeScheduler(userInfo) || isUserKubeControllerManager(userInfo) || isUserInGroup(userInfo, nodeGroup) || isAKSSupportUser(userInfo) {
6767
klog.V(3).InfoS(allowedModifyResource, "user", userInfo.Username, "groups", userInfo.Groups, "operation", req.Operation, "GVK", req.RequestKind, "subResource", req.SubResource, "namespacedName", namespacedName)
6868
return admission.Allowed(fmt.Sprintf(ResourceAllowedFormat, userInfo.Username, utils.GenerateGroupString(userInfo.Groups), req.Operation, req.RequestKind, req.SubResource, namespacedName))
6969
}
@@ -144,10 +144,10 @@ func ValidatedUpstreamMemberClusterUpdate(currentMC, oldMC clusterv1beta1.Member
144144
return admission.Allowed(fmt.Sprintf(ResourceAllowedFormat, userInfo.Username, utils.GenerateGroupString(userInfo.Groups), req.Operation, req.RequestKind, req.SubResource, namespacedName))
145145
}
146146

147-
// IsAdminGroupUserOrWhiteListedUser returns true is user belongs to white listed users or user belongs to system:masters/kubeadm:cluster-admins group.
147+
// isAdminGroupUserOrWhiteListedUser returns true is user belongs to white listed users or user belongs to system:masters/kubeadm:cluster-admins group.
148148
// In clusters using kubeadm, kubernetes-admin belongs to kubeadm:cluster-admins group and kubernetes-super-admin user belongs to system:masters group.
149149
// https://kubernetes.io/docs/reference/setup-tools/kubeadm/implementation-details/#generate-kubeconfig-files-for-control-plane-components
150-
func IsAdminGroupUserOrWhiteListedUser(whiteListedUsers []string, userInfo authenticationv1.UserInfo) bool {
150+
func isAdminGroupUserOrWhiteListedUser(whiteListedUsers []string, userInfo authenticationv1.UserInfo) bool {
151151
return slices.Contains(whiteListedUsers, userInfo.Username) || slices.Contains(userInfo.Groups, mastersGroup) || slices.Contains(userInfo.Groups, kubeadmClusterAdminsGroup)
152152
}
153153

0 commit comments

Comments
 (0)