Skip to content

Commit

Permalink
Upadted the vendor folder with latest library-go changes
Browse files Browse the repository at this point in the history
Signed-off-by: jubittajohn <jujohn@redhat.com>
  • Loading branch information
jubittajohn committed Jun 28, 2024
1 parent fa6e8c3 commit 2be2710
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ require (

replace (
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240626144247-8d7fddd726eb
github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240628203932-f152bd5d19c1
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/jubittajohn/library-go v0.0.0-20240626144247-8d7fddd726eb h1:d9OacQcqghX3C9E9h45QpWUFPShKR2NzQlFtgnASvp8=
github.com/jubittajohn/library-go v0.0.0-20240626144247-8d7fddd726eb/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
github.com/jubittajohn/library-go v0.0.0-20240628203932-f152bd5d19c1 h1:IsEPPFkoi6ANbLfrALrEFlVPAoOZlZerdwYbT6Y3oLo=
github.com/jubittajohn/library-go v0.0.0-20240628203932-f152bd5d19c1/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down
6 changes: 5 additions & 1 deletion pkg/operator/starter.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
return !isSNO, precheckSucceeded, err
}

quorumSafe := func(ctx context.Context) (bool, error) {
return quorumChecker.IsSafeToUpdateRevision()
}

staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers).
WithEvents(controllerContext.EventRecorder).
WithInstaller([]string{"cluster-etcd-operator", "installer"}).
Expand All @@ -322,7 +326,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
guardRolloutPreCheck,
).
WithOperandPodLabelSelector(labels.Set{"etcd": "true"}.AsSelector()).
WithShouldRevisionInstall(quorumChecker.IsSafeToUpdateRevision).
WithInstallPrecondition(quorumSafe).
ToControllers()
if err != nil {
return err
Expand Down

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

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

4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ github.com/openshift/client-go/operator/informers/externalversions/operator/v1
github.com/openshift/client-go/operator/informers/externalversions/operator/v1alpha1
github.com/openshift/client-go/operator/listers/operator/v1
github.com/openshift/client-go/operator/listers/operator/v1alpha1
# github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7 => github.com/jubittajohn/library-go v0.0.0-20240626144247-8d7fddd726eb
# github.com/openshift/library-go v0.0.0-20240619140217-e20ca28ddfe7 => github.com/jubittajohn/library-go v0.0.0-20240628203932-f152bd5d19c1
## explicit; go 1.22.0
github.com/openshift/library-go/pkg/assets
github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer
Expand Down Expand Up @@ -1542,5 +1542,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
# github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240626144247-8d7fddd726eb
# github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20240628203932-f152bd5d19c1
# vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787

0 comments on commit 2be2710

Please sign in to comment.