From c2cede6287e0c12d4309c22711c71201d5863d49 Mon Sep 17 00:00:00 2001 From: Ludovico Russo Date: Wed, 21 Apr 2021 22:23:25 +0200 Subject: [PATCH] refactor: better name variables in pkg/webhook/utils --- pkg/webhook/utils/in_capsule_group.go | 6 +++--- pkg/webhook/utils/kubernetes_version.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/webhook/utils/in_capsule_group.go b/pkg/webhook/utils/in_capsule_group.go index 7fe68622..47c6e658 100644 --- a/pkg/webhook/utils/in_capsule_group.go +++ b/pkg/webhook/utils/in_capsule_group.go @@ -40,14 +40,14 @@ type handler struct { // If the user performing action is not a Capsule user, can be skipped func (h handler) isCapsuleUser(req admission.Request) bool { - g := utils.NewUserGroupList(req.UserInfo.Groups) + groupList := utils.NewUserGroupList(req.UserInfo.Groups) // if the user is a ServiceAccount belonging to the kube-system namespace, definitely, it's not a Capsule user // and we can skip the check in case of Capsule user group assigned to system:authenticated // (ref: https://github.com/clastix/capsule/issues/234) - if g.Find("system:serviceaccounts:kube-system") { + if groupList.Find("system:serviceaccounts:kube-system") { return false } - return g.Find(h.capsuleGroup) + return groupList.Find(h.capsuleGroup) } func (h *handler) OnCreate(client client.Client, decoder *admission.Decoder) webhook.Func { diff --git a/pkg/webhook/utils/kubernetes_version.go b/pkg/webhook/utils/kubernetes_version.go index 0ce8becf..113533e4 100644 --- a/pkg/webhook/utils/kubernetes_version.go +++ b/pkg/webhook/utils/kubernetes_version.go @@ -24,12 +24,12 @@ func GetK8sVersion() (major, minor int, ver string, err error) { return 0, 0, "", err } - v, err := client.Discovery().ServerVersion() + version, err := client.Discovery().ServerVersion() if err != nil { return 0, 0, "", err } - major, _ = strconv.Atoi(v.Major) - minor, _ = strconv.Atoi(v.Minor) - ver = v.String() + major, _ = strconv.Atoi(version.Major) + minor, _ = strconv.Atoi(version.Minor) + ver = version.String() return }