Skip to content

Bug 1986003: bump k8s.io to 1.22.0-rc.0 #26366

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 9 commits into from
Aug 19, 2021
Merged

Bug 1986003: bump k8s.io to 1.22.0-rc.0 #26366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
59599fa
bump(k8s.io/*): v0.22.0-rc.0
soltysh Aug 11, 2021
6cab827
Change imports for go.etcd.io/etcd v3.5.0
soltysh Aug 2, 2021
49fb87c
React to k8s, grpc and library-go bumps
soltysh Aug 2, 2021
7e2e38b
Get rid of --viper-config which was removed in k8s
soltysh Aug 2, 2021
a61e516
Bug 1986001: bring back api data and resorucequota tests
soltysh Aug 2, 2021
97caa63
Update test images based on k8s bump
soltysh Aug 11, 2021
2726e47
Update etcd data tests based on k8s bump
soltysh Aug 11, 2021
d0e7495
Disable [sig-network] Networking should provider Internet connection …
soltysh Aug 18, 2021
fda3e1e
Generated changes
soltysh Aug 11, 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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 0 additions & 2 deletions cmd/openshift-tests/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"

reale2e "k8s.io/kubernetes/test/e2e"
e2e "k8s.io/kubernetes/test/e2e/framework"

exutil "github.com/openshift/origin/test/extended/util"
Expand Down Expand Up @@ -44,7 +43,6 @@ func initializeTestFramework(context *e2e.TestContextType, config *exutilcluster
context.AllowedNotReadyNodes = -1
context.MinStartupPods = -1
context.MaxNodesToGather = 0
reale2e.SetViperConfig(os.Getenv("VIPERCONFIG"))

// allow the CSI tests to access test data, but only briefly
// TODO: ideally CSI would not use any of these test methods
Expand Down
115 changes: 59 additions & 56 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.4
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.5
github.com/google/uuid v1.1.2
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
github.com/lestrrat-go/jspointer v0.0.0-20181205001929-82fadba7561c // indirect
Expand All @@ -29,80 +29,83 @@ require (
github.com/lpabon/godbc v0.1.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/onsi/ginkgo v4.7.0-origin.0+incompatible
github.com/onsi/gomega v1.7.0
github.com/onsi/gomega v1.10.1
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20210624153211-ae79113891b0
github.com/openshift/apiserver-library-go v0.0.0-20210521113822-91c23a9a7ddf
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-20210805075156-d8fab4513288
github.com/openshift/apiserver-library-go v0.0.0-20210730115713-954659d29e40
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
github.com/openshift/library-go v0.0.0-20210804150119-965974e0af3f
github.com/pborman/uuid v1.2.0
github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.10.0
github.com/spf13/cobra v1.1.1
github.com/prometheus/common v0.26.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/stretchr/objx v0.2.0
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
go.etcd.io/etcd/api/v3 v3.5.0
go.etcd.io/etcd/client/v3 v3.5.0
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
google.golang.org/grpc v1.27.1
google.golang.org/grpc v1.38.0
gopkg.in/ldap.v2 v2.5.1
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver 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/api v0.22.0-rc.0
k8s.io/apiextensions-apiserver 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/component-helpers v0.0.0
k8s.io/klog/v2 v2.8.0
k8s.io/kube-aggregator v0.21.1
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/kubectl v0.21.1
k8s.io/kubelet v0.21.1
k8s.io/kubernetes v1.21.1
k8s.io/legacy-cloud-providers v0.21.1
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
k8s.io/klog/v2 v2.9.0
k8s.io/kube-aggregator v0.22.0-rc.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/kubectl v0.22.0-rc.0
k8s.io/kubelet v0.22.0-rc.0
k8s.io/kubernetes v1.22.0-rc.0
k8s.io/legacy-cloud-providers v0.22.0-rc.0
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.33.2-0.20210610135131-57b941c7657a
github.com/onsi/ginkgo => github.com/openshift/onsi-ginkgo v4.7.0-origin.0+incompatible
github.com/opencontainers/runc => github.com/openshift/opencontainers-runc v1.0.0-rc95.0.20210608002938-1f5126fe967e
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210624185839-c6914a80ec2e
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210624185839-c6914a80ec2e
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210624185839-c6914a80ec2e
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210624185839-c6914a80ec2e
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210624185839-c6914a80ec2e
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210624185839-c6914a80ec2e
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210624185839-c6914a80ec2e
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210624185839-c6914a80ec2e
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210624185839-c6914a80ec2e
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210624185839-c6914a80ec2e
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210624185839-c6914a80ec2e
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210624185839-c6914a80ec2e
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210624185839-c6914a80ec2e
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210624185839-c6914a80ec2e
k8s.io/kubernetes => github.com/openshift/kubernetes v1.21.2-0.20210624185839-c6914a80ec2e
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210624185839-c6914a80ec2e
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210624185839-c6914a80ec2e
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210624185839-c6914a80ec2e
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210624185839-c6914a80ec2e
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210624185839-c6914a80ec2e
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210624185839-c6914a80ec2e
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210810234706-9b1230e88478
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210810234706-9b1230e88478
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210810234706-9b1230e88478
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210810234706-9b1230e88478
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210810234706-9b1230e88478
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210810234706-9b1230e88478
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210810234706-9b1230e88478
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210810234706-9b1230e88478
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210810234706-9b1230e88478
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210810234706-9b1230e88478
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210810234706-9b1230e88478
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210810234706-9b1230e88478
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210810234706-9b1230e88478
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210810234706-9b1230e88478
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210810234706-9b1230e88478
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210810234706-9b1230e88478
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210810234706-9b1230e88478
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210810234706-9b1230e88478
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210810234706-9b1230e88478
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210810234706-9b1230e88478
k8s.io/kubernetes => github.com/openshift/kubernetes v1.22.0-rc.0.0.20210810234706-9b1230e88478
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210810234706-9b1230e88478
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210810234706-9b1230e88478
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210810234706-9b1230e88478
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20210810234706-9b1230e88478
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210810234706-9b1230e88478
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210810234706-9b1230e88478
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210810234706-9b1230e88478
)
Loading