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

helm: fix broken topology spread constraints in metamonitoring's GrafanaAgent #9669

Merged
merged 3 commits into from
Oct 18, 2024

Conversation

narqo
Copy link
Contributor

@narqo narqo commented Oct 18, 2024

What this PR does

This PR fixes a broken indentation in the topologySpreadConstraints inside the GrafanaAgent CRD, introduced in #8670. The CRD's specification is defined here. It requires the field to be the direct child of the spec field.

Which issue(s) this PR fixes or relates to

Fixes #9638

Notes: this needs to be backported to the 5.5 release branch.

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@narqo narqo requested a review from a team as a code owner October 18, 2024 10:39
@narqo narqo force-pushed the vldmr/helm-grafana-agent-topology-spread branch from 4665ef5 to 647f69c Compare October 18, 2024 10:42
narqo added 3 commits October 18, 2024 13:58
Signed-off-by: Vladimir Varankin <[email protected]>
Signed-off-by: Vladimir Varankin <[email protected]>
@narqo narqo force-pushed the vldmr/helm-grafana-agent-topology-spread branch from 647f69c to 47b1e54 Compare October 18, 2024 11:59
@narqo narqo enabled auto-merge (squash) October 18, 2024 12:00
@narqo narqo merged commit 0d3f52f into main Oct 18, 2024
33 checks passed
@narqo narqo deleted the vldmr/helm-grafana-agent-topology-spread branch October 18, 2024 12:16
@grafanabot
Copy link
Contributor

The backport to mimir-distributed-release-5.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9669-to-mimir-distributed-release-5.5 origin/mimir-distributed-release-5.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 0d3f52f74245d6ee1e20e5a6b8453000108b6543
# Push it to GitHub
git push --set-upstream origin backport-9669-to-mimir-distributed-release-5.5
git switch main
# Remove the local backport branch
git branch -D backport-9669-to-mimir-distributed-release-5.5

Then, create a pull request where the base branch is mimir-distributed-release-5.5 and the compare/head branch is backport-9669-to-mimir-distributed-release-5.5.

narqo added a commit that referenced this pull request Oct 18, 2024
…anaAgent (#9669)

* helm: fix indentation in metamonitoring's topologySpreadConstraints
* rebuild assets
* update CHANGELOG

Signed-off-by: Vladimir Varankin <[email protected]>
(cherry picked from commit 0d3f52f)
narqo added a commit that referenced this pull request Oct 18, 2024
…anaAgent (#9669)

* helm: fix indentation in metamonitoring's topologySpreadConstraints
* rebuild assets
* update CHANGELOG

(cherry picked from commit 0d3f52f)

Signed-off-by: Vladimir Varankin <[email protected]>
narqo added a commit that referenced this pull request Oct 18, 2024
…anaAgent (#9669) (#9670)

* helm: fix indentation in metamonitoring's topologySpreadConstraints
* rebuild assets
* update CHANGELOG

(cherry picked from commit 0d3f52f)

Signed-off-by: Vladimir Varankin <[email protected]>
narqo added a commit that referenced this pull request Oct 21, 2024
* fix: add mimir upgrade in the changelog (#9621) (#9623)

* fix: add mimir upgrade in the changelog

This PR fixes the changelog by setting the correct memcached version and add the changelog for mimir 2.14.0

* Update operations/helm/charts/mimir-distributed/CHANGELOG.md

---------

Co-authored-by: Vladimir Varankin <[email protected]>
(cherry picked from commit 4a73545)

Co-authored-by: Quentin Bisson <[email protected]>

* helm: fix broken topology spread constraints in metamonitoring's GrafanaAgent (#9669) (#9670)

* helm: fix indentation in metamonitoring's topologySpreadConstraints
* rebuild assets
* update CHANGELOG

(cherry picked from commit 0d3f52f)

Signed-off-by: Vladimir Varankin <[email protected]>

* helm: prepare release 5.5.1 (#9676)

* helm: bump patch version

Signed-off-by: Vladimir Varankin <[email protected]>

* rebuild assets

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
Co-authored-by: Grot (@grafanabot) <[email protected]>
Co-authored-by: Quentin Bisson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mimir helm chart 5.5.0 fails (ArgoCD outofsync or unknown field)
3 participants