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

chore: narrow the RBAC permissions used by the autoscaler #2039

Merged
merged 7 commits into from
Dec 20, 2024
Merged

chore: narrow the RBAC permissions used by the autoscaler #2039

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bc87f0
chore(autoscaler): removed deployment from cluster role
blumamir Dec 19, 2024
099a473
chore(autoscaler): remove service from clusterrole
blumamir Dec 19, 2024
6f13383
chore: narrow RBAC permissions to just what we use
blumamir Dec 19, 2024
6d74bc5
chore: update helm autoscaler rbac
blumamir Dec 20, 2024
582aed1
revert: irrelevant change
blumamir Dec 20, 2024
5e712e4
revert: bring back namespace to roles in helm
blumamir Dec 20, 2024
7163579
Merge branch 'main' into autoscaler-rbac
blumamir Dec 20, 2024
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
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ cli-diagnose:
@echo "Diagnosing cluster data for debugging"
cd ./cli ; go run -tags=embed_manifests . diagnose

.PHONY: helm-install
helm-install:
@echo "Installing odigos using helm"
helm upgrade --install odigos ./helm/odigos --create-namespace --namespace odigos-system --set image.tag=$(ODIGOS_CLI_VERSION)
kubectl label namespace odigos-system odigos.io/system-object="true"

.PHONY: api-all
api-all:
make -C api all
Expand Down
34 changes: 32 additions & 2 deletions autoscaler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

apiactions "github.com/odigos-io/odigos/api/actions/v1alpha1"
observabilitycontrolplanev1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
"github.com/odigos-io/odigos/common"

"github.com/odigos-io/odigos/autoscaler/controllers"
Expand All @@ -72,7 +72,7 @@ var (

func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
utilruntime.Must(observabilitycontrolplanev1.AddToScheme(scheme))
utilruntime.Must(odigosv1.AddToScheme(scheme))
utilruntime.Must(apiactions.AddToScheme(scheme))
//+kubebuilder:scaffold:scheme
}
Expand Down Expand Up @@ -157,6 +157,36 @@ func main() {
&corev1.Secret{}: {
Field: nsSelector,
},
&odigosv1.CollectorsGroup{}: {
Field: nsSelector,
},
&odigosv1.Destination{}: {
Field: nsSelector,
},
&odigosv1.Processor{}: {
Field: nsSelector,
},
&apiactions.AddClusterInfo{}: {
Field: nsSelector,
},
&apiactions.DeleteAttribute{}: {
Field: nsSelector,
},
&apiactions.ErrorSampler{}: {
Field: nsSelector,
},
&apiactions.LatencySampler{}: {
Field: nsSelector,
},
&apiactions.PiiMasking{}: {
Field: nsSelector,
},
&apiactions.ProbabilisticSampler{}: {
Field: nsSelector,
},
&apiactions.RenameAttribute{}: {
Field: nsSelector,
},
},
},
HealthProbeBindAddress: probeAddr,
Expand Down
202 changes: 70 additions & 132 deletions cli/cmd/resources/autoscaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ import (
)

const (
AutoScalerServiceAccountName = "odigos-autoscaler"
AutoScalerServiceName = "auto-scaler"
AutoScalerDeploymentName = "odigos-autoscaler"
AutoScalerAppLabelValue = "odigos-autoscaler"
AutoScalerContainerName = "manager"
AutoScalerDeploymentName = "odigos-autoscaler"
AutoScalerServiceAccountName = AutoScalerDeploymentName
AutoScalerAppLabelValue = AutoScalerDeploymentName
AutoScalerRoleName = AutoScalerDeploymentName
AutoScalerRoleBindingName = AutoScalerDeploymentName
AutoScalerClusterRoleName = AutoScalerDeploymentName
AutoScalerClusterRoleBindingName = AutoScalerDeploymentName
AutoScalerServiceName = "auto-scaler"
AutoScalerContainerName = "manager"
)

func NewAutoscalerServiceAccount(ns string) *corev1.ServiceAccount {
Expand All @@ -46,7 +50,7 @@ func NewAutoscalerRole(ns string) *rbacv1.Role {
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "odigos-autoscaler",
Name: AutoScalerRoleName,
Namespace: ns,
},
Rules: []rbacv1.PolicyRule{
Expand Down Expand Up @@ -117,8 +121,8 @@ func NewAutoscalerRole(ns string) *rbacv1.Role {
{
Verbs: []string{
"get",
"patch",
"update",
"list",
"watch",
},
APIGroups: []string{"apps"},
Resources: []string{"deployments/status"},
Expand All @@ -142,107 +146,14 @@ func NewAutoscalerRole(ns string) *rbacv1.Role {
APIGroups: []string{""},
Resources: []string{"secrets"},
},
},
}
}

func NewAutoscalerRoleBinding(ns string) *rbacv1.RoleBinding {
return &rbacv1.RoleBinding{
TypeMeta: metav1.TypeMeta{
Kind: "RoleBinding",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "odigos-autoscaler",
Namespace: ns,
},
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
Name: "odigos-autoscaler",
},
},
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "Role",
Name: "odigos-autoscaler",
},
}
}

