Allow service account check to run only once at start of executor (#2673)

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2022-12-15 15:04:10 +05:30
committed by GitHub
parent 275cfb55a6
commit 8df4fd0e7c
3 changed files with 57 additions and 18 deletions
+3 -2
View File
@@ -192,8 +192,9 @@ executor:
enabled: true enabled: true
## indicates the time interval in minutes, after that fission will create service account, roles and rolebinding for builder and fetcher. ## indicates the time interval in minutes, after that fission will create service account, roles and rolebinding for builder and fetcher.
## interval will be applicable only if enable value is set to true. ## interval will be applicable only if enable value is set to true.
## default timing will be 30 minutes. ## default timing will be 0 minutes. That means check will run only once.
interval: 30 ## if you want to run check every 30 minutes then set interval to 30.
interval: 0
## router is responsible for routing function calls to the appropriate function. ## router is responsible for routing function calls to the appropriate function.
## ##
router: router:
+17 -16
View File
@@ -97,7 +97,12 @@ func CreateMissingPermissionForSA(ctx context.Context, kubernetesClient kubernet
interval := getSAInterval() interval := getSAInterval()
logger.Debug("interval value", zap.Any("interval", interval)) logger.Debug("interval value", zap.Any("interval", interval))
sa := getSAObj(ctx, kubernetesClient, logger) sa := getSAObj(ctx, kubernetesClient, logger)
go sa.doSACheck(ctx, interval) logger.Info("Starting service account check", zap.Any("interval", interval))
if interval > 0 {
go wait.UntilWithContext(ctx, sa.runSACheck, interval)
} else {
sa.runSACheck(ctx)
}
} }
} }
@@ -112,10 +117,6 @@ func getSAObj(ctx context.Context, kubernetesClient kubernetes.Interface, logger
return saObj return saObj
} }
func (sa *ServiceAccount) doSACheck(ctx context.Context, interval time.Duration) {
wait.UntilWithContext(ctx, sa.runSACheck, interval)
}
func (sa *ServiceAccount) runSACheck(ctx context.Context) { func (sa *ServiceAccount) runSACheck(ctx context.Context) {
for _, ns := range sa.nsResolver.FissionResourceNS { for _, ns := range sa.nsResolver.FissionResourceNS {
for _, permission := range sa.permissions { for _, permission := range sa.permissions {
@@ -133,7 +134,7 @@ func setupSAAndRoleBindings(ctx context.Context, client kubernetes.Interface, lo
SAObj, err := createGetSA(ctx, client, ps.saName, namespace) SAObj, err := createGetSA(ctx, client, ps.saName, namespace)
if err != nil { if err != nil {
logger.Error("error while creating or getting service account", logger.Error("error while creating or getting service account",
zap.String("SA_name", ps.saName), zap.String("sa_name", ps.saName),
zap.String("namespace", namespace), zap.String("namespace", namespace),
zap.Error(err)) zap.Error(err))
return return
@@ -179,7 +180,7 @@ func setupSAAndRoleBindings(ctx context.Context, client kubernetes.Interface, lo
func setupRoles(ctx context.Context, client kubernetes.Interface, logger *zap.Logger, sa *v1.ServiceAccount, rules []rbac.PolicyRule, suffix string) (*rbac.Role, error) { func setupRoles(ctx context.Context, client kubernetes.Interface, logger *zap.Logger, sa *v1.ServiceAccount, rules []rbac.PolicyRule, suffix string) (*rbac.Role, error) {
logger.Debug("creating role", logger.Debug("creating role",
zap.String("role_name", fmt.Sprintf("%s-role-%s", sa.Name, suffix)), zap.String("role_name", fmt.Sprintf("%s-role-%s", sa.Name, suffix)),
zap.String("SA_Name", sa.Name), zap.String("sa_name", sa.Name),
zap.String("namespace", sa.Namespace)) zap.String("namespace", sa.Namespace))
roleObj := &rbac.Role{ roleObj := &rbac.Role{
@@ -193,17 +194,17 @@ func setupRoles(ctx context.Context, client kubernetes.Interface, logger *zap.Lo
if err != nil { if err != nil {
return nil, fmt.Errorf("error while creating role for sa %s in namespace %s error: %s", sa.Name, sa.Namespace, err.Error()) return nil, fmt.Errorf("error while creating role for sa %s in namespace %s error: %s", sa.Name, sa.Namespace, err.Error())
} }
logger.Debug("role created successfully", logger.Info("role created successfully",
zap.String("role_name", role.Name), zap.String("role_name", role.Name),
zap.String("namespace", role.Namespace), zap.String("namespace", role.Namespace),
zap.String("SA_Name", sa.Name)) zap.String("sa_name", sa.Name))
return role, nil return role, nil
} }
func setupRoleBinding(ctx context.Context, client kubernetes.Interface, logger *zap.Logger, sa *v1.ServiceAccount, role *rbac.Role, suffix string) (*rbac.RoleBinding, error) { func setupRoleBinding(ctx context.Context, client kubernetes.Interface, logger *zap.Logger, sa *v1.ServiceAccount, role *rbac.Role, suffix string) (*rbac.RoleBinding, error) {
logger.Debug("creating role binding", logger.Debug("creating role binding",
zap.String("rolebinding_name", fmt.Sprintf("%s-rolebinding-%s", sa.Name, suffix)), zap.String("rolebinding_name", fmt.Sprintf("%s-rolebinding-%s", sa.Name, suffix)),
zap.String("SA_Name", sa.Name), zap.String("sa_name", sa.Name),
zap.String("namespace", sa.Namespace)) zap.String("namespace", sa.Namespace))
roleBindingObj := &rbac.RoleBinding{ roleBindingObj := &rbac.RoleBinding{
@@ -227,16 +228,19 @@ func setupRoleBinding(ctx context.Context, client kubernetes.Interface, logger *
if err != nil { if err != nil {
return nil, fmt.Errorf("error while creating rolebinding for sa %s in namespace %s error: %s", sa.Name, sa.Namespace, err.Error()) return nil, fmt.Errorf("error while creating rolebinding for sa %s in namespace %s error: %s", sa.Name, sa.Namespace, err.Error())
} }
logger.Debug("role binding created successfully", logger.Info("role binding created successfully",
zap.String("rolebinding_name", roleBinding.Name), zap.String("rolebinding_name", roleBinding.Name),
zap.String("namespace", roleBinding.Namespace), zap.String("namespace", roleBinding.Namespace),
zap.String("SA_Name", sa.Name)) zap.String("sa_name", sa.Name))
return roleBinding, nil return roleBinding, nil
} }
func checkPermission(ctx context.Context, client kubernetes.Interface, sa *v1.ServiceAccount, gvr *schema.GroupVersionResource, verb string) (bool, error) { func checkPermission(ctx context.Context, client kubernetes.Interface, sa *v1.ServiceAccount, gvr *schema.GroupVersionResource, verb string) (bool, error) {
user := fmt.Sprintf("system:serviceaccount:%s:%s", sa.Namespace, sa.Name) user := fmt.Sprintf("system:serviceaccount:%s:%s", sa.Namespace, sa.Name)
sar := authorizationv1.LocalSubjectAccessReview{ sar := authorizationv1.LocalSubjectAccessReview{
ObjectMeta: metav1.ObjectMeta{
Namespace: sa.Namespace,
},
Spec: authorizationv1.SubjectAccessReviewSpec{ Spec: authorizationv1.SubjectAccessReviewSpec{
ResourceAttributes: &authorizationv1.ResourceAttributes{ ResourceAttributes: &authorizationv1.ResourceAttributes{
Namespace: sa.Namespace, Namespace: sa.Namespace,
@@ -298,9 +302,6 @@ func createServiceAccount() bool {
} }
func getSAInterval() time.Duration { func getSAInterval() time.Duration {
SAInterval, err := GetUIntValueFromEnv(ENV_SA_INTERVAL) SAInterval, _ := GetUIntValueFromEnv(ENV_SA_INTERVAL)
if err != nil {
return time.Duration(30) * time.Minute
}
return time.Duration(SAInterval) * time.Minute return time.Duration(SAInterval) * time.Minute
} }
+37
View File
@@ -0,0 +1,37 @@
package utils
import (
"context"
"os"
"regexp"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
"github.com/fission/fission/pkg/utils/loggerfactory"
)
func TestServiceAccountCheck(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
kubernetesClient := fake.NewSimpleClientset()
logger := loggerfactory.GetLogger()
os.Setenv(ENV_CREATE_SA, "true")
CreateMissingPermissionForSA(ctx, kubernetesClient, logger)
// Get rolebinding for a service account
rolebindings, err := kubernetesClient.RbacV1().RoleBindings("default").List(ctx, metav1.ListOptions{})
if err != nil {
t.Fatal(err)
}
if len(rolebindings.Items) != 2 {
t.Fatal("Rolebinding not created", len(rolebindings.Items))
}
regexp := regexp.MustCompile(`fission\-(fetcher|builder)\-rolebinding\-[a-z0-9]{6}`)
for _, rolebinding := range rolebindings.Items {
if !regexp.Match([]byte(rolebinding.Name)) {
t.Fatal("Rolebinding not created for fission-builder or fission-fetcher", rolebinding.Name)
}
}
}