Skip to content

Bug 1986003: Bump k8s.io to 1.22.0-rc.0 #890

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-ci merged 3 commits into from
Aug 4, 2021
Merged

Bug 1986003: Bump k8s.io to 1.22.0-rc.0 #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd3de0
bump(k8s.io/*): v0.22.0-rc.0
soltysh Jul 30, 2021
e9296c9
React to kubectl changes
soltysh Jul 30, 2021
21fc6da
Generated changes
soltysh Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
118 changes: 59 additions & 59 deletions contrib/completions/bash/oc
View file
Open in desktop

Large diffs are not rendered by default.

22,880 changes: 109 additions & 22,771 deletions contrib/completions/zsh/oc
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 21 additions & 31 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/apcera/gssapi v0.0.0-00010101000000-000000000000
github.com/aws/aws-sdk-go v1.35.24
github.com/blang/semver v3.5.1+incompatible
github.com/containers/image/v5 v5.10.2
github.com/containers/image/v5 v5.15.0
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.3+incompatible
Expand All @@ -25,53 +25,43 @@ require (
github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55 // indirect
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b // indirect
github.com/google/go-cmp v0.5.4
github.com/google/go-cmp v0.5.5
github.com/joelanford/ignore v0.0.0-20210610194209-63d4919d8fb2
github.com/magefile/mage v1.11.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0
github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/openshift/api v0.0.0-20210624153211-ae79113891b0
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
github.com/openshift/library-go v0.0.0-20210521084623-7392ea9b02ca
github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
github.com/openshift/library-go v0.0.0-20210730125111-f3b4cc9813a9
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/common v0.17.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/client_golang v1.11.0
github.com/russross/blackfriday v1.5.2
github.com/sirupsen/logrus v1.8.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
golang.org/x/text v0.3.5 // indirect
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/genproto v0.0.0-20210219173056-d891e3cb3b5b // indirect
google.golang.org/grpc v1.35.0 // indirect
gopkg.in/ldap.v2 v2.5.1
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/apiserver v0.21.1
k8s.io/cli-runtime v0.21.1
k8s.io/client-go v0.21.1
k8s.io/component-base v0.21.1
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v0.21.0-beta.1
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
k8s.io/api v0.22.0-rc.0
k8s.io/apimachinery v0.22.0-rc.0
k8s.io/apiserver v0.22.0-rc.0
k8s.io/cli-runtime v0.22.0-rc.0
k8s.io/client-go v0.22.0-rc.0
k8s.io/component-base v0.22.0-rc.0
k8s.io/klog/v2 v2.9.0
k8s.io/kubectl v0.22.0-rc.0
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210521074607-b6b98f7a1855
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20210521074950-112a61d2624f
k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20210521075216-71b63307b5df
k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20210521075729-633333dfccda
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210730111815-c26349f8e2c9
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20210730111823-1570202448c3
k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20210730111819-978c4383ac68
k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20210730111826-9c6734b9d97d
)
740 changes: 485 additions & 255 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/cli/kubectlwrappers/wrappers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func NewCmdEdit(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.
func NewCmdConfig(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
pathOptions := kclientcmd.NewDefaultPathOptions()

return cmdutil.ReplaceCommandName("kubectl", "oc", templates.Normalize(config.NewCmdConfig(f, pathOptions, streams)))
return cmdutil.ReplaceCommandName("kubectl", "oc", templates.Normalize(config.NewCmdConfig(pathOptions, streams)))
}

// NewCmdCp is a wrapper for the Kubernetes cli cp command
Expand All @@ -241,7 +241,7 @@ func NewCmdPlugin(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobr
// when executing a plugin. Order matters here, we want to first see if a user
// has prefixed their plugin with "oc-", before defaulting to upstream behavior.
plugin.ValidPluginFilenamePrefixes = []string{"oc", "kubectl"}
return plugin.NewCmdPlugin(f, streams)
return plugin.NewCmdPlugin(streams)
}

func NewCmdApiResources(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
Expand Down
5 changes: 5 additions & 0 deletions vendor/github.com/Azure/go-ansiterm/go.mod
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/Azure/go-ansiterm/go.sum
View file
Open in desktop

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

24 changes: 19 additions & 5 deletions vendor/github.com/Azure/go-ansiterm/winterm/ansi.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/Azure/go-autorest/autorest/adal/go.mod
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/Azure/go-autorest/autorest/adal/go.sum
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/Azure/go-autorest/autorest/adal/sender.go
View file
Open in desktop

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

Loading