Skip to content

Backport bug fixes to release-1.21#7428

Open
friedrichg wants to merge 5 commits intorelease-1.21from
backport-bugfixes-1.21
Open

Backport bug fixes to release-1.21#7428
friedrichg wants to merge 5 commits intorelease-1.21from
backport-bugfixes-1.21

Conversation

@friedrichg
Copy link
Copy Markdown
Member

@friedrichg friedrichg commented Apr 16, 2026

Summary

Backport of 5 bug fixes from master to release-1.21:

Test plan

  • CI passes
  • Verify each fix is functionally identical to the master version

SungJin1212 and others added 5 commits April 15, 2026 21:57
* use errors.As in getCasErrorCode to unwrap memberlist errors

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

* fix test

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

---------

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
* Trigger nil with test

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Fix nil results

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* fix changelog

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

---------

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
…7372)

* Fix multitenant alertmanager user config disappearing when ring is unreachable

Signed-off-by: Kishore K G <kishorekg@google.com>

* Add change log

Signed-off-by: Kishore K G <kishorekg@google.com>

* format multitenant

Signed-off-by: Kishore K G <kishorekg@google.com>

* fix pr number

Signed-off-by: Kishore K G <kishorekg@google.com>

* use ErrNotFound for error validation in unit test

Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com>

---------

Signed-off-by: Kishore K G <kishorekg@google.com>
Signed-off-by: kishorekg1999 <kishorekg@google.com>
Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com>
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
…7375)

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
@SungJin1212
Copy link
Copy Markdown
Member

@friedrichg
Could you include these bug fix PRs?
#7424
#7429

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.

3 participants