Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add configmap delete handler for approver #793

Merged
merged 1 commit into from
Apr 8, 2022
Merged

add configmap delete handler for approver #793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions pkg/yurthub/filter/approver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"sync"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
apirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/client-go/informers"
"k8s.io/client-go/tools/cache"
Expand All @@ -41,16 +42,9 @@ type approver struct {
}

var (
supportedVerbs = map[string]struct{}{
"get": {},
"list": {},
"watch": {},
}
defaultWhiteListRequests = map[string]struct{}{
reqKey(projectinfo.GetHubName(), "configmaps", "list"): {},
reqKey(projectinfo.GetHubName(), "configmaps", "watch"): {},
}
defaultReqKeyToName = map[string]string{
supportedVerbs = sets.NewString("get", "list", "watch")
defaultWhiteListRequests = sets.NewString(reqKey(projectinfo.GetHubName(), "configmaps", "list"), reqKey(projectinfo.GetHubName(), "configmaps", "watch"))
defaultReqKeyToName = map[string]string{
reqKey("kubelet", "services", "list"): MasterServiceFilterName,
reqKey("kubelet", "services", "watch"): MasterServiceFilterName,
reqKey("nginx-ingress-controller", "endpoints", "list"): EndpointsFilterName,
Expand All @@ -73,6 +67,7 @@ func newApprover(sharedFactory informers.SharedInformerFactory) *approver {
configMapInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: na.addConfigMap,
UpdateFunc: na.updateConfigMap,
DeleteFunc: na.deleteConfigMap,
})
return na
}
Expand Down Expand Up @@ -113,7 +108,7 @@ func (a *approver) GetFilterName(req *http.Request) string {
// Determine whether it is a whitelist resource
func isWhitelistReq(req *http.Request) bool {
key := getKeyByRequest(req)
if _, ok := defaultWhiteListRequests[key]; ok {
if ok := defaultWhiteListRequests.Has(key); ok {
return true
}
return false
Expand Down Expand Up @@ -170,6 +165,16 @@ func (a *approver) updateConfigMap(oldObj, newObj interface{}) {
a.merge("update", reqKeyToNameFromCM)
}

func (a *approver) deleteConfigMap(obj interface{}) {
_, ok := obj.(*corev1.ConfigMap)
if !ok {
return
}

// update reqKeyToName by merging user setting
a.merge("delete", map[string]string{})
}

// merge is used to add specified setting into reqKeyToName map.
func (a *approver) merge(action string, keyToNameSetting map[string]string) {
a.Lock()
Expand Down Expand Up @@ -214,7 +219,7 @@ func parseRequestSetting(setting string) []string {
if len(comp) != 0 && len(resource) != 0 && len(verbs) != 0 {
for i := range verbs {
verb := strings.TrimSpace(verbs[i])
if _, ok := supportedVerbs[verb]; ok {
if ok := supportedVerbs.Has(verb); ok {
reqKeys = append(reqKeys, reqKey(comp, resource, verb))
}
}
Expand Down