Skip to content

rebase 1.17.0 rc.2 #24286

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 26 commits into from
Dec 20, 2019
Merged

rebase 1.17.0 rc.2 #24286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5077039
pin to origin-4.4-kubernetes-1.17.0-rc.2
p0lyn0mial Dec 11, 2019
055e17c
pin other dependencies
p0lyn0mial Dec 11, 2019
37abb07
remove unused packages
p0lyn0mial Dec 11, 2019
9b828d0
UPSTREAM: <drop>: bump(*)
p0lyn0mial Dec 17, 2019
003abcf
UPSTREAM: <drop>: updates k/k bin data
p0lyn0mial Dec 17, 2019
6571f71
UPSTREAM: <drop>: update openapi generation
p0lyn0mial Dec 17, 2019
af4011c
UPSTREAM(node:review): <drop>: rename LegacyManager instead of bumpin…
p0lyn0mial Dec 12, 2019
ffbab88
update references in origin/e2e files
p0lyn0mial Dec 11, 2019
292c327
Replace github.com/coreos/etcd by go.etcd.io/etcd
p0lyn0mial Dec 12, 2019
7dcc8ec
fix version in Docker image
p0lyn0mial Dec 13, 2019
5c487f8
UPSTREAM: <carry>: skip openshift-apiserver served CRDs from crd-disc…
soltysh Dec 13, 2019
a2b0565
fixing etcd storage path test as EndpointSlice feature gate was disabled
p0lyn0mial Dec 13, 2019
cfa017d
fixing cmd test case as extensions/v1beta1 was disabled
p0lyn0mial Dec 13, 2019
390e4e0
disable sig-cloud-provider-gcp aka sig-cluster-lifecycle tests - unsu…
p0lyn0mial Dec 14, 2019
417d3b6
UPSTREAM: 86354: improves watch and report e2e test
p0lyn0mial Dec 15, 2019
bfc9fad
etcd storage path tests add removed APIs
p0lyn0mial Dec 15, 2019
c6c8274
disable EndpointSlices (Alpha) test
p0lyn0mial Dec 15, 2019
242d7d7
UPSTREAM: <carry>: ignore StorageState and StorageVersionMigration wh…
p0lyn0mial Dec 16, 2019
9fcfb2e
UPSTREAM: <carry>: GC doesn't ignore apps/deployments
p0lyn0mial Dec 17, 2019
1970c57
UPSTREAM: <carry>: Remove a redundant output in the tests
smarterclayton Dec 18, 2019
a6de55a
UPSTREAM: <carry>: Expose a simple journald shim on the kubelet logs …
soltysh Dec 5, 2019
aceffea
UPSTREAM: 86009: kubelet: guarantee at most only one cinfo per contai…
rphillips Dec 7, 2019
7591ee5
make master publish to origin-4.4-kubernetes-1.17.0-rc.2
p0lyn0mial Dec 18, 2019
be2b7df
bump test/conformance-k8s.sh to point to 1.17
p0lyn0mial Dec 19, 2019
c635a34
UPSTREAM: <carry>: conditionally fill the UserAgent from the currentl…
p0lyn0mial Dec 19, 2019
41dea56
openshift-test: don't set the UserAgent to include the current test n…
p0lyn0mial Dec 19, 2019
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: 1 addition & 1 deletion Godeps/Godeps.json
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 cmd/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package cmd

import (
// for hyperkube
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
_ "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
_ "k8s.io/kubernetes/cmd/kube-apiserver/app"
_ "k8s.io/kubernetes/cmd/kube-controller-manager/app"
_ "k8s.io/kubernetes/cmd/kube-proxy/app"
_ "k8s.io/kubernetes/cmd/kube-scheduler/app"
_ "k8s.io/kubernetes/cmd/kubelet/app"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
_ "k8s.io/kubernetes/pkg/kubectl/cmd"
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
)
6 changes: 3 additions & 3 deletions cmd/openshift-tests/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/pflag"

"k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/test/e2e/lifecycle"
"k8s.io/kubernetes/test/e2e/cloud/gcp"
"k8s.io/kubernetes/test/e2e/upgrades"

"github.com/openshift/origin/pkg/test/ginkgo"
Expand Down Expand Up @@ -94,8 +94,8 @@ func initUpgrade(value string) error {
}
for _, suite := range upgradeSuites {
if suite.Name == opt.Suite {
lifecycle.SetUpgradeTarget("")
lifecycle.SetUpgradeImage(opt.ToImage)
gcp.SetUpgradeTarget("")
gcp.SetUpgradeImage(opt.ToImage)
exutil.TestContext.ReportDir = opt.JUnitDir
o, err := opt.OptionsMap()
if err != nil {
Expand Down
Loading