forked from kubernetes-sigs/prometheus-adapter
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
Merge to latest upstream #25
Merged
openshift-merge-robot
merged 11 commits into
openshift:master
from
smarterclayton:merge
Apr 17, 2020
Merged
Merge to latest upstream #25
openshift-merge-robot
merged 11 commits into
openshift:master
from
smarterclayton:merge
Apr 17, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Small typo in config example snippet
Ability to filter metrics according to labels provided
Makefile, go.mod: bump to 1.13
Pick up changes to 1.17 to custom-metrics-apiserver and the latest changes in metrics-server to allow us to show table results for podmetrics and nodemetrics. Fix import and interface changes as necessary. The localvendor directory is an artifact of a change in sigs.k8s.io: sigs.k8s.io/metrics-server now requires this dependency in order to resolve, even though we do not use the scraper package. go: sigs.k8s.io/metrics-server@v0.3.7 requires k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1@v0.0.0: reading k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/pkg/kubelet/apis/stats/v1alpha1/go.mod at revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0: unknown revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0
…r_upstream *: Update to sigs.k8s.io/metrics-server latest
Pick up changes to pod and node metrics to make them client CLI listable. Update Makefile to use -mod vendor as is standard for openshift, and bump vendor directory.
/assign @s-urbaniak Replaces #23 |
Closed
1 task
15 tasks
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: s-urbaniak, smarterclayton The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Indicates a PR has been approved by an approver from all required OWNERS files.
label
Apr 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Picks up changes from metrics-server that allow us to run
oc get podmetrics
and get back a list of pod metrics natively.