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

feat: area/helm: Add support for missing default values to support ServerSideApply #11567

Merged
merged 18 commits into from
Feb 22, 2024
Merged

feat: area/helm: Add support for missing default values to support ServerSideApply #11567

merged 18 commits into from
Feb 22, 2024

Conversation

Sheikh-Abubaker
Copy link
Contributor

@Sheikh-Abubaker Sheikh-Abubaker commented Jan 2, 2024 •
edited
Loading

What this PR does / why we need it:
ServerSideApply is a feature in Grafana Loki that allows synchronization of Loki with external systems such as K8s or ArgoCD, when ServerSideApply is enabled, changes made in the external systems are applied to Loki's Configuration ensuring that Loki remains consistent with the desired state.
Which issue(s) this PR fixes:
Fixes #11560

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

@Sheikh-Abubaker
Added missing default values to support ServerSideApply
56b6cd8 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@Sheikh-Abubaker Sheikh-Abubaker requested a review from a team as a code owner January 2, 2024 13:02
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2024 •
edited
Loading

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-852becf (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-852becf (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-852becf -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-852becf on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

@Sheikh-Abubaker Sheikh-Abubaker changed the title Added missing default values to support ServerSideApply area/helm: Added missing default values to support ServerSideApply Jan 2, 2024
@Sheikh-Abubaker
Bumped Helm chart version
6295c80 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@pull-request-size pull-request-size bot added size/S and removed size/XS labels Jan 2, 2024
@Sheikh-Abubaker
Fixed lint error and conflicts
b97fe95 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@Sheikh-Abubaker
Resolved Conflicts
043ca6c 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@Sheikh-Abubaker
Resolved conflicts
cc87ecb 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@Sheikh-Abubaker
Resolved conflicts
435c09b 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@jeschkies
Copy link
Contributor

@Sheikh-Abubaker could you resolve the merge conflict

@Sheikh-Abubaker
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-loki …
480ff54 
…into ServerSideApply-pr
@Sheikh-Abubaker
Resolved conflicts
abe75e9 
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
@Sheikh-Abubaker
Copy link
Contributor Author

@Sheikh-Abubaker could you resolve the merge conflict

@jeschkies please checkout the latest commit.

@jeschkies jeschkies changed the title area/helm: Added missing default values to support ServerSideApply feat: area/helm: Added missing default values to support ServerSideApply Feb 22, 2024
@jeschkies jeschkies enabled auto-merge (squash) February 22, 2024 08:58
@jeschkies jeschkies merged commit 817c516 into grafana:main Feb 22, 2024
12 of 13 checks passed
@loki-gh-app loki-gh-app bot mentioned this pull request Mar 27, 2024
Closed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@Sheikh-Abubaker @MichelHollands
@jeschkies @rhnasc
feat: area/helm: Added missing default values to support ServerSideAp…
c4ead4b 
…ply (grafana#11567)

Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Co-authored-by: Karsten Jeschkies <karsten.jeschkies@grafana.com>
@Sheikh-Abubaker Sheikh-Abubaker changed the title feat: area/helm: Added missing default values to support ServerSideApply feat: area/helm: Add support for missing default values to support ServerSideApply Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeschkies jeschkies jeschkies approved these changes

@MichelHollands MichelHollands Awaiting requested review from MichelHollands

Assignees
No one assigned
Labels
area/helm size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add missing default values to support ServerSideApply
3 participants
@Sheikh-Abubaker @jeschkies @MichelHollands