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

[CONTINT-4500] Add EKS Clusterrole Rule for EKS control plane metrics #1651

Closed
wants to merge 8 commits into from
Closed

[CONTINT-4500] Add EKS Clusterrole Rule for EKS control plane metrics #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1c8553
Add rule to clusterrole so the node agent can query the EKS control p…
justin-lesko Feb 3, 2025
147964f
Add clusterrole rule to agent, and remove it from cluster agent
justin-lesko Feb 3, 2025
752d211
Fix typo in EksMetricsApiGroup constant
justin-lesko Feb 3, 2025
1be9114
Fix casing on EKS related variables
justin-lesko Feb 3, 2025
2328a9c
Rename function to reflect proper EKS casing
justin-lesko Feb 4, 2025
68da06c
Merge branch 'main' into justin/CONTINT-4500_add-eks-rule-to-clusterrole
levan-m Feb 6, 2025
4eafe94
Merge branch 'main' into justin/CONTINT-4500_add-eks-rule-to-clusterrole
levan-m Feb 6, 2025
3aadc5f
Merge branch 'main' into justin/CONTINT-4500_add-eks-rule-to-clusterrole
justin-lesko Feb 6, 2025
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
16 changes: 16 additions & 0 deletions internal/controller/datadogagent/feature/enabledefault/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func getDefaultAgentClusterRolePolicyRules(excludeNonResourceRules bool) []rbacv
getKubeletPolicyRule(),
getEndpointsPolicyRule(),
getLeaderElectionPolicyRule(),
getEKSControlPlaneMetricsPolicyRule(),
}

if !excludeNonResourceRules {
Expand All @@ -35,6 +36,19 @@ func getDefaultAgentClusterRolePolicyRules(excludeNonResourceRules bool) []rbacv
return policyRule
}

func getEKSControlPlaneMetricsPolicyRule() rbacv1.PolicyRule {
return rbacv1.PolicyRule{
APIGroups: []string{rbac.EKSMetricsAPIGroup},
Resources: []string{
rbac.EKSKubeControllerManagerMetrics,
rbac.EKSKubeSchedulerMetrics,
},
Verbs: []string{
rbac.GetVerb,
},
}
}

func getMetricsEndpointPolicyRule() rbacv1.PolicyRule {
return rbacv1.PolicyRule{
NonResourceURLs: []string{
Expand Down Expand Up @@ -286,6 +300,8 @@ func getDefaultClusterChecksRunnerClusterRolePolicyRules(dda metav1.Object, excl
rbac.GetVerb,
},
},
// EKS kube_scheduler and kube_controller_manager control plane metrics
getEKSControlPlaneMetricsPolicyRule(),
}

if !excludeNonResourceRules {
Expand Down
4 changes: 3 additions & 1 deletion pkg/kubernetes/rbac/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
RbacAPIGroup = "rbac.authorization.k8s.io"
RegistrationAPIGroup = "apiregistration.k8s.io"
StorageAPIGroup = "storage.k8s.io"
EKSMetricsAPIGroup = "metrics.eks.amazonaws.com"

// Resources

Expand Down Expand Up @@ -85,7 +86,8 @@ const (
VolumeAttachments = "volumeattachments"
VPAResource = "verticalpodautoscalers"
WpaResource = "watermarkpodautoscalers"

EKSKubeControllerManagerMetrics = "kcm/metrics"
EKSKubeSchedulerMetrics = "ksh/metrics"
// Non resource URLs

HealthzURL = "/healthz"
Expand Down
Loading