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

Cut patch release v0.32.5 #6820

Merged
merged 9 commits into from Oct 19, 2023
Merged

Cut patch release v0.32.5 #6820

merged 9 commits into from Oct 19, 2023

Conversation

saswatamcode
Copy link
Member

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Cut patch release v0.32.5 with fixes #6802, #6816 and #6817.
This also ports certain commits, which allow us to build with latest go version and latest golang.org/x/net release, in-order to address CVE

Verification

saswatamcode and others added 8 commits October 18, 2023 10:39
@saswatamcode
Build with Go 1.21 (thanos-io#6615)
531b5e0 
* Build with Go 1.21

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Update tools

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
@coleenquadros @saswatamcode
update go alpine image to 3.18 (thanos-io#6750)
8562943 
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@dependabot @saswatamcode
build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805
fb28ce7 
)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions @fpetkovski @saswatamcode
Updates busybox SHA (thanos-io#6808)
b6bf619 
Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
@yeya24 @saswatamcode
Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)
4ed9bb0 
* fix matchersToPostingGroups vals variable shadow bug

Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
@thibaultmg @saswatamcode
fix head series limiter trigger (thanos-io#6802)
186b57a 
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
@MichaHoffmann @saswatamcode
Store: fix prometheus store label values for matches on external labe…
914426d 
…ls (thanos-io#6816)

External Labels should also be tested for matches against the matchers.

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
@saswatamcode
Cut patch release v0.32.5
fa0a0f8 
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
MichaHoffmann
MichaHoffmann approved these changes Oct 18, 2023
View reviewed changes
Copy link
Contributor

@MichaHoffmann MichaHoffmann left a comment

Choose a reason for hiding this comment

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

lgtm

MichaHoffmann
MichaHoffmann reviewed Oct 18, 2023
View reviewed changes
pkg/store/bucket_test.go Outdated
name: "name",
addAll: false,
addKeys: []string{"testbar"},
matchers: []*labels.Matcher{
Copy link
Contributor

Choose a reason for hiding this comment

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

oh what; posting group has no matchers

Copy link
Contributor

Choose a reason for hiding this comment

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

but it has on main; more commits might need to be cherry picked?

Copy link
Contributor

Choose a reason for hiding this comment

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

f6a3950#diff-3e2896fafa6ff73509c77df2c4389b68828e02575bb4fb78b6c34bcfb922a7ce this introduced the issue there, probably we dont need to cherry pick #6817 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ack! Not cherry picking this then @yeya24

yeya24
yeya24 approved these changes Oct 18, 2023
View reviewed changes
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

Thanks! Changes LGTM, just need to fix DCO

@saswatamcode
Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-…
6431fac 
…io#6817)"

This reverts commit 4ed9bb0.

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
@saswatamcode
Copy link
Member Author

Thanks, will merge this tomorrow, and complete the release! :)

@saswatamcode saswatamcode merged commit 750e8a9 into thanos-io:release-0.32 Oct 19, 2023
9 of 10 checks passed
GiedriusS pushed a commit that referenced this pull request Oct 19, 2023
@saswatamcode @coleenquadros
@dependabot @github-actions @fpetkovski @yeya24 @thibaultmg @MichaHoffmann
Cut patch release v0.32.5 (#6820) (#6822)
14953cd 
* Build with Go 1.21 (#6615)

* Build with Go 1.21



* Update tools



---------



* update go alpine image to 3.18 (#6750)



* build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (#6805)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...




* Updates busybox SHA (#6808)




* Fix matchersToPostingGroups vals variable shadow bug (#6817)

* fix matchersToPostingGroups vals variable shadow bug



* update changelog



---------



* fix head series limiter trigger (#6802)



* Store: fix prometheus store label values for matches on external labels (#6816)

External Labels should also be tested for matches against the matchers.



* Cut patch release v0.32.5



* Revert "Fix matchersToPostingGroups vals variable shadow bug (#6817)"

This reverts commit 4ed9bb0.



---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
coleenquadros added a commit to coleenquadros/thanos that referenced this pull request Oct 19, 2023
@saswatamcode @coleenquadros
@dependabot @github-actions @fpetkovski @yeya24 @thibaultmg @MichaHoffmann
Cut patch release v0.32.5 (thanos-io#6820) (thanos-io#6822)
4af4d32 
* Build with Go 1.21 (thanos-io#6615)

* Build with Go 1.21



* Update tools



---------



* update go alpine image to 3.18 (thanos-io#6750)



* build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...




* Updates busybox SHA (thanos-io#6808)




* Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)

* fix matchersToPostingGroups vals variable shadow bug



* update changelog



---------



* fix head series limiter trigger (thanos-io#6802)



* Store: fix prometheus store label values for matches on external labels (thanos-io#6816)

External Labels should also be tested for matches against the matchers.



* Cut patch release v0.32.5



* Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)"

This reverts commit 4ed9bb0.



---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
saswatamcode added a commit to saswatamcode/thanos that referenced this pull request Nov 8, 2023
@saswatamcode @coleenquadros
@dependabot @github-actions @fpetkovski @yeya24 @thibaultmg @MichaHoffmann
Cut patch release v0.32.5 (thanos-io#6820)
a274cfc 
* Build with Go 1.21 (thanos-io#6615)

* Build with Go 1.21

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Update tools

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* update go alpine image to 3.18 (thanos-io#6750)

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updates busybox SHA (thanos-io#6808)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>

* Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)

* fix matchersToPostingGroups vals variable shadow bug

Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* fix head series limiter trigger (thanos-io#6802)

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* Store: fix prometheus store label values for matches on external labels (thanos-io#6816)

External Labels should also be tested for matches against the matchers.

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>

* Cut patch release v0.32.5

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)"

This reverts commit 4ed9bb0.

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
subbarao-meduri pushed a commit to subbarao-meduri/thanos that referenced this pull request Jan 24, 2024
@saswatamcode @coleenquadros
@dependabot @github-actions @fpetkovski @yeya24 @thibaultmg @MichaHoffmann @subbarao-meduri
Cut patch release v0.32.5 (thanos-io#6820)
512ef40 
* Build with Go 1.21 (thanos-io#6615)

* Build with Go 1.21

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Update tools

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* update go alpine image to 3.18 (thanos-io#6750)

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updates busybox SHA (thanos-io#6808)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>

* Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)

* fix matchersToPostingGroups vals variable shadow bug

Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* fix head series limiter trigger (thanos-io#6802)

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* Store: fix prometheus store label values for matches on external labels (thanos-io#6816)

External Labels should also be tested for matches against the matchers.

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>

* Cut patch release v0.32.5

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)"

This reverts commit 4ed9bb0.

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
subbarao-meduri added a commit to stolostron/thanos that referenced this pull request Jan 24, 2024
@subbarao-meduri @saswatamcode
@yeya24 @coleenquadros @dependabot @github-actions @fpetkovski @thibaultmg @MichaHoffmann
[release-2.10] Upgrade Thanos to 0.32.5 (#99)
5f69aa3 
* Cut patch release `v0.32.4` (thanos-io#6763)

* update objstore version to latest (thanos-io#6746)

Signed-off-by: Ben Ye <benye@amazon.com>

* Cut patch release v0.32.4

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Co-authored-by: Ben Ye <benye@amazon.com>

* Cut patch release `v0.32.5` (thanos-io#6820)

* Build with Go 1.21 (thanos-io#6615)

* Build with Go 1.21

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Update tools

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* update go alpine image to 3.18 (thanos-io#6750)

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updates busybox SHA (thanos-io#6808)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>

* Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)

* fix matchersToPostingGroups vals variable shadow bug

Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* fix head series limiter trigger (thanos-io#6802)

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* Store: fix prometheus store label values for matches on external labels (thanos-io#6816)

External Labels should also be tested for matches against the matchers.

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>

* Cut patch release v0.32.5

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

* Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)"

This reverts commit 4ed9bb0.

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>

* make deps

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Signed-off-by: Subbarao Meduri <smeduri@redhat.com>
Co-authored-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Co-authored-by: Ben Ye <benye@amazon.com>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaHoffmann MichaHoffmann MichaHoffmann approved these changes

@fpetkovski fpetkovski fpetkovski approved these changes

@yeya24 yeya24 yeya24 approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@saswatamcode @fpetkovski @MichaHoffmann @yeya24 @coleenquadros @thibaultmg