Skip to content

Commit 28cae3f

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #22833 from soltysh/rebase_1.14.0
Rebase 1.14.0
2 parents cf89496 + b4f6be3 commit 28cae3f

10,815 files changed

Lines changed: 1693334 additions & 1069648 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Godeps/Godeps.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/hypershift/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/spf13/pflag"
1313

1414
genericapiserver "k8s.io/apiserver/pkg/server"
15-
utilflag "k8s.io/apiserver/pkg/util/flag"
16-
"k8s.io/apiserver/pkg/util/logs"
15+
utilflag "k8s.io/component-base/cli/flag"
16+
"k8s.io/component-base/logs"
1717

1818
"github.com/openshift/library-go/pkg/serviceability"
1919
"github.com/openshift/origin/pkg/cmd/openshift-apiserver"

‎cmd/oc/oc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
11-
"k8s.io/apiserver/pkg/util/logs"
11+
"k8s.io/component-base/logs"
1212
"k8s.io/kubernetes/pkg/kubectl/scheme"
1313

1414
"github.com/openshift/api/apps"

‎cmd/openshift-integrated-oauth-server/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/spf13/pflag"
1313

1414
genericapiserver "k8s.io/apiserver/pkg/server"
15-
utilflag "k8s.io/apiserver/pkg/util/flag"
16-
"k8s.io/apiserver/pkg/util/logs"
15+
utilflag "k8s.io/component-base/cli/flag"
16+
"k8s.io/component-base/logs"
1717

1818
"github.com/openshift/library-go/pkg/serviceability"
1919
"github.com/openshift/origin/pkg/cmd/openshift-integrated-oauth-server"

‎cmd/openshift-sdn/openshift-sdn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"time"
77

8-
"k8s.io/apiserver/pkg/util/logs"
8+
"k8s.io/component-base/logs"
99

1010
"github.com/openshift/origin/pkg/cmd/flagtypes"
1111
"github.com/openshift/origin/pkg/cmd/openshift-sdn"

‎cmd/openshift-tests/e2e.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var staticSuites = []*ginkgo.TestSuite{
6868
Tests that exercise the OpenShift build functionality.
6969
`),
7070
Matches: func(name string) bool {
71-
return strings.Contains(name, "[Feature:Builds]")
71+
return !strings.Contains(name, "[Disabled") && strings.Contains(name, "[Feature:Builds]")
7272
},
7373
Parallelism: 7,
7474
// TODO: Builds are really flaky right now, remove when we land perf updates and fix io on workers

‎cmd/openshift-tests/openshift-tests.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/spf13/pflag"
1717
"k8s.io/klog"
1818

19-
"k8s.io/apiserver/pkg/util/logs"
19+
"k8s.io/component-base/logs"
2020
"k8s.io/kubernetes/pkg/kubectl/util/templates"
2121
e2e "k8s.io/kubernetes/test/e2e/framework"
2222

‎cmd/openshift/openshift.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"runtime"
88
"time"
99

10-
"k8s.io/apiserver/pkg/util/logs"
10+
"k8s.io/component-base/logs"
1111
"k8s.io/kubernetes/pkg/api/legacyscheme"
1212

1313
"github.com/openshift/library-go/pkg/serviceability"

‎cmd/template-service-broker/tsb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/klog"
1212

1313
genericapiserver "k8s.io/apiserver/pkg/server"
14-
"k8s.io/apiserver/pkg/util/logs"
14+
"k8s.io/component-base/logs"
1515

1616
"github.com/openshift/library-go/pkg/serviceability"
1717
tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"

0 commit comments

Comments
 (0)