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

Allow to specify ServiceMonitor annotations #635

Merged
merged 3 commits into from
Jan 13, 2022

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Sep 3, 2021

Usecase: When installing with ArgoCD, Prometheus operator
(and associated CRDs) may be missing.

Adding the following in the values will allow creating the other
resources:

serviceMonitor:
  annotations:
    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

Ref: https://argoproj.github.io/argo-cd/user-guide/sync-options/#skip-dry-run-for-new-custom-resources-types

@sathieu
Copy link
Contributor Author

sathieu commented Sep 3, 2021

@mkmik Please review.

NB: I've not bumped the chart minor version as this is a feature addition.

@sathieu
Copy link
Contributor Author

sathieu commented Dec 15, 2021

@juan131 Please review 🙏.

@juan131
Copy link
Collaborator

juan131 commented Dec 16, 2021

Thanks so much for your contribution @sathieu!!

We're performing a major refactorization of the chart at #687
Let's wait until this is done before continue with your changes

@juan131 juan131 self-assigned this Dec 16, 2021
@juan131 juan131 added this to Inbox in Sealed Secrets via automation Dec 16, 2021
@juan131 juan131 moved this from Inbox to Backlog in Sealed Secrets Dec 16, 2021
@juan131
Copy link
Collaborator

juan131 commented Dec 16, 2021

@sathieu the new major version was just released!

$ helm repo update sealed-secrets
Hang tight while we grab the latest from your chart repositories...
...Successfully got an update from the "sealed-secrets" chart repository
Update Complete. ⎈Happy Helming!⎈
$  helm search repo sealed-secrets/sealed-secrets
NAME                         	CHART VERSION	APP VERSION	DESCRIPTION
sealed-secrets/sealed-secrets	2.0.0        	v0.17.1    	Helm chart for the sealed-secrets controller.

Please feel to rebase this branch in your fork with the latest changes in the main branch, and update this PR.

@sathieu sathieu changed the title Allow to sepcify ServiceMonitor annotations Allow to specify ServiceMonitor annotations Dec 17, 2021
@sathieu
Copy link
Contributor Author

sathieu commented Dec 17, 2021

@juan131 Thanks. I've reworked and pushed the PR. Please review 🙏 !

Copy link
Collaborator

@juan131 juan131 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 rebasing and updating the PR! I appreciate it, just a minor comment.

helm/sealed-secrets/templates/servicemonitor.yaml Outdated Show resolved Hide resolved
@juan131 juan131 moved this from Backlog to In progress in Sealed Secrets Dec 23, 2021
Usecase: When installing with ArgoCD, Prometheus operator
(and associated CRDs) may be missing.

Adding the following in the values will allow creating the other
resources:

serviceMonitor:
  annotations:
    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

Ref: https://argoproj.github.io/argo-cd/user-guide/sync-options/#skip-dry-run-for-new-custom-resources-types
@sathieu
Copy link
Contributor Author

sathieu commented Jan 11, 2022

@juan131 Anything missing in this PR?

Copy link
Collaborator

@juan131 juan131 left a comment

Choose a reason for hiding this comment

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

LGTM!

helm/sealed-secrets/values.yaml Outdated Show resolved Hide resolved
helm/sealed-secrets/README.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@alvneiayu alvneiayu left a comment

Choose a reason for hiding this comment

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

LGTM

Avoid bumping chart version, it'll be bumped when including the new `v0.17.2` binaries
@juan131 juan131 merged commit 2b93897 into bitnami-labs:main Jan 13, 2022
Sealed Secrets automation moved this from In progress to Completed Jan 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Sealed Secrets
  
Completed
Development

Successfully merging this pull request may close these issues.

None yet

3 participants