Skip to content

Bug 1826230: bring missing fixes to oc #409

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
May 7, 2020
Merged

Bug 1826230: bring missing fixes to oc #409

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
1f285ef
bump(k8s.io/* & openshift/*)
soltysh May 7, 2020
b27b490
React to changes
soltysh May 7, 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
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ require (
github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
github.com/mtrmac/gpgme v0.1.2 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
github.com/openshift/api v0.0.0-20200429152225-b98a784d8e6d
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-20200427130628-9b02543ac833
github.com/openshift/library-go v0.0.0-20200506083334-710b0bd21d0c
github.com/operator-framework/operator-registry v1.8.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.1.0
Expand Down Expand Up @@ -89,8 +89,8 @@ replace (
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.2
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20200427132717-228307e8b83c
k8s.io/apiserver => k8s.io/apiserver v0.18.2
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200427133506-c9b12ef3d51a
k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20200427132843-d2e6d74049b0
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200507115657-2fb95e953778
k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20200507115529-5e2a2d83bced
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.2
k8s.io/code-generator => k8s.io/code-generator v0.18.2
Expand All @@ -101,7 +101,7 @@ replace (
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.2
k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20200427133609-5c71e22e20a8
k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20200507115706-2f87de22f81a
k8s.io/kubelet => k8s.io/kubelet v0.18.2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.17.0-alpha.0.0.20200427141011-f0879866c662
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.2
Expand Down
18 changes: 10 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,8 @@ github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod h1
github.com/openshift/api v0.0.0-20200326152221-912866ddb162/go.mod h1:RKMJ5CBnljLfnej+BJ/xnOWc3kZDvJUaIAEq2oKSPtE=
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e h1:VDcwVyMEVbLyekLmtob1TEf8GfP454Afc2hO3FkgBps=
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e/go.mod h1:VnbEzX8SAaRj7Yfl836NykdQIlbEjfL6/CD+AaJQg5Q=
github.com/openshift/api v0.0.0-20200429152225-b98a784d8e6d h1:E6wmob+4UwmxOWf/yA26q2PTBtLdAjo/aY5gAUfGS+E=
github.com/openshift/api v0.0.0-20200429152225-b98a784d8e6d/go.mod h1:VnbEzX8SAaRj7Yfl836NykdQIlbEjfL6/CD+AaJQg5Q=
github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160 h1:V4E6yt4XWiBEPKnJbs/E8pgUq9AjZqzQfsL3eeT84Qs=
github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc h1:Bu1p7+ItPqhJhmMve7sVluKCYV+o+x1Ede0WY2/BI8Q=
Expand All @@ -712,14 +714,14 @@ github.com/openshift/kubernetes v1.17.0-alpha.0.0.20200427141011-f0879866c662 h1
github.com/openshift/kubernetes v1.17.0-alpha.0.0.20200427141011-f0879866c662/go.mod h1:l5Qoty3tTpZSF5aAnv62M9T8pCqZlT3Z29/s20L+iCU=
github.com/openshift/kubernetes-apimachinery v0.0.0-20200427132717-228307e8b83c h1:+ZHd0MXIlWjlqVDCRmTBYWQrZ/gRPnHJmWJVdvmXNHI=
github.com/openshift/kubernetes-apimachinery v0.0.0-20200427132717-228307e8b83c/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
github.com/openshift/kubernetes-cli-runtime v0.0.0-20200427133506-c9b12ef3d51a h1:EOB0Yti66MFVgruQBLxrfgdUk7FYK1/QIDFmQcmro2E=
github.com/openshift/kubernetes-cli-runtime v0.0.0-20200427133506-c9b12ef3d51a/go.mod h1:yfFR2sQQzDsV0VEKGZtrJwEy4hLZ2oj4ZIfodgxAHWQ=
github.com/openshift/kubernetes-client-go v0.0.0-20200427132843-d2e6d74049b0 h1:5oNXG0OExnatj38vFey8iXYJrBnH0Gw/qWLBn1PxtIU=
github.com/openshift/kubernetes-client-go v0.0.0-20200427132843-d2e6d74049b0/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
github.com/openshift/kubernetes-kubectl v0.0.0-20200427133609-5c71e22e20a8 h1:tKQtgLeIHG2+1SsAxTx0y8hS7+tn4V5nDCbuB1jwiW8=
github.com/openshift/kubernetes-kubectl v0.0.0-20200427133609-5c71e22e20a8/go.mod h1:OdgFa3AlsPKRpFFYE7ICTwulXOcMGXHTc+UKhHKvrb4=
github.com/openshift/library-go v0.0.0-20200427130628-9b02543ac833 h1:glEuGTvwkQJXfCzVfosZ3oq73L8QltO6Xyxo1oTf5Ig=
github.com/openshift/library-go v0.0.0-20200427130628-9b02543ac833/go.mod h1:2kWwXTkpoQJUN3jZ3QW88EIY1hdRMqxgRs2hheEW/pg=
github.com/openshift/kubernetes-cli-runtime v0.0.0-20200507115657-2fb95e953778 h1:AEnwBRfIJpuaSGvNrpfykz8QPNALp0t3nIGr9a/BIF0=
github.com/openshift/kubernetes-cli-runtime v0.0.0-20200507115657-2fb95e953778/go.mod h1:yfFR2sQQzDsV0VEKGZtrJwEy4hLZ2oj4ZIfodgxAHWQ=
github.com/openshift/kubernetes-client-go v0.0.0-20200507115529-5e2a2d83bced h1:tFIeR3M66xC/l+tuhlZKfK+OCMNk7ZfqeJQaR1ofoRo=
github.com/openshift/kubernetes-client-go v0.0.0-20200507115529-5e2a2d83bced/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
github.com/openshift/kubernetes-kubectl v0.0.0-20200507115706-2f87de22f81a h1:BG3HbZLvm1NlUkDoelF+vPG+Lnz6mKu0cPNAD800TDU=
github.com/openshift/kubernetes-kubectl v0.0.0-20200507115706-2f87de22f81a/go.mod h1:OdgFa3AlsPKRpFFYE7ICTwulXOcMGXHTc+UKhHKvrb4=
github.com/openshift/library-go v0.0.0-20200506083334-710b0bd21d0c h1:mo1sYI/JNNgXhoaSzGQdQceyWDC3Q1VYkFMmu1TQ6nc=
github.com/openshift/library-go v0.0.0-20200506083334-710b0bd21d0c/go.mod h1:2kWwXTkpoQJUN3jZ3QW88EIY1hdRMqxgRs2hheEW/pg=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/operator-framework/api v0.1.1 h1:DbfxRJUPMQlQW6nbfoNzWLxv1rIv13Gt8GbsF2aglFk=
github.com/operator-framework/api v0.1.1/go.mod h1:yzNYR7qyJqRGOOp+bT6Z/iYSbSPNxeh3Si93Gx/3OBY=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/shim_kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
func shimKubectlForOc() {
// we only need this change for `oc`. `kubectl` should behave as close to `kubectl` as we can
// if we call this factory construction method, we want the openshift style config loading
kclientcmd.ErrEmptyConfig = genericclioptions.NewErrConfigurationMissing()
kclientcmd.ErrEmptyConfig = genericclioptions.ErrEmptyConfig
kcmdset.ParseDockerImageReferenceToStringFunc = clientcmd.ParseDockerImageReferenceToStringFunc
openshiftpatch.OAPIToGroupified = legacygroupification.OAPIToGroupified
openshiftpatch.OAPIToGroupifiedGVK = legacygroupification.OAPIToGroupifiedGVK
Expand Down
13 changes: 2 additions & 11 deletions vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
View file
Open in desktop

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

12 changes: 1 addition & 11 deletions vendor/github.com/openshift/api/config/v1/types_oauth.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: 1 addition & 1 deletion vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.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: 2 additions & 2 deletions vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go
View file
Open in desktop

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

13 changes: 1 addition & 12 deletions vendor/k8s.io/cli-runtime/pkg/genericclioptions/patch_config_flags.go
View file
Open in desktop

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

24 changes: 21 additions & 3 deletions vendor/k8s.io/client-go/tools/clientcmd/validation.go
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions vendor/k8s.io/kubectl/pkg/cmd/create/create_job.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: 3 additions & 1 deletion vendor/k8s.io/kubectl/pkg/cmd/get/get.go
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ github.com/opencontainers/image-spec/specs-go/v1
# github.com/opencontainers/runc v1.0.0-rc9
github.com/opencontainers/runc/libcontainer/system
github.com/opencontainers/runc/libcontainer/user
# github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
# github.com/openshift/api v0.0.0-20200429152225-b98a784d8e6d
github.com/openshift/api
github.com/openshift/api/annotations
github.com/openshift/api/apps
Expand Down Expand Up @@ -489,7 +489,7 @@ github.com/openshift/client-go/user/clientset/versioned/fake
github.com/openshift/client-go/user/clientset/versioned/scheme
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1/fake
# github.com/openshift/library-go v0.0.0-20200427130628-9b02543ac833
# github.com/openshift/library-go v0.0.0-20200506083334-710b0bd21d0c
github.com/openshift/library-go/pkg/apps/appsserialization
github.com/openshift/library-go/pkg/apps/appsutil
github.com/openshift/library-go/pkg/authorization/authorizationutil
Expand Down Expand Up @@ -809,7 +809,7 @@ k8s.io/apiserver/pkg/server/healthz
k8s.io/apiserver/pkg/server/httplog
k8s.io/apiserver/pkg/storage/names
k8s.io/apiserver/pkg/util/feature
# k8s.io/cli-runtime v0.18.2 => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200427133506-c9b12ef3d51a
# k8s.io/cli-runtime v0.18.2 => github.com/openshift/kubernetes-cli-runtime v0.0.0-20200507115657-2fb95e953778
k8s.io/cli-runtime/pkg/genericclioptions
k8s.io/cli-runtime/pkg/genericclioptions/openshiftpatch
k8s.io/cli-runtime/pkg/kustomize
Expand All @@ -823,7 +823,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch
k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator
k8s.io/cli-runtime/pkg/printers
k8s.io/cli-runtime/pkg/resource
# k8s.io/client-go v8.0.0+incompatible => github.com/openshift/kubernetes-client-go v0.0.0-20200427132843-d2e6d74049b0
# k8s.io/client-go v8.0.0+incompatible => github.com/openshift/kubernetes-client-go v0.0.0-20200507115529-5e2a2d83bced
k8s.io/client-go/discovery
k8s.io/client-go/discovery/cached/disk
k8s.io/client-go/discovery/fake
Expand Down Expand Up @@ -976,7 +976,7 @@ k8s.io/kube-openapi/pkg/common
k8s.io/kube-openapi/pkg/util/proto
k8s.io/kube-openapi/pkg/util/proto/testing
k8s.io/kube-openapi/pkg/util/proto/validation
# k8s.io/kubectl v0.18.2 => github.com/openshift/kubernetes-kubectl v0.0.0-20200427133609-5c71e22e20a8
# k8s.io/kubectl v0.18.2 => github.com/openshift/kubernetes-kubectl v0.0.0-20200507115706-2f87de22f81a
k8s.io/kubectl/pkg/apps
k8s.io/kubectl/pkg/cmd
k8s.io/kubectl/pkg/cmd/annotate
Expand Down