Skip to content

Commit 5188da1

Browse files
committed
feat: bump api to pull in arbiter node infra
update validation to allow HighlyAvailableArbiter Signed-off-by: ehila <[email protected]>
1 parent 79f63d2 commit 5188da1

File tree

76 files changed

+1409
-1130
lines changed

Some content is hidden

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

76 files changed

+1409
-1130
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,6 @@ require (
229229
)
230230

231231
replace (
232-
github.com/openshift/api => github.com/openshift/api v0.0.0-20241108125904-424692fe047e
232+
github.com/openshift/api => github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf
233233
go.opentelemetry.io/contrib => go.opentelemetry.io/contrib v1.12.0
234234
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
428428
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
429429
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
430430
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
431-
github.com/openshift/api v0.0.0-20241108125904-424692fe047e h1:zFI0guz2FQa7NnrCPPCDpDrivKtfzHvE1OPv8nj2IZ8=
432-
github.com/openshift/api v0.0.0-20241108125904-424692fe047e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
431+
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf h1:v0zcEm7GikYbs/N+YLLpKV75ASm7WpMRiSDZpvJvXnk=
432+
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
433433
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
434434
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
435435
github.com/openshift/library-go v0.0.0-20231020125034-5a2d9fe760b3 h1:RmbS0Ea69/ejW0HqUoUjO72EfNc/biuVDjODEDl/EnE=

pkg/serverconfig/validate.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ func validateControlPlaneTopology(value string) (string, error) {
128128

129129
if !(value == string(configv1.SingleReplicaTopologyMode) ||
130130
value == string(configv1.HighlyAvailableTopologyMode) ||
131+
value == string(configv1.HighlyAvailableArbiterMode) ||
131132
value == string(configv1.ExternalTopologyMode)) {
132-
return value, fmt.Errorf("ControlPlaneTopologyMode %s is not valid; valid options are External, HighlyAvailable, or SingleReplica", value)
133+
return value, fmt.Errorf("ControlPlaneTopologyMode %s is not valid; valid options are External, HighlyAvailable, HighlyAvailableArbiter, or SingleReplica", value)
133134
}
134135

135136
return value, nil

vendor/github.com/openshift/api/build/v1/generated.proto

+21-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)