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

helm: Enrich serviceMonitor properties #170

Merged
merged 10 commits into from
Nov 13, 2023
Merged

helm: Enrich serviceMonitor properties #170

merged 10 commits into from
Nov 13, 2023

Conversation

jkroepke
Copy link
Contributor

@jkroepke jkroepke commented Nov 12, 2023 •
edited
Loading

Required for custom relabeling actions or istio deployments.

@jkroepke
helm: Enrich serviceMonitor properties
ab753b4 
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
@pierluigilenoci
Copy link
Contributor

@jkroepke, could you please add the ArtifactHub annotation here?
https://github.com/oauth2-proxy/manifests/blob/main/helm/oauth2-proxy/Chart.yaml#L35-L41

There are some missing default values here:
https://github.com/oauth2-proxy/manifests/blob/main/helm/oauth2-proxy/values.yaml#L362-L374

Specifically:

scheme
bearerTokenFile
tlsConfig

And an unused one, targetLabels.

So please fix your PR.

@pierluigilenoci
Copy link
Contributor

Documentation should also be updated with the changes.
https://github.com/oauth2-proxy/manifests/blob/main/helm/oauth2-proxy/README.md?plain=1#L204-L209

I apologize for the fragmented review.
To speed up, I'm making suggestions while busy with other tasks.
I hope I can be of help anyway.

@jkroepke
Copy link
Contributor Author

I hope I hit all your points

pierluigilenoci
pierluigilenoci reviewed Nov 13, 2023
View reviewed changes
Copy link
Contributor

@pierluigilenoci pierluigilenoci left a comment

Choose a reason for hiding this comment

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

I hope I hit all your points

Unfortunately not yet.

helm/oauth2-proxy/values.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
helm/oauth2-proxy/README.md Outdated Show resolved Hide resolved
helm/oauth2-proxy/ci/servicemonitor-values.yaml Outdated Show resolved Hide resolved
@ldunkum ldunkum mentioned this pull request Nov 13, 2023
Merged
@jkroepke
Copy link
Contributor Author

After #171, serviceMonitor is valid now.

please review.

@pierluigilenoci pierluigilenoci merged commit d93aac5 into oauth2-proxy:main Nov 13, 2023
1 check passed
@jkroepke jkroepke deleted the service-monitor branch December 10, 2023 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierluigilenoci pierluigilenoci pierluigilenoci approved these changes

@desaintmartin desaintmartin Awaiting requested review from desaintmartin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jkroepke @pierluigilenoci