Skip to content

OCPEDGE-1306: feat: change minimum for arbiter ha deployments #734

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

Merged
merged 1 commit into from
Jan 20, 2025
Merged

OCPEDGE-1306: feat: change minimum for arbiter ha deployments #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.6.0
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf
github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071
github.com/openshift/library-go v0.0.0-20250113163708-355465391f40
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429 h1:fz+u78YFRL14rXqBKWIVYK04mUOy6LccHe3wQsUS3iI=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf h1:v0zcEm7GikYbs/N+YLLpKV75ASm7WpMRiSDZpvJvXnk=
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09 h1:NibXytu9e89emCQoRiKZR+warzC1bpQgYDyb9jpEI/s=
github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 h1:l0++HnGVKBcs8kXFL/1yeozxioxPGNpp0PYe3Y+0sq4=
Expand Down
5 changes: 4 additions & 1 deletion pkg/controllers/readiness/unsupported_override.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package readiness
import (
"bytes"
"encoding/json"
configv1 "github.com/openshift/api/config/v1"
"strconv"

configv1 "github.com/openshift/api/config/v1"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"

operatorv1 "github.com/openshift/api/operator/v1"
Expand Down Expand Up @@ -60,6 +61,8 @@ func getExpectedMinimumNumberOfMasters(spec *operatorv1.OperatorSpec, topologyMo
switch {
case topologyMode == configv1.SingleReplicaTopologyMode:
return 1
case topologyMode == configv1.HighlyAvailableArbiterMode:
return 2
case err != nil:
utilruntime.HandleError(err)
return 3
Expand Down
16 changes: 16 additions & 0 deletions vendor/github.com/openshift/api/.golangci.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion vendor/github.com/openshift/api/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions vendor/github.com/openshift/api/apiserver/v1/types_apirequestcount.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/apiserver/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading