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

feat(chart): Add servicemonitor #517

Merged
merged 1 commit into from
Oct 25, 2021

Conversation

stevehipwell
Copy link
Contributor

Fixes #516.

Description of changes:

  • Add Service resource if enableSqsTerminationDraining=true and enablePrometheusServer=true
  • Add serviceMonitor config to allow the creation of a ServiceMonitor resource via serviceMonitor.enabled=true if enableSqsTerminationDraining=true and enablePrometheusServer=true
  • Only create a PodMonitor resource via podMonitor.enabled=true if enableSqsTerminationDraining=false and enablePrometheusServer=true

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
@stevehipwell
Copy link
Contributor Author

/assign @bwagner5

@stevehipwell
Copy link
Contributor Author

@bwagner5 I've spotted a number of issues with the Helm chart that should probably be tidied up, would you be interested in a PR for that after this has been merged?

Copy link
Contributor

@brycahta brycahta left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Looks good

/approve

@@ -100,6 +95,11 @@ Parameter | Description | Default
`workers` | The maximum amount of parallel event processors | `10`
`replicas` | The number of replicas in the NTH deployment when using queue-processor mode (NOTE: increasing replicas may cause duplicate webhooks since NTH pods are stateless) | `1`
`podDisruptionBudget` | Limit the disruption for controller pods, requires at least 2 controller replicas | `{}`
`serviceMonitor.create` | If `true`, create a ServiceMonitor (this requires enableSqsTerminationDraining and enablePrometheusServer to be set) | `false`
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: you don't need to include the bit about enableSqsTerminationDraining because these configs are in their respective sections already(QP vs IMDS)

@bwagner5
Copy link
Contributor

@bwagner5 I've spotted a number of issues with the Helm chart that should probably be tidied up, would you be interested in a PR for that after this has been merged?

Yes, absolutely! :) thanks

@stevehipwell
Copy link
Contributor Author

Yes, absolutely! :) thanks

@bwagner5 I'll wait for this to be merged and then open a new PR based on the updated main branch.

Copy link
Contributor

@bwagner5 bwagner5 left a comment

Choose a reason for hiding this comment

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

thanks! lgtm

@bwagner5 bwagner5 merged commit 10d5853 into aws:main Oct 25, 2021
@stevehipwell stevehipwell deleted the helm-chart-service-monitor branch October 25, 2021 14:43
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.

Add ServiceMonitor to chart for queue processing mode
3 participants