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.

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

prometheus-adapter: add nodes resource to aggregated-metrics-reader #384

Merged
merged 2 commits into from
Jan 22, 2020

Conversation

s-urbaniak
Copy link
Contributor

This effectively backports kubernetes-sigs/metrics-server#297 here. We also need it to fix https://bugzilla.redhat.com/show_bug.cgi?id=1723662.

@s-urbaniak
Copy link
Contributor Author

@@ -191,7 +191,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local rules =
policyRule.new() +
policyRule.withApiGroups(['metrics.k8s.io']) +
policyRule.withResources(['pods']) +
policyRule.withResources(['pods', 'nodes']) +
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't this also need aggregate-to-cluster-reader or is that an openshift thing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed an openshift thing, we need to augment that aggregation in CMO (after merging and pulling this in).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack

@brancz brancz merged commit 269aef6 into prometheus-operator:master Jan 22, 2020
@s-urbaniak s-urbaniak deleted the agg branch January 22, 2020 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants