Skip to content

Commit

Permalink
Merge branch 'main' into migrator-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
m00g3n authored Aug 20, 2024
2 parents 1b09b24 + 74f7687 commit f08eddb
Show file tree
Hide file tree
Showing 13 changed files with 502 additions and 48 deletions.
2 changes: 2 additions & 0 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/kyma-project/infrastructure-manager/internal/gardener/kubeconfig"
"github.com/kyma-project/infrastructure-manager/internal/gardener/shoot"
"github.com/pkg/errors"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
Expand All @@ -54,6 +55,7 @@ var (
func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
utilruntime.Must(infrastructuremanagerv1.AddToScheme(scheme))
utilruntime.Must(rbacv1.AddToScheme(scheme))
//+kubebuilder:scaffold:scheme
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
package fsm

import (
"context"
"slices"

authenticationv1alpha1 "github.com/gardener/gardener/pkg/apis/authentication/v1alpha1"
gardener_api "github.com/gardener/gardener/pkg/apis/core/v1beta1"
imv1 "github.com/kyma-project/infrastructure-manager/api/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/clientcmd"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
)

var (
//nolint:gochecknoglobals
labelsClusterRoleBindings = map[string]string{
"app": "kyma",
"reconciler.kyma-project.io/managed-by": "infrastructure-manager",
}
)

func sFnApplyClusterRoleBindings(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.Result, error) {
// prepare subresource client to request admin kubeconfig
srscClient := m.ShootClient.SubResource("adminkubeconfig")
shootAdminClient, err := GetShootClient(ctx, srscClient, s.shoot)
if err != nil {
updateCRBApplyFailed(&s.instance)
return updateStatusAndStopWithError(err)
}
// list existing cluster role bindings
var crbList rbacv1.ClusterRoleBindingList
if err := shootAdminClient.List(ctx, &crbList); err != nil {
updateCRBApplyFailed(&s.instance)
return updateStatusAndStopWithError(err)
}

removed := getRemoved(crbList.Items, s.instance.Spec.Security.Administrators)
missing := getMissing(crbList.Items, s.instance.Spec.Security.Administrators)

for _, fn := range []func() error{
newDelCRBs(ctx, shootAdminClient, removed),
newAddCRBs(ctx, shootAdminClient, missing),
} {
if err := fn(); err != nil {
updateCRBApplyFailed(&s.instance)
return updateStatusAndStopWithError(err)
}
}

s.instance.UpdateStateReady(
imv1.ConditionTypeRuntimeConfigured,
imv1.ConditionReasonConfigurationCompleted,
"kubeconfig admin access updated",
)
return updateStatusAndStop()
}

//nolint:gochecknoglobals
var GetShootClient = func(ctx context.Context,
adminKubeconfigClient client.SubResourceClient, shoot *gardener_api.Shoot) (client.Client, error) {
// request for admin kubeconfig with low expiration timeout
var req authenticationv1alpha1.AdminKubeconfigRequest
if err := adminKubeconfigClient.Create(ctx, shoot, &req); err != nil {
return nil, err
}

restConfig, err := clientcmd.RESTConfigFromKubeConfig(req.Status.Kubeconfig)
if err != nil {
return nil, err
}

shootClientWithAdmin, err := client.New(restConfig, client.Options{})
if err != nil {
return nil, err
}

return shootClientWithAdmin, nil
}

func isRBACUserKindOneOf(names []string) func(rbacv1.Subject) bool {
return func(s rbacv1.Subject) bool {
return s.Kind == rbacv1.UserKind &&
slices.Contains(names, s.Name)
}
}

func getRemoved(crbs []rbacv1.ClusterRoleBinding, admins []string) (removed []rbacv1.ClusterRoleBinding) {
// iterate over cluster role bindings to find out removed administrators
for _, crb := range crbs {
if !labels.Set(crb.Labels).AsSelector().Matches(labels.Set(labelsClusterRoleBindings)) {
// cluster role binding is not controlled by KIM
continue
}

if crb.RoleRef.Kind != "ClusterRole" && crb.RoleRef.Name != "cluster-admin" {
continue
}

index := slices.IndexFunc(crb.Subjects, isRBACUserKindOneOf(admins))
if index >= 0 {
// cluster role binding does not contain user subject
continue
}

// administrator was removed
removed = append(removed, crb)
}

return removed
}

//nolint:gochecknoglobals
var newContainsAdmin = func(admin string) func(rbacv1.ClusterRoleBinding) bool {
return func(crb rbacv1.ClusterRoleBinding) bool {
if !labels.Set(crb.Labels).AsSelector().Matches(labels.Set(labelsClusterRoleBindings)) {
return false
}
isAdmin := isRBACUserKindOneOf([]string{admin})
return slices.ContainsFunc(crb.Subjects, isAdmin)
}
}

func getMissing(crbs []rbacv1.ClusterRoleBinding, admins []string) (missing []rbacv1.ClusterRoleBinding) {
for _, admin := range admins {
containsAdmin := newContainsAdmin(admin)
if slices.ContainsFunc(crbs, containsAdmin) {
continue
}
crb := toAdminClusterRoleBinding(admin)
missing = append(missing, crb)
}

return missing
}

func toAdminClusterRoleBinding(name string) rbacv1.ClusterRoleBinding {
return rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "admin-",
Labels: labelsClusterRoleBindings,
},
Subjects: []rbacv1.Subject{{
Kind: rbacv1.UserKind,
Name: name,
APIGroup: rbacv1.GroupName,
}},
RoleRef: rbacv1.RoleRef{
APIGroup: rbacv1.GroupName,
Kind: "ClusterRole",
Name: "cluster-admin",
},
}
}

//nolint:gochecknoglobals
var newDelCRBs = func(ctx context.Context, shootClient client.Client, crbs []rbacv1.ClusterRoleBinding) func() error {
return func() error {
for _, crb := range crbs {
if err := shootClient.Delete(ctx, &crb); err != nil {
return err
}
}
return nil
}
}

//nolint:gochecknoglobals
var newAddCRBs = func(ctx context.Context, shootClient client.Client, crbs []rbacv1.ClusterRoleBinding) func() error {
return func() error {
for _, crb := range crbs {
if err := shootClient.Create(ctx, &crb); err != nil {
return err
}
}
return nil
}
}

func updateCRBApplyFailed(rt *imv1.Runtime) {
rt.UpdateStatePending(
imv1.ConditionTypeRuntimeConfigured,
imv1.ConditionReasonConfigurationErr,
string(metav1.ConditionFalse),
"failed to update kubeconfig admin access",
)
}
Loading

0 comments on commit f08eddb

Please sign in to comment.