Skip to content

Bug 1873043: Fix annotation generation #25565

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 3 commits into from
Oct 2, 2020
Merged

Bug 1873043: Fix annotation generation #25565

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
b2eefde
Bump(github.com/openshift/kubernetes)
marun Sep 29, 2020
9d98963
make update
marun Sep 29, 2020
b7677b8
Update upgrade testmatching from [Suite:openshift] => not [Suite:k8s]
marun Sep 30, 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
4 changes: 2 additions & 2 deletions cmd/openshift-tests/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var upgradeSuites = []*ginkgo.TestSuite{
Run all tests.
`),
Matches: func(name string) bool {
return strings.Contains(name, "[Feature:ClusterUpgrade]") && strings.Contains(name, "[Suite:openshift]")
return strings.Contains(name, "[Feature:ClusterUpgrade]") && !strings.Contains(name, "[Suite:k8s]")
},
Init: func(opt map[string]string) error {
return upgradeInitArguments(opt, func(string) bool { return true })
Expand All @@ -37,7 +37,7 @@ var upgradeSuites = []*ginkgo.TestSuite{
Run only the tests that verify the platform remains available.
`),
Matches: func(name string) bool {
return strings.Contains(name, "[Feature:ClusterUpgrade]") && strings.Contains(name, "[Suite:openshift]")
return strings.Contains(name, "[Feature:ClusterUpgrade]") && !strings.Contains(name, "[Suite:k8s]")
},
Init: func(opt map[string]string) error {
return upgradeInitArguments(opt, func(name string) bool {
Expand Down
14 changes: 7 additions & 7 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.13
go 1.15

require (
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
Expand Down Expand Up @@ -420,10 +420,10 @@ replace (
k8s.io/api => k8s.io/api v0.19.0-rc.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.2
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.2
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200925093421-31bf081b178d
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200929205038-beb741bdf00a
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.2
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200925093421-31bf081b178d
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200925093421-31bf081b178d
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200929205038-beb741bdf00a
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200929205038-beb741bdf00a
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.2
k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.2
k8s.io/component-base => k8s.io/component-base v0.19.0-rc.2
Expand All @@ -432,14 +432,14 @@ replace (
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-20200925093421-31bf081b178d
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200929205038-beb741bdf00a
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200925093421-31bf081b178d
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200925093421-31bf081b178d
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200929205038-beb741bdf00a
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200929205038-beb741bdf00a
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.2
Expand Down
24 changes: 12 additions & 12 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,18 +436,18 @@ github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 h1:E6WhVL5p3rf
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE=
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-alpha.0.0.20200925093421-31bf081b178d h1:5bdZLv31JO1LHi1fduTrzU+gmFks8NZ31EUnXh6NWpM=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200925093421-31bf081b178d/go.mod h1:thZ+fVBomGpLqnFpgVP7zLoR1cZr5ceY0Ccrrw5DUPc=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200925093421-31bf081b178d h1:vPofpZz2Xl0RMA+H9oAQWouGuBXeI2aduIqchEARIsc=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200925093421-31bf081b178d/go.mod h1:wR/2WpnpEiQEhbGJyD7pRwxVsSEW4H3QKgvH4LBr97I=
github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200925093421-31bf081b178d h1:3XtryoLm1yQEYfIa4I49aUKLRFq/zGogY/ypQITe0DY=
github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200925093421-31bf081b178d/go.mod h1:PKE732z15ZBntzuIso4UituryF6ls1srirW354KG/ag=
github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200925093421-31bf081b178d h1:vnZMnl7/B0borRk+6DSm/vUwfMu7Iw2+nNmZnUbIX3Q=
github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200925093421-31bf081b178d/go.mod h1:xzTMREjOlgHSSvy4fYZPWLzPkYSn7Y0QmDpP2v3KQ24=
github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200925093421-31bf081b178d h1:vXnl91HSoBX06SJzL6u6VLQt/lVTJR/Mf+hdhA2C3ew=
github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200925093421-31bf081b178d/go.mod h1:DaF/5oFo8hXpqC477u574XitO+uLNInMmaSkNYJiDSU=
github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200925093421-31bf081b178d h1:ViiDMLi5Je45l/mGojs3Y9PsMEF/a12GXlFMczttRjI=
github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200925093421-31bf081b178d/go.mod h1:Jsv6Huoke+fYBJz8CGV1m3A1EL3tOzSvQKiC0O6ohTQ=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200929205038-beb741bdf00a h1:t7+apc3GaSGAmdzvUURWL/erMftgeCmNqjQvMjmbHg4=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20200929205038-beb741bdf00a/go.mod h1:thZ+fVBomGpLqnFpgVP7zLoR1cZr5ceY0Ccrrw5DUPc=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200929205038-beb741bdf00a h1:myKkOKIAaG437AzaYnP8K4CoeB5x+MBk2nOmaph+H8E=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200929205038-beb741bdf00a/go.mod h1:wR/2WpnpEiQEhbGJyD7pRwxVsSEW4H3QKgvH4LBr97I=
github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200929205038-beb741bdf00a h1:3QlvpglbuEsybU85F1C5E0yx8KmZRnD3Ea/pWCxG4HE=
github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200929205038-beb741bdf00a/go.mod h1:PKE732z15ZBntzuIso4UituryF6ls1srirW354KG/ag=
github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200929205038-beb741bdf00a h1:atR0SNfqNZPZzDRU+kmRJZC896NntRABTBhjX0pX/9g=
github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200929205038-beb741bdf00a/go.mod h1:xzTMREjOlgHSSvy4fYZPWLzPkYSn7Y0QmDpP2v3KQ24=
github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200929205038-beb741bdf00a h1:ngsgvD8jd1pOV2RxY1sl7tK0gHXFt4QpHXCY9M67II0=
github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200929205038-beb741bdf00a/go.mod h1:DaF/5oFo8hXpqC477u574XitO+uLNInMmaSkNYJiDSU=
github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200929205038-beb741bdf00a h1:GIi1a+Lx4K2KmfuB69oB7G/ECWJ3A56DYukoEV3xAI4=
github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200929205038-beb741bdf00a/go.mod h1:Jsv6Huoke+fYBJz8CGV1m3A1EL3tOzSvQKiC0O6ohTQ=
github.com/openshift/library-go v0.0.0-20200831114015-2ab0c61c15de/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ=
github.com/openshift/library-go v0.0.0-20200902112127-a4e32e339219 h1:dhz1PgLYnWYpfXad452f/5P0wMU6MZvOlPIkPRzK7ro=
github.com/openshift/library-go v0.0.0-20200902112127-a4e32e339219/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ=
Expand Down
Loading