Skip to content

Bug 1794029: [4.2] Use k8s.io/client-go fork with informer fix, run update-deps #95

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-merge-robot merged 2 commits into from
Feb 6, 2020
Merged

Bug 1794029: [4.2] Use k8s.io/client-go fork with informer fix, run update-deps #95

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
327c94a
Fix requested version of openshift deps, update them
danwinship Jan 20, 2020
6d1ccb4
Use k8s.io/client-go fork with informer fix, run update-deps
danwinship Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions glide.lock
View file
Open in desktop

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

19 changes: 14 additions & 5 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import:
- package: k8s.io/apiserver
version: kubernetes-1.14.0
- package: k8s.io/client-go
version: kubernetes-1.14.0
version: sdn-4.2-kubernetes-1.14.0
repo: https://github.com/openshift/kubernetes-client-go.git
- package: k8s.io/cli-runtime
version: kubernetes-1.14.0
- package: k8s.io/cloud-provider
Expand Down Expand Up @@ -68,11 +69,11 @@ import:

# openshift second
- package: github.com/openshift/api
version: master
version: release-4.2
- package: github.com/openshift/client-go
version: master
version: release-4.2
- package: github.com/openshift/library-go
version: master
version: release-4.2

# forks third
# master
Expand Down Expand Up @@ -125,7 +126,7 @@ import:
version: v1.0.8
# etcd pins a very old version that has contention issues
- package: github.com/google/btree
version: master
version: 20236160a414454a9c64b6c8829381c6f4bddcaa

# why do we have this?
- package: google.golang.org/appengine
Expand All @@ -140,6 +141,7 @@ import:

# force glide to pull this in
- package: github.com/google/uuid
version: 8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3

# due to https://github.com/Masterminds/glide/issues/881 manually show where
# to get gonum.org/v1/gonum from
Expand All @@ -152,6 +154,7 @@ import:
# https://github.com/kubernetes/kubernetes/pull/72138
- package: bitbucket.org/ww/goautoneg
repo: https://github.com/munnerz/goautoneg.git
version: 2ae31c8b6b30d2f4c8100c20d527b571e9c433bb

# version that works with runc
- package: golang.org/x/sys
Expand All @@ -160,3 +163,9 @@ import:
# version from openshift. may need later fitting
- package: github.com/coreos/go-systemd
version: 39ca1b05acc7ad1220e09f133283b8859a8b71ab

# lock some versions down to what they were in earlier 4.2 releases
- package: github.com/containernetworking/cni
version: a7885cb6f8ab03fba07852ded351e4f5e7a112bf
- package: github.com/spf13/pflag
version: 583c0c0531f06d5278b7d917446061adc344b5cd
26 changes: 16 additions & 10 deletions vendor/github.com/openshift/api/apps/v1/generated.pb.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/authorization/v1/doc.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: 16 additions & 9 deletions vendor/github.com/openshift/api/authorization/v1/generated.pb.go
View file
Open in desktop

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

26 changes: 16 additions & 10 deletions vendor/github.com/openshift/api/build/v1/generated.pb.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/config/v1/doc.go
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions vendor/github.com/openshift/api/config/v1/register.go
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions vendor/github.com/openshift/api/config/v1/types.go
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion vendor/github.com/openshift/api/config/v1/types_build.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: 3 additions & 2 deletions vendor/github.com/openshift/api/config/v1/types_dns.go
View file
Open in desktop

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

33 changes: 19 additions & 14 deletions vendor/github.com/openshift/api/config/v1/types_image.go
View file
Open in desktop

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

Loading