Skip to content

Bug 1986215: Bump library-go to get leader election fixes #196

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
openshift-ci merged 4 commits into from
Aug 4, 2021
Merged

Bug 1986215: Bump library-go to get leader election fixes #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
325e299
Bump library-go
bertinatto Aug 2, 2021
b595d24
Fix function call that was broken by library-go bump
bertinatto Aug 2, 2021
86fd438
Unpin google.golang.org/grpc dependency
bertinatto Aug 2, 2021
065d2a2
Remove unnecessary dependencies
bertinatto Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
golang.mk \
targets/openshift/deps-gomod.mk \
targets/openshift/images.mk \
targets/openshift/bindata.mk \
targets/openshift/operator/profile-manifests.mk \
)

Expand Down
33 changes: 12 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,23 @@ module github.com/openshift/cluster-storage-operator
go 1.16

require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/google/go-cmp v0.5.5
github.com/google/gofuzz v1.2.0 // indirect
github.com/openshift/api v0.0.0-20210706092853-b63d499a70ce
github.com/openshift/build-machinery-go v0.0.0-20210702090207-9c7b89e8633a
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
github.com/openshift/library-go v0.0.0-20210706095353-8cc52ce9b72b
github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
github.com/openshift/library-go v0.0.0-20210730130811-cb83700729ae
github.com/prometheus-operator/prometheus-operator v0.44.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.44.1
github.com/prometheus/client_golang v1.8.0
github.com/spf13/cobra v1.1.1
github.com/prometheus/client_golang v1.11.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 // indirect
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/api v0.22.0-rc.0
k8s.io/apiextensions-apiserver v0.22.0-rc.0
k8s.io/apimachinery v0.22.0-rc.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.21.1
k8s.io/component-base v0.21.1
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
k8s.io/component-base v0.22.0-rc.0
k8s.io/klog/v2 v2.9.0
)

replace (
google.golang.org/grpc => google.golang.org/grpc v1.27.0
// points to temporary-watch-reduction-patch-1.21 to pick up k/k/pull/101102 - please remove it once the pr merges and a new Z release is cut
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
k8s.io/client-go => k8s.io/client-go v0.21.0
)
replace k8s.io/client-go => k8s.io/client-go v0.22.0-rc.0
343 changes: 245 additions & 98 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions pkg/dependencymagnet/dependencymagnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
package dependencymagnet

import (
_ "github.com/go-bindata/go-bindata/go-bindata"
_ "github.com/openshift/build-machinery-go"
_ "k8s.io/code-generator"
)
3 changes: 2 additions & 1 deletion pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/openshift/library-go/pkg/controller/controllercmd"
"github.com/openshift/library-go/pkg/operator/loglevel"
"github.com/openshift/library-go/pkg/operator/management"
"github.com/openshift/library-go/pkg/operator/managementstatecontroller"
"github.com/openshift/library-go/pkg/operator/status"
)

Expand Down Expand Up @@ -86,7 +87,7 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
status.VersionForOperandFromEnv(),
controllerConfig.EventRecorder)

managementStateController := management.NewOperatorManagementStateController(clusterOperatorName, clients.OperatorClient, controllerConfig.EventRecorder)
managementStateController := managementstatecontroller.NewOperatorManagementStateController(clusterOperatorName, clients.OperatorClient, controllerConfig.EventRecorder)

// This controller syncs CR.Status.Conditions with the value in the field CR.Spec.ManagementStatus. It only supports Managed state
management.SetOperatorNotRemovable()
Expand Down
0 vendor/github.com/coreos/go-systemd/LICENSE → .../github.com/coreos/go-systemd/v22/LICENSE
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/coreos/go-systemd/NOTICE → ...r/github.com/coreos/go-systemd/v22/NOTICE
View file
Open in desktop
File renamed without changes.
0 ....com/coreos/go-systemd/daemon/sdnotify.go → .../coreos/go-systemd/v22/daemon/sdnotify.go
View file
Open in desktop
File renamed without changes.
0 ....com/coreos/go-systemd/daemon/watchdog.go → .../coreos/go-systemd/v22/daemon/watchdog.go
View file
Open in desktop
File renamed without changes.
46 changes: 46 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/journal/journal.go
View file
Open in desktop

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

25 changes: 5 additions & 20 deletions ....com/coreos/go-systemd/journal/journal.go → ...os/go-systemd/v22/journal/journal_unix.go
View file
Open in desktop

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

35 changes: 35 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/journal/journal_windows.go
View file
Open in desktop

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

5 changes: 0 additions & 5 deletions vendor/github.com/coreos/pkg/NOTICE
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions vendor/github.com/coreos/pkg/capnslog/README.md
View file
Open in desktop

This file was deleted.

Loading