Skip to content
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

Jump to bottom

Bug 1874056: bump: update library-go to get exit on control-loop failure behavior #393

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Bug 1874056: bump: update library-go to get exit on control-loop failure behavior #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec334fb
react to storage migrator move
deads2k Sep 15, 2020
33bc89e
bump: update library-go to get exit on control-loop failure behavior
deads2k Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
github.com/kubernetes-sigs/kube-storage-version-migrator v0.0.0-20191127225502-51849bc15f17
github.com/openshift/api v0.0.0-20200827090112-c05698d102cf
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/library-go v0.0.0-20200908182125-bdfa309a0a1d
github.com/openshift/library-go v0.0.0-20200915114203-ee518dab897a
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
Expand All @@ -25,10 +24,10 @@ require (
k8s.io/klog/v2 v2.3.0
k8s.io/kube-aggregator v0.19.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/kube-storage-version-migrator v0.0.3
)

replace (
github.com/coreos/etcd => github.com/coreos/etcd v3.3.17+incompatible // Pinned for openshift
github.com/kubernetes-sigs/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20200312103335-32e07ea4f8ca
google.golang.org/grpc => google.golang.org/grpc v1.26.0
)
51 changes: 45 additions & 6 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"os"
"time"

kubemigratorclient "github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/clients/clientset"
migrationv1alpha1informer "github.com/kubernetes-sigs/kube-storage-version-migrator/pkg/clients/informer"
configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
configv1client "github.com/openshift/client-go/config/clientset/versioned"
Expand Down Expand Up @@ -35,6 +33,8 @@ import (
apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
apiregistrationinformers "k8s.io/kube-aggregator/pkg/client/informers/externalversions"
utilpointer "k8s.io/utils/pointer"
kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"

"github.com/openshift/cluster-openshift-apiserver-operator/pkg/operator/apiservice"
"github.com/openshift/cluster-openshift-apiserver-operator/pkg/operator/configobservation/configobservercontroller"
Expand Down
27 changes: 23 additions & 4 deletions vendor/github.com/openshift/library-go/pkg/controller/factory/base_controller.go
View file
Open in desktop

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

70 changes: 37 additions & 33 deletions vendor/github.com/openshift/library-go/pkg/controller/factory/controller_context.go
View file
Open in desktop

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

62 changes: 50 additions & 12 deletions vendor/github.com/openshift/library-go/pkg/controller/factory/factory.go
View file
Open in desktop

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