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 1832153: Upstream v1.18.2 rebase #136

Merged
merged 6 commits into from
May 6, 2020
Merged

Bug 1832153: Upstream v1.18.2 rebase #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ced25d
Makefile: move to openshift/build-machinery-go
squeed May 4, 2020
b3460b4
rebase 1.18.2: vendor update
squeed May 5, 2020
e67230e
images: switch to go 1.13
squeed May 5, 2020
412ab02
rebase 1.18.2: wire in new LocalTrafficDetector
squeed May 5, 2020
3a946da
rebase 1.18.2: egress IP type renaming (mechanical)
squeed May 6, 2020
10e2d5f
rebase 1.18.2: other mechanical changes
squeed May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GO_BUILD_PACKAGES = \
GO_BUILD_PACKAGES_EXPANDED =$(shell GO111MODULE=on $(GO) list $(GO_MOD_FLAGS) $(GO_BUILD_PACKAGES))

# Include the library makefile
include $(addprefix ./vendor/github.com/openshift/library-go/alpha-build-machinery/make/, \
include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
golang.mk \
targets/openshift/deps.mk \
targets/openshift/images.mk \
Expand Down
74 changes: 37 additions & 37 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,25 @@ require (
github.com/fsnotify/fsnotify v1.4.7
github.com/gorilla/mux v1.7.4-0.20190830121156-884b5ffcbd3a
github.com/miekg/dns v1.1.4
github.com/openshift/api v0.0.0-20200116145750-0e2ff1e215dd
github.com/openshift/client-go v0.0.0-20200116152001-92a2713fa240
github.com/openshift/library-go v0.0.0-20200130090538-26ae77929944
github.com/opencontainers/runtime-spec v0.0.0-00010101000000-000000000000 // indirect
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc
github.com/openshift/client-go v0.0.0-20200422192633-6f6c07fc2a70
github.com/openshift/library-go v0.0.0-20200424095618-2aeb4725dadf
github.com/prometheus/client_golang v1.1.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink v1.1.0
k8s.io/api v0.17.1
k8s.io/apimachinery v0.17.1
k8s.io/client-go v0.17.1
k8s.io/component-base v0.17.1
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/apiserver v0.18.2
k8s.io/client-go v0.18.2
k8s.io/component-base v0.18.2
k8s.io/cri-api v0.0.0
k8s.io/klog v1.0.0
k8s.io/kubectl v0.0.0
k8s.io/kubernetes v1.13.0
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // same as sdn-4.4-kubernetes-1.17.2
k8s.io/kubernetes v1.18.2
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // same as sdn-4.5-kubernetes-1.18.2
)

replace (
Expand Down Expand Up @@ -54,8 +57,6 @@ replace (
github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc8.0.20190926150303-84373aaa560b
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.2-0.20190911013453-52e2591aa9f7
github.com/openshift/api => github.com/openshift/api v0.0.0-20190923092516-169848dd8137
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923092832-6afefc9bb372
github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/pkg/errors => github.com/pkg/errors v0.8.0
github.com/pkg/profile => github.com/pkg/profile v1.3.0
Expand All @@ -67,31 +68,30 @@ replace (
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink => ./patch/github.com/vishvananda/netlink
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20200128234836-7a71bf4afe82
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200128234836-7a71bf4afe82
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200128234836-7a71bf4afe82
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200128234836-7a71bf4afe82
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200128234836-7a71bf4afe82
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200128234836-7a71bf4afe82
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200128234836-7a71bf4afe82
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200128234836-7a71bf4afe82
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200128234836-7a71bf4afe82
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200128234836-7a71bf4afe82
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200128234836-7a71bf4afe82
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200128234836-7a71bf4afe82
k8s.io/kubernetes => github.com/openshift/kubernetes v1.17.0-alpha.0.0.20200128234836-7a71bf4afe82
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200128234836-7a71bf4afe82
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200128234836-7a71bf4afe82
k8s.io/node-api => github.com/openshift/kubernetes/staging/src/k8s.io/node-api v0.0.0-20200128234836-7a71bf4afe82
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200128234836-7a71bf4afe82
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20200128234836-7a71bf4afe82
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20200128234836-7a71bf4afe82
k8s.io/utils => k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // same as sdn-4.4-kubernetes-1.17.2
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20200506130333-d411faf4483c
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200506130333-d411faf4483c
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200506130333-d411faf4483c
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200506130333-d411faf4483c
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200506130333-d411faf4483c
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200506130333-d411faf4483c
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200506130333-d411faf4483c
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200506130333-d411faf4483c
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200506130333-d411faf4483c
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200506130333-d411faf4483c
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200506130333-d411faf4483c
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200506130333-d411faf4483c
k8s.io/kubernetes => github.com/openshift/kubernetes v1.5.0-alpha.0.0.20200504100644-ad077cd883ae
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200506130333-d411faf4483c
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20200506130333-d411faf4483c
k8s.io/utils => k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // same as sdn-4.4-kubernetes-1.18.2
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
)