Skip to content

feat: enhance NewResourceUsageGatherer to support pod label selectors #23

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

Draft
sanamsarath wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: enhance NewResourceUsageGatherer to support pod label selectors #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions clusterloader2/pkg/measurement/util/gatherers/container_resource_gatherer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func isDaemonPod(pod *corev1.Pod) bool {
}

// NewResourceUsageGatherer creates new instance of ContainerResourceGatherer
func NewResourceUsageGatherer(c clientset.Interface, host string, port int, provider provider.Provider, options ResourceGathererOptions, namespace string) (*ContainerResourceGatherer, error) {
func NewResourceUsageGatherer(c clientset.Interface, host string, port int, provider provider.Provider, options ResourceGathererOptions, namespace string, podLabelSelector ...string) (*ContainerResourceGatherer, error) {
g := ContainerResourceGatherer{
client: c,
isRunning: true,
Expand All @@ -103,12 +103,31 @@ func NewResourceUsageGatherer(c clientset.Interface, host string, port int, prov
provider: provider,
})
} else {
listOptions := metav1.ListOptions{ResourceVersion: "0"}
pods, err := c.CoreV1().Pods(namespace).List(context.TODO(), listOptions)
if err != nil {
return nil, fmt.Errorf("listing pods error: %v", err)
var pods []corev1.Pod
podListOptions := metav1.ListOptions{
ResourceVersion: "0",
}
if len(podLabelSelector) > 0 {
for _, label := range podLabelSelector {
podListOptions = metav1.ListOptions{
LabelSelector: label,
ResourceVersion: "0",
}
podList, err := c.CoreV1().Pods(namespace).List(context.Background(), podListOptions)
if err != nil {
return nil, fmt.Errorf("listing pods error: %v", err)
}
pods = append(pods, podList.Items...)
}
} else {
podList, err := c.CoreV1().Pods(namespace).List(context.Background(), podListOptions)
if err != nil {
return nil, fmt.Errorf("listing pods error: %v", err)
}
pods = podList.Items
}

listOptions := metav1.ListOptions{ResourceVersion: "0"}
nodeList, err := c.CoreV1().Nodes().List(context.TODO(), listOptions)
if err != nil {
return nil, fmt.Errorf("listing nodes error: %v", err)
Expand All @@ -122,7 +141,7 @@ func NewResourceUsageGatherer(c clientset.Interface, host string, port int, prov
}

nodesToConsider := make(map[string]bool)
for _, pod := range pods.Items {
for _, pod := range pods {
if (options.Nodes == MasterAndNonDaemons) && !masterNodes.Has(pod.Spec.NodeName) && isDaemonPod(&pod) {
continue
}
Expand Down