Merged
Conversation
hervenicol
reviewed
Mar 2, 2026
Contributor
There was a problem hiding this comment.
The logic in pseudocode currently looks like this:
if s3 AND s3accessKey:
| configure S3 explicit keys
else if s3:
| configure s3 IRSA
else if azure:
| if crossplane:
| | configure azure crossplane
| else:
| | configure azure manual
else:
| error
Could we have a similar structure for s3 and azure?
Meaning, either we have 2-level tests
if s3
| if explicit-keys
or we keep it all 1-level:
if s3 AND explicit-keys
...but we do the same for all providers.
Contributor
Author
There was a problem hiding this comment.
We probably can yes
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
2 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 pull request refactors and improves the CNPG (CloudNativePG) Helm chart templates for Grafana, focusing on how object store credentials are handled for backup and recovery. The main changes include introducing a new helper template to centralize credential logic, splitting backup and recovery object store manifests into separate files, and updating documentation and comments for clarity. These changes make the chart easier to maintain, extend, and configure for different storage backends and provisioning methods.
CNPG template improvements and refactoring:
cnpg/_helpers.tplwith the functiongrafana.cnpg.objectStoreCredentialsto centralize and simplify credential configuration for S3 and Azure object stores, supporting both manual and Crossplane-provisioned setups.objectstores.yamlinto two separate manifests:objectstore-backup.yamlandobjectstore-recovery.yaml, each using the new helper for credentials and improving readability and maintainability. [1] [2] [3]