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.

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

[release-4.7] Bug 1928304: Prefer local endpoint for cluster DNS service #259

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ replace (
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20201204013253-b878d08e764d
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20201204013253-b878d08e764d
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20201204013253-b878d08e764d
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-beta.2.0.20201204013253-b878d08e764d
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-beta.2.0.20210218204625-8365549d4155
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201204013253-b878d08e764d
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20201204013253-b878d08e764d
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20201204013253-b878d08e764d
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,8 @@ github.com/openshift/client-go v0.0.0-20200422192633-6f6c07fc2a70 h1:LvJxSt/lnLT
github.com/openshift/client-go v0.0.0-20200422192633-6f6c07fc2a70/go.mod h1:HeCrq1LSOBgHAUpINH4IgBLkt2U/NBwE5sq4JJgcl2Y=
github.com/openshift/golang-glog v0.0.0-20190322123450-3c92600d7533 h1:A5VovyRu3JFIPmC20HHrsOOny0PIdHuzDdNMULru48k=
github.com/openshift/golang-glog v0.0.0-20190322123450-3c92600d7533/go.mod h1:3sa6LKKRDnR1xy4Kn8htvPwqIOVwXh8fIU3LRY22q3U=
github.com/openshift/kubernetes v1.20.0-beta.2.0.20201204013253-b878d08e764d h1:+xV76Bk0M9cTil6+jEddNB3f5XJnFMOrIsfV5en+bUI=
github.com/openshift/kubernetes v1.20.0-beta.2.0.20201204013253-b878d08e764d/go.mod h1:/xrHGNfoQphtkhZvyd5bA1lRmz+QkDVmBZu+O8QMoek=
github.com/openshift/kubernetes v1.20.0-beta.2.0.20210218204625-8365549d4155 h1:acz8ZWk541TBV2rLzz8EdFZVmb3wIdzc53+BAWG8xo0=
github.com/openshift/kubernetes v1.20.0-beta.2.0.20210218204625-8365549d4155/go.mod h1:/xrHGNfoQphtkhZvyd5bA1lRmz+QkDVmBZu+O8QMoek=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20201204013253-b878d08e764d h1:VvYzIbDnA9qUPEOGdqhYa7V5+ciSAsexDtR8vfHSTKQ=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20201204013253-b878d08e764d/go.mod h1:WITCNA3qJC44dfLg1s/kdEQ51akGrwqOKkMnN7XoKXE=
github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20201204013253-b878d08e764d/go.mod h1:A5mDfmENvCI0QodhAc0ipXV1aI5JUiZoJkA7BvHs9EQ=
Expand Down
14 changes: 14 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ k8s.io/kubectl/pkg/util/openapi/validation
k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
k8s.io/kubectl/pkg/validation
# k8s.io/kubernetes v1.20.0-rc.0 => github.com/openshift/kubernetes v1.20.0-beta.2.0.20201204013253-b878d08e764d
# k8s.io/kubernetes v1.20.0-rc.0 => github.com/openshift/kubernetes v1.20.0-beta.2.0.20210218204625-8365549d4155
k8s.io/kubernetes/cmd/kube-proxy
k8s.io/kubernetes/cmd/kube-proxy/app
k8s.io/kubernetes/pkg/api/legacyscheme
Expand Down