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

Jump to bottom

Updates deploy/manifest to latest version in sync with kube-prom #531

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Updates deploy/manifest to latest version in sync with kube-prom #531

merged 2 commits into from
Nov 9, 2022

Conversation

JoaoBraveCoding
Copy link
Contributor

Issue #426

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 2, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @JoaoBraveCoding!

It looks like this is your first PR to kubernetes-sigs/prometheus-adapter 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/prometheus-adapter has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @JoaoBraveCoding. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 2, 2022
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 2, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 2, 2022
dgrisonnet
dgrisonnet reviewed Sep 2, 2022
View reviewed changes
Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

We should also consider updating the README and the Walkthrough, they still have references to the old manifests.

Also, something we could consider doing in the future would be to set up a simple CI job that would check that the manifests are getting applied in a cluster properly and that prometheus-adapter is running. Ideally we should do that during the e2e tests but since we don't have any, just a simple check verifying that the pod is running would be a great start.

deploy/manifests/api-service.yaml Outdated Show resolved Hide resolved
deploy/manifests/config-map.yaml Show resolved Hide resolved
@JoaoBraveCoding
Copy link
Contributor Author

@dgrisonnet while upgrading de Walkthrough, I modified the version of the HPA created to v2beta2 since v2beta1 is unavailable on 1.25+. However, in v2beta2 if we configure the HPA to scale on pod metrics then it will look for pod metrics under the API pod.custom.metrics.k8s.io while v2beta1 looks for them under custom.metrics.k8s.io. Does this mean that in 1.25+ if we want to HPA with custom metrics using the adapter then we will have to register an APIService that will service metrics under pod.custom.metrics.k8s.io instead of the usual custom.metrics.k8s.io, is this the correct way of doing things or am I missing something?

@JoaoBraveCoding
Copy link
Contributor Author

@dgrisonnet while upgrading de Walkthrough, I modified the version of the HPA created to v2beta2 since v2beta1 is unavailable on 1.25+. However, in v2beta2 if we configure the HPA to scale on pod metrics then it will look for pod metrics under the API pod.custom.metrics.k8s.io while v2beta1 looks for them under custom.metrics.k8s.io. Does this mean that in 1.25+ if we want to HPA with custom metrics using the adapter then we will have to register an APIService that will service metrics under pod.custom.metrics.k8s.io instead of the usual custom.metrics.k8s.io, is this the correct way of doing things or am I missing something?

I think I got it working, will submit an update to the PR soon

@JoaoBraveCoding
Copy link
Contributor Author

Also, something we could consider doing in the future would be to set up a simple CI job that would check that the manifests are getting applied in a cluster properly and that prometheus-adapter is running. Ideally, we should do that during the e2e tests but since we don't have any, just a simple check verifying that the pod is running would be a great start.

100% agree, I could also help with that but I would prefer to do it in a follow-up PR if it's OK, if you want I can create an issue for it.

In the future, we could make the different setup configurable via jsonnet, but for now, let's just stick to the default use-case.

Also agree that this would be nice, I'm happy to also help with it in a followup

dgrisonnet
dgrisonnet reviewed Oct 21, 2022
View reviewed changes
Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

One last comment and we are good to go 🎉

olivierlemasle
olivierlemasle reviewed Nov 7, 2022
View reviewed changes
Copy link
Member

@olivierlemasle olivierlemasle left a comment

Choose a reason for hiding this comment

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

Thanks @JoaoBraveCoding!
There's a small error in the adapter-config ConfigMap: instance -> node

deploy/manifests/config-map.yaml Outdated Show resolved Hide resolved
@JoaoBraveCoding
Updates README, docs/walkthrough and deploy/
372dfc9 
Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>
olivierlemasle
olivierlemasle approved these changes Nov 8, 2022
View reviewed changes
Copy link
Member

@olivierlemasle olivierlemasle left a comment

Choose a reason for hiding this comment

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

/ok-to-test
/lgtm

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 8, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2022
@dgrisonnet
Copy link
Member

Great work, thanks @JoaoBraveCoding!

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, JoaoBraveCoding, olivierlemasle

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2022
@k8s-ci-robot k8s-ci-robot merged commit 268b2a8 into kubernetes-sigs:master Nov 9, 2022
@dgrisonnet dgrisonnet mentioned this pull request Dec 1, 2022
Closed
@olivierlemasle olivierlemasle mentioned this pull request Dec 18, 2022
Merged
@dgrisonnet dgrisonnet mentioned this pull request Jul 25, 2023
Closed
monitoring-commit-bot bot pushed a commit to rhobs/k8s-prometheus-adapter that referenced this pull request Aug 10, 2023
@github-actions
Merge tag 'refs/tags/v0.11.0'
87aacbe 
Changes since v0.10.0

Logging flags that are klog specific (`--log-dir`, `--log-file`, `--logtostderr`, `--alsologtostderr`, `--one-output`, `--stderrthreshold`, `--log-file-max-size`, `--skip-log-headers`, `--add-dir-header`, `--skip-headers`, `--log-backtrace-at`) were deprecated in v0.10.0 and are now **removed**.

Improvements

* Bump go to 1.20 and k8s deps to 0.27.2 (kubernetes-sigs#586, @dgrisonnet)
* Add support for OpenAPI v3 (kubernetes-sigs#586, @dgrisonnet)
* Update registry location to registry.k8s.io in the manifests (kubernetes-sigs#529, @dgrisonnet)
* Update manifests in deploy/manifests to be in sync with the one in kube-prometheus (kubernetes-sigs#531, @JoaoBraveCoding)
* Use golangci-lint to lint the codebase (kubernetes-sigs#540, @olivierlemasle)
* Set MinVersion: tls.VersionTLS12 in prometheus client's TLSClientConfig (kubernetes-sigs#544, @olivierlemasle)
* Refactor adding logging flags (kubernetes-sigs#546, @olivierlemasle)

Bug fixes

* Fix segfault when using --prometheus-token-file (kubernetes-sigs#538, @olivierlemasle)

Documentation

* Fix broken links in README.md (kubernetes-sigs#518, @sillyfrog)
* Fix yaml in sample config & docs (kubernetes-sigs#559, @asherf)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgrisonnet dgrisonnet dgrisonnet left review comments

@olivierlemasle olivierlemasle olivierlemasle approved these changes

Assignees

@olivierlemasle olivierlemasle

@dgrisonnet dgrisonnet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JoaoBraveCoding @k8s-ci-robot @dgrisonnet @olivierlemasle