Skip to content

Commit 073ca2e

Browse files
committed
feat: change minimum for arbiter ha deployments
Signed-off-by: ehila <ehila@redhat.com>
1 parent f9722a2 commit 073ca2e

File tree

43 files changed

+603
-45
lines changed

Some content is hidden

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

43 files changed

+603
-45
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,5 @@ require (
121121
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
122122
sigs.k8s.io/yaml v1.4.0 // indirect
123123
)
124+
125+
replace github.com/openshift/api => github.com/eggfoobar/api v0.0.0-20241031050024-e82938246334

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4242
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
4343
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
44+
github.com/eggfoobar/api v0.0.0-20241031050024-e82938246334 h1:8pP1gwRFQSzSmS3CwlThP86RGkWsf22xeqOo3Rp9aaw=
45+
github.com/eggfoobar/api v0.0.0-20241031050024-e82938246334/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
4446
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
4547
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
4648
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
@@ -148,8 +150,6 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
148150
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
149151
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
150152
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=
153153
github.com/openshift/build-machinery-go v0.0.0-20241030130011-ee12ed0f0273 h1:xuaq6MeNa6KBvzXVapxcJjUPN/EVQZ1VZ0uoyoTUrf4=
154154
github.com/openshift/build-machinery-go v0.0.0-20241030130011-ee12ed0f0273/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.HighlyAvailableArbiter:
65+
return 2
6366
case err != nil:
6467
utilruntime.HandleError(err)
6568
return 3

vendor/github.com/openshift/api/config/v1/types_infrastructure.go

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

vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go

Lines changed: 5 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/config/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 2 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/config/v1/zz_generated.swagger_doc_generated.go

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

vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go

Lines changed: 1 addition & 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/config/v1alpha1/types_image_policy.go

Lines changed: 1 addition & 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/config/v1alpha1/zz_generated.swagger_doc_generated.go

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

0 commit comments

Comments
 (0)