Skip to content

Commit 0515f14

Browse files
committed
feat: change minimum for arbiter ha deployments
Signed-off-by: ehila <ehila@redhat.com>
1 parent 75c7842 commit 0515f14

File tree

193 files changed

+4893
-3425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+4893
-3425
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/ghodss/yaml v1.0.0
88
github.com/google/go-cmp v0.6.0
9-
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
9+
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf
1010
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72
1111
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
1212
github.com/openshift/library-go v0.0.0-20241120135057-fc703a7407c9

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
148148
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
149149
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
150150
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
151-
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f h1:ya1OmyZm3LIIxI3U9VE9Nyx3ehCHgBwxyFUPflYPWls=
152-
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
151+
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf h1:v0zcEm7GikYbs/N+YLLpKV75ASm7WpMRiSDZpvJvXnk=
152+
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
153153
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72 h1:kMM+Ea3YFrcoYS76RhhBA7uELy97JM0gwqnyoy7fxco=
154154
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
155155
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=

pkg/controllers/readiness/unsupported_override.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package readiness
33
import (
44
"bytes"
55
"encoding/json"
6-
configv1 "github.com/openshift/api/config/v1"
76
"strconv"
87

8+
configv1 "github.com/openshift/api/config/v1"
9+
910
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1011

1112
operatorv1 "github.com/openshift/api/operator/v1"
@@ -60,6 +61,8 @@ func getExpectedMinimumNumberOfMasters(spec *operatorv1.OperatorSpec, topologyMo
6061
switch {
6162
case topologyMode == configv1.SingleReplicaTopologyMode:
6263
return 1
64+
case topologyMode == configv1.HighlyAvailableArbiterMode:
65+
return 2
6366
case err != nil:
6467
utilruntime.HandleError(err)
6568
return 3

vendor/github.com/openshift/api/.golangci.yaml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/Makefile

Lines changed: 16 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/apiserver/v1/types_apirequestcount.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/apiserver/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)