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

add prometheus-adapter CRD #5

Merged
merged 1 commit into from
Mar 15, 2021
Merged

add prometheus-adapter CRD #5

merged 1 commit into from
Mar 15, 2021

Conversation

paulfantom
Copy link
Collaborator

Blocked by an external factor. I'll drive upstream changes first and come back to this when those are ready.

Signed-off-by: paulfantom pawel@krupa.net.pl

Port int `json:"port,omitempty"`
// Configuration of prometheus-adapter in the same form as in
// +optional
Config promadapter.MetricsDiscoveryConfig `json:"config,omitempty"` // TODO: requires https://github.com/kubernetes-sigs/prometheus-adapter/pull/372
Copy link
Owner

Choose a reason for hiding this comment

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

I was thinking about this earlier, and I wasn't sure how to do it, but this is brilliant that this works.

Copy link
Collaborator Author

@paulfantom paulfantom Feb 22, 2021

Choose a reason for hiding this comment

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

There is a problem of including external APIs defined with yaml tags instead of json ones. It seems controller-gen fails to generate CRD when json tag is not defined. This problem can be seen here (but I think we can change it upstream) and for example in blackbox-exporter:

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

More about blackbox thingy in #7

@paulfantom paulfantom force-pushed the prometheus-adapter branch 2 times, most recently from ddaea9a to 6017082 Compare March 15, 2021 13:23
@paulfantom paulfantom changed the title WIP: add prometheus-adapter CRD add prometheus-adapter CRD Mar 15, 2021
@paulfantom
Copy link
Collaborator Author

kubernetes-sigs/prometheus-adapter#372 was merged so I rebased it to fix merge conflicts and now this is done.

Signed-off-by: paulfantom <pawel@krupa.net.pl>
@paulfantom paulfantom merged commit 2d38a0e into main Mar 15, 2021
@paulfantom paulfantom deleted the prometheus-adapter branch March 15, 2021 13:28
@brancz
Copy link
Owner

brancz commented Mar 16, 2021

Amazing!

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