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

[ACM-13481] - Remove HA mode when AM has one replica #1700

Merged
merged 1 commit into from
Dec 6, 2024

Conversation

coleenquadros
Copy link
Contributor

@coleenquadros coleenquadros commented Dec 6, 2024

https://issues.redhat.com/browse/ACM-13481

This is a workaround/hack when AM replicas are set to 1 and are no more in HA mode. prometheus/alertmanager#1971

Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros coleenquadros changed the title remove HA mode when AM has one replica [ACM-13481] - Remove HA mode when AM has one replica Dec 6, 2024
Copy link

openshift-ci bot commented Dec 6, 2024

@coleenquadros: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/test-e2e 2ec5103 link true /test test-e2e

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.12

@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: once the present PR merges, I will cherry-pick it on top of release-2.12 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.11

@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: once the present PR merges, I will cherry-pick it on top of release-2.11 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Contributor

@philipgough philipgough left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Dec 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coleenquadros, philipgough

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [coleenquadros,philipgough]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coleenquadros coleenquadros merged commit 8a79182 into stolostron:main Dec 6, 2024
16 of 18 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: new pull request created: #1701

In response to this:

/cherrypick release-2.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: #1700 failed to apply on top of branch "release-2.11":

Applying: remove HA mode when AM has one replica
Using index info to reconstruct a base tree...
M	operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml
M	operators/multiclusterobservability/pkg/rendering/renderer_alertmanager.go
M	operators/multiclusterobservability/pkg/rendering/renderer_alertmanager_test.go
Falling back to patching base and 3-way merge...
Auto-merging operators/multiclusterobservability/pkg/rendering/renderer_alertmanager_test.go
Auto-merging operators/multiclusterobservability/pkg/rendering/renderer_alertmanager.go
CONFLICT (content): Merge conflict in operators/multiclusterobservability/pkg/rendering/renderer_alertmanager.go
Auto-merging operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 remove HA mode when AM has one replica

In response to this:

/cherrypick release-2.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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