Skip to content

Bug 1949050: bump(k8s.io/*): 1.21 #26054

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 16 commits into from
May 9, 2021
Merged

Bug 1949050: bump(k8s.io/*): 1.21 #26054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb70a67
bump(k8s.io/*): 1.21
soltysh Apr 25, 2021
e863e68
React to bump
soltysh Apr 7, 2021
81c444f
Add custom timeouts to e2e framework
soltysh Apr 27, 2021
4361853
Bug 1945085: enable back etcd test
soltysh Apr 7, 2021
7828dda
Update images based on k8s bump
soltysh Apr 7, 2021
f49a416
Add exceptions list for test images
soltysh Apr 13, 2021
1f61cca
Remove unused test files
soltysh Apr 20, 2021
e293d34
Disable networking hostNetwork test
soltysh Apr 20, 2021
1c2de98
Disable crictl test
soltysh Apr 22, 2021
9956ff5
Disable firewall rule test
soltysh Apr 22, 2021
76ff11f
Disable Dynamic Provisioning Invalid AWS KMS key test
soltysh Apr 26, 2021
641688c
Disable sig-network tests failing on e2e-metal-ipi-ovn-ipv6
soltysh May 4, 2021
5618f54
Disable GlusterFS since it's not supported in OCP 4.x
soltysh May 4, 2021
1dee4fc
Disable ttlafterfinished job test
soltysh May 6, 2021
84ffe9e
Disable pull from private registry with secret test
soltysh May 6, 2021
c5fbd2f
Generated changes
soltysh Apr 23, 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.
12 changes: 11 additions & 1 deletion cmd/openshift-tests/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,17 @@ const defaultTestImageMirrorLocation = "quay.io/openshift/community-e2e-images"
func createImageMirrorForInternalImages(prefix string, ref reference.DockerImageReference, mirrored bool) ([]string, error) {
source := ref.Exact()

defaults := k8simage.GetOriginalImageConfigs()
initialDefaults := k8simage.GetOriginalImageConfigs()
exceptions := image.Exceptions.List()
defaults := map[int]k8simage.Config{}
for i, config := range initialDefaults {
for _, exception := range exceptions {
if strings.Contains(config.GetE2EImage(), exception) {
continue
}
defaults[i] = config
}
}
updated := k8simage.GetMappedImageConfigs(defaults, ref.Exact())

openshiftDefaults := image.OriginalImages()
Expand Down
102 changes: 47 additions & 55 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/origin

go 1.15
go 1.16

require (
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
Expand All @@ -10,14 +10,13 @@ require (
github.com/boltdb/bolt v1.3.1 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible
github.com/fsouza/go-dockerclient v0.0.0-20171004212419-da3951ba2e9e
github.com/fsouza/go-dockerclient v1.7.1
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.2
github.com/google/go-cmp v0.5.4
github.com/google/uuid v1.1.2
github.com/gorilla/context v1.1.1 // indirect
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
github.com/lestrrat-go/jspointer v0.0.0-20181205001929-82fadba7561c // indirect
github.com/lestrrat-go/jsref v0.0.0-20181205001954-1b590508f37d // indirect
Expand All @@ -31,11 +30,11 @@ require (
github.com/onsi/ginkgo v4.7.0-origin.0+incompatible
github.com/onsi/gomega v1.7.0
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20210420151714-a3c8fa53e01b
github.com/openshift/apiserver-library-go v0.0.0-20201214145556-6f1013f42f98
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
github.com/openshift/client-go v0.0.0-20210416122133-a6ef8fb5934b
github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b
github.com/openshift/api v0.0.0-20210423140644-156ca80f8d83
github.com/openshift/apiserver-library-go v0.0.0-20210415093535-9176fb31e5dc
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e
github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
github.com/openshift/library-go v0.0.0-20210420183610-0e395da73318
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
Expand All @@ -48,65 +47,58 @@ require (
github.com/stretchr/testify v1.6.1
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
google.golang.org/grpc v1.27.1
gopkg.in/ldap.v2 v2.5.1
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.0-rc.0
k8s.io/apiextensions-apiserver v0.20.0
k8s.io/apiextensions-apiserver v0.21.0-rc.0
k8s.io/apimachinery v0.21.0-rc.0
k8s.io/apiserver v0.20.0
k8s.io/cli-runtime v0.20.0
k8s.io/apiserver v0.21.0-rc.0
k8s.io/cli-runtime v0.21.0-rc.0
k8s.io/client-go v0.21.0-rc.0
k8s.io/component-base v0.20.0
k8s.io/component-base v0.21.0-rc.0
k8s.io/component-helpers v0.0.0
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
k8s.io/kubectl v0.20.0
k8s.io/kubelet v0.20.0
k8s.io/kubernetes v1.20.0
k8s.io/legacy-cloud-providers v0.20.0
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/kubectl v0.21.0-rc.0
k8s.io/kubelet v0.21.0-rc.0
k8s.io/kubernetes v1.21.0-rc.0
k8s.io/legacy-cloud-providers v0.21.0-rc.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/onsi/ginkgo => github.com/openshift/onsi-ginkgo v4.7.0-origin.0+incompatible
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20201214145556-6f1013f42f98
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210208155256-e509061a6d18
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210208155256-e509061a6d18
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210208155256-e509061a6d18
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210208155256-e509061a6d18
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210208155256-e509061a6d18
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210208155256-e509061a6d18
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210208155256-e509061a6d18
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210208155256-e509061a6d18
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210208155256-e509061a6d18
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210208155256-e509061a6d18
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210208155256-e509061a6d18
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210208155256-e509061a6d18
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210208155256-e509061a6d18
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210208155256-e509061a6d18
k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v1.0.0
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210208155256-e509061a6d18
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210208155256-e509061a6d18
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210208155256-e509061a6d18
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210208155256-e509061a6d18
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210208155256-e509061a6d18
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210208155256-e509061a6d18
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210208155256-e509061a6d18
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210208155256-e509061a6d18
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210208155256-e509061a6d18
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210208155256-e509061a6d18
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210208155256-e509061a6d18
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210208155256-e509061a6d18
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210208155256-e509061a6d18
k8s.io/system-validators => k8s.io/system-validators v1.0.4
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210429023751-daa555af5040
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210429023751-daa555af5040
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210429023751-daa555af5040
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210429023751-daa555af5040
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210429023751-daa555af5040
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210429023751-daa555af5040
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210429023751-daa555af5040
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210429023751-daa555af5040
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210429023751-daa555af5040
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210429023751-daa555af5040
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210429023751-daa555af5040
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210429023751-daa555af5040
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210429023751-daa555af5040
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210429023751-daa555af5040
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210429023751-daa555af5040
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210429023751-daa555af5040
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210429023751-daa555af5040
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210429023751-daa555af5040
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210429023751-daa555af5040
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210429023751-daa555af5040
k8s.io/kubernetes => github.com/openshift/kubernetes v1.21.0-rc.0.0.20210426183659-cd6d8b086ad5
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210429023751-daa555af5040
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210429023751-daa555af5040
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210429023751-daa555af5040
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210429023751-daa555af5040
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210429023751-daa555af5040
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210429023751-daa555af5040
)
Loading