Bundle ServiceMonitor CRD with the chart#11261
Merged
aanm merged 2 commits intocilium:masterfrom May 29, 2020
Merged
Conversation
michi-covalent
approved these changes
Apr 30, 2020
Contributor
michi-covalent
left a comment
There was a problem hiding this comment.
thank you for taking care of this
aanm
requested changes
Apr 30, 2020
Member
|
Discussed offline how to fix this. Waiting for implementation. |
This allows installing Cilium with service monitor enabled even if Prometheus hasn't been installed yet. By including the ServiceMonitor CRD under `crds/` directory we ensure that Helm will install it first iff the cluster has no existing ServiceMonitor CRD. This behavior is documented at https://helm.sh/docs/topics/charts/#custom-resource-definitions-crds This requires Helm 3; Helm 2 will ignore the crds/ directory. Signed-off-by: Ilya Shaisultanov <ilya.shaisultanov@gmail.com>
3a3de8f to
e8ded27
Compare
|
Commit e8ded27aa4777a42274f0ae802399c5b255cbe47 does not contain "Signed-off-by". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
Signed-off-by: Ilya Shaisultanov <ilya.shaisultanov@gmail.com>
e8ded27 to
f991681
Compare
aanm
approved these changes
May 28, 2020
Member
|
test-me-please |
|
Commit b39b02eeac49be097f162ba7bb3b7a92fc21adca does not contain "Signed-off-by". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
b39b02e to
f991681
Compare
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This allows installing Cilium with service monitor enabled
even if Prometheus hasn't been installed yet.
By including the ServiceMonitor CRD under
crds/directory we ensurethat Helm will install it first iff the cluster has no existing
ServiceMonitor CRD. This behavior is documented at
https://helm.sh/docs/topics/charts/#custom-resource-definitions-crds
Fixed errors such as
This requires Helm 3; Helm 2 will ignore the crds/ directory. The CRD is copied from this commit of the helm/charts repo.
Signed-off-by: Ilya Shaisultanov ilya.shaisultanov@gmail.com
Please ensure your pull request adheres to the following guidelines:
description and a
Fixes: #XXXline if the commit addresses a particularGitHub issue.
Fixes: #issue-number