func NewAutoscalerClusterRole() *rbacv1.ClusterRole {
return &rbacv1.ClusterRole{
TypeMeta: metav1.TypeMeta{
Kind: "ClusterRole",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "odigos-autoscaler",
},
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{""},
Resources: []string{"configmaps"},
},
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{""},
Resources: []string{"services"},
},
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{"apps"},
Resources: []string{"daemonsets"},
},
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{"apps"},
Resources: []string{"deployments"},
},
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"instrumentationconfigs"},
}, {
Verbs: []string{
"create",
"delete",
"get",
"list",
"patch",
"update",
"watch",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"collectorsgroups"},
},
{
Verbs: []string{
"update",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"collectorsgroups/finalizers"},
Resources: []string{"destinations"},
},
{
Verbs: []string{
Expand All @@ -251,20 +162,7 @@ func NewAutoscalerClusterRole() *rbacv1.ClusterRole {
"update",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"collectorsgroups/status"},
},
{
Verbs: []string{
"create",
"delete",
"get",
"list",
"patch",
"update",
"watch",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"destinations"},
Resources: []string{"destinations/status"},
},
{
Verbs: []string{
Expand All @@ -280,46 +178,86 @@ func NewAutoscalerClusterRole() *rbacv1.ClusterRole {
},
{
Verbs: []string{
"update",
"watch",
"get",
"list",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"destinations/finalizers"},
APIGroups: []string{"actions.odigos.io"},
Resources: []string{"addclusterinfos", "deleteattributes", "renameattributes", "probabilisticsamplers", "piimaskings", "latencysamplers", "errorsamplers"},
},
{
Verbs: []string{
"get",
"patch",
"update",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"destinations/status"},
APIGroups: []string{"actions.odigos.io"},
Resources: []string{"addclusterinfos/status", "deleteattributes/status", "renameattributes/status", "probabilisticsamplers/status", "piimaskings/status", "latencysamplers/status", "errorsamplers/status"},
},
{
Verbs: []string{
"watch",
"get",
"list",
"watch",
},
APIGroups: []string{"actions.odigos.io"},
Resources: []string{"addclusterinfos", "deleteattributes", "renameattributes", "probabilisticsamplers", "piimaskings", "latencysamplers", "errorsamplers"},
APIGroups: []string{"odigos.io"},
Resources: []string{"collectorsgroups"},
},
{
Verbs: []string{
"get",
"patch",
"update",
},
APIGroups: []string{"actions.odigos.io"},
Resources: []string{"addclusterinfos/status", "deleteattributes/status", "renameattributes/status", "probabilisticsamplers/status", "piimaskings/status", "latencysamplers/status", "errorsamplers/status"},
APIGroups: []string{"odigos.io"},
Resources: []string{"collectorsgroups/status"},
},
},
}
}

func NewAutoscalerRoleBinding(ns string) *rbacv1.RoleBinding {
return &rbacv1.RoleBinding{
TypeMeta: metav1.TypeMeta{
Kind: "RoleBinding",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: AutoScalerRoleBindingName,
Namespace: ns,
},
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
Name: AutoScalerServiceAccountName,
},
},
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "Role",
Name: AutoScalerRoleName,
},
}
}

func NewAutoscalerClusterRole() *rbacv1.ClusterRole {
return &rbacv1.ClusterRole{
TypeMeta: metav1.TypeMeta{
Kind: "ClusterRole",
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: AutoScalerClusterRoleName,
},
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{"odigos.io"},
Resources: []string{"odigosconfigurations"},
Resources: []string{"instrumentationconfigs"},
},
},
}
Expand All @@ -332,19 +270,19 @@ func NewAutoscalerClusterRoleBinding(ns string) *rbacv1.ClusterRoleBinding {
APIVersion: "rbac.authorization.k8s.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "odigos-autoscaler",
Name: AutoScalerClusterRoleBindingName,
},
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
Name: "odigos-autoscaler",
Name: AutoScalerServiceAccountName,
Namespace: ns,
},
},
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "ClusterRole",
Name: "odigos-autoscaler",
Name: AutoScalerClusterRoleName,
},
}
}
Expand All @@ -362,7 +300,7 @@ func NewAutoscalerLeaderElectionRoleBinding(ns string) *rbacv1.RoleBinding {
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
Name: "odigos-autoscaler",
Name: AutoScalerServiceAccountName,
},
},
RoleRef: rbacv1.RoleRef{
Expand Down Expand Up @@ -486,7 +424,7 @@ func NewAutoscalerDeployment(ns string, version string, imagePrefix string, imag
},
},
TerminationGracePeriodSeconds: ptrint64(10),
ServiceAccountName: "odigos-autoscaler",
ServiceAccountName: AutoScalerServiceAccountName,
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: ptrbool(true),
},
Expand Down
Loading
Loading