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: Add swift credentials and container name to common config #11256

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Helm: Add swift credentials and container name to common config #11256

merged 1 commit into from
Nov 29, 2023

Conversation

heytrav
Copy link
Contributor

@heytrav heytrav commented Nov 17, 2023 •
edited

What this PR does / why we need it:

Add swift to common config via helm.

Which issue(s) this PR fixes:

No issue

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@heytrav heytrav requested a review from a team as a code owner November 17, 2023 20:39
@CLAassistant
Copy link

CLAassistant commented Nov 17, 2023 •
edited

CLA assistant check
All committers have signed the CLA.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 17, 2023 •
edited

Trivy scan found the following vulnerabilities:

@heytrav heytrav changed the title Add Swift credentials and container name to common config Helm: Add swift credentials and container name to common config Nov 19, 2023
@heytrav
Copy link
Contributor Author

heytrav commented Nov 19, 2023

Note that I updated the helm/loki/CHANGELOG.md, but the version in helm/loki/Chart.yaml and helm/loki/README.md we're already incremented without a corresponding entry in the CHANGELOG.md. Please let me know if I should change my version to make everything match up.

@heytrav heytrav force-pushed the swift-storage-config branch 4 times, most recently from bf83167 to 3b2caf2 Compare November 20, 2023 21:31
@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 20, 2023
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 20, 2023
@pull-request-size pull-request-size bot added size/M and removed size/L labels Nov 20, 2023
@heytrav heytrav force-pushed the swift-storage-config branch 2 times, most recently from 6f26f14 to 411c701 Compare November 23, 2023 01:55
@MichelHollands
Copy link
Contributor

@heytrav Thanks for adding this. Yes, can you please use 5.39 everywhere?

@heytrav heytrav force-pushed the swift-storage-config branch 2 times, most recently from 9714da3 to 721f0fe Compare November 24, 2023 09:28
@MichelHollands
Copy link
Contributor

@heytrav Can you run make -C docs sources/setup/install/helm/reference.md and add the changes? Once that is done the CI should pass and I'll merge it.

@heytrav
Copy link
Contributor Author

heytrav commented Nov 24, 2023 •
edited

make -C docs sources/setup/install/helm/reference.md

I ran it like you said

❯ make -C docs sources/setup/install/helm/reference.md
make: Entering directory '/home/travis/repos/loki/docs'
make: 'sources/setup/install/helm/reference.md' is up to date.
make: Leaving directory '/home/travis/repos/loki/docs'
❯ git status
On branch swift-storage-config
Your branch is up to date with 'my-upstream/swift-storage-config'.

nothing to commit, working tree clean

It didn't actually make any changes.

...later that day

I did try deleting the file and re-ran the make command. It regenerated the file so I added and pushed that. Any idea why the CI is still pending?

@pull-request-size pull-request-size bot added size/M and removed size/L labels Nov 26, 2023
@github-actions github-actions bot removed the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 26, 2023
@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 26, 2023
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 26, 2023
@heytrav
Add Swift credentials and container name to common config via helm chart
fbc951b 
Accept swift as a storage type and add container credentials to storage_config.
* common storage
* ruler storage
* updated docs
MichelHollands
MichelHollands approved these changes Nov 29, 2023
View reviewed changes
Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

LGTM

@MichelHollands MichelHollands merged commit 1d232b8 into grafana:main Nov 29, 2023
10 checks passed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@heytrav @rhnasc
Helm: Add swift credentials and container name to common config (graf…
eed097a 
…ana#11256)

**What this PR does / why we need it**:

Add swift to common config via helm.

**Which issue(s) this PR fixes**:

No issue

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](grafana@0d4416a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichelHollands MichelHollands MichelHollands approved these changes

Assignees
No one assigned
Labels
area/helm size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@heytrav @CLAassistant @MichelHollands