switch logs, idle commands to externals #20343

juanvallejo · 2018-07-17T18:28:01Z

Depends on #20362

Switches more commands to deal with external versions of objects
Picks kubernetes/kubernetes#66352

juanvallejo · 2018-07-17T20:52:14Z

pkg/oc/cli/logs/logs.go

-		appsapi.Resource("deploymentconfigs"):
+	case appsapiv1.Resource("deploymentconfig"),
+		appsapiv1.Resource("deploymentconfigs"):
+		// TODO: switch to using appsapiv1.DeploymentLogOptions once originpolymorphichelpers.LogsForObjectFn supports appsv1


@deads2k fyi. Using the external api here to create the DeploymentLogOptions object would also involve changes to the logsforobject Origin polymorphic helper: https://github.com/openshift/origin/blob/master/pkg/oc/originpolymorphichelpers/logsforobject.go#L33

@deads2k fyi. Using the external api here to create the DeploymentLogOptions object would also involve changes to the logsforobject Origin polymorphic helper:

update that in this pull..

juanvallejo · 2018-07-17T21:25:05Z

/test extended_clusterup

juanvallejo · 2018-07-18T14:59:30Z

/test gcp

juanvallejo · 2018-07-18T20:15:25Z

pkg/oc/originpolymorphichelpers/logsforobject.go

+			if err != nil {
+				return nil, err
+			}
+			return appsmanualclient.NewRolloutLogClient(appsClient.Apps().RESTClient(), t.Namespace).Logs(t.Name, *dopts), nil


@deads2k not sure how to handle this - do we have a rollout client (or buildlogClient for the case below) whose Logs method receives versioned options?

i made an external version for this here #20362

juanvallejo · 2018-07-20T15:28:36Z

@DirectXMan12 could you give a quick look to the unidling_controller changes? Should be just the second commit

DirectXMan12 · 2018-07-20T16:13:59Z

unidling changes look fine.

soltysh

We need to be strict about the import aliases so that they are self-explanatory. Fix them and rebase, please.

soltysh · 2018-07-26T10:04:53Z

pkg/oc/cli/logs/logs_test.go

@@ -12,9 +12,10 @@ import (
 	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"

+	buildapi "github.com/openshift/api/build/v1"


buildv1 always

soltysh · 2018-07-26T10:05:03Z

pkg/oc/cli/logs/logs_test.go

 	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	buildfake "github.com/openshift/origin/pkg/build/generated/internalclientset/fake"
+	internalbuildapi "github.com/openshift/origin/pkg/build/apis/build"


buildapi always

soltysh · 2018-07-26T10:05:35Z

pkg/oc/cli/logs/logs_test.go

 				Object:    tc.o,
 				Namespace: "foo",
 			},
 			Client: fakebc.Build(),
 		}
-		if err := o.RunLog(); err != nil {
+		if err := o.runLogPipeline(); err != nil {


Why this change?

The test TestRunLogForPipelineStrategy was only testing that portion of the code. Splitting it out made it easier to test

soltysh · 2018-07-26T10:06:09Z

pkg/oc/cli/logs/logs.go

-	"github.com/openshift/api/apps"
-	"github.com/openshift/api/build"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsapiv1 "github.com/openshift/api/apps/v1"


soltysh · 2018-07-26T10:06:15Z

pkg/oc/cli/logs/logs.go

-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsapiv1 "github.com/openshift/api/apps/v1"
+	buildapiv1 "github.com/openshift/api/build/v1"
+	buildclientv1 "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"


buildv1client

soltysh · 2018-07-26T10:06:32Z

pkg/cmd/openshift-controller-manager/controller/unidling.go

@@ -8,6 +8,7 @@ import (
 	appsclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	unidlingcontroller "github.com/openshift/origin/pkg/unidling/controller"
+	kubernetes "k8s.io/client-go/kubernetes/typed/core/v1"


soltysh · 2018-07-26T10:07:13Z

pkg/oc/cli/idle/idle.go

 	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
+	"k8s.io/client-go/kubernetes"


clientset

soltysh · 2018-07-26T10:10:45Z

pkg/unidling/controller/unidling_controller.go

@@ -20,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	kubernetes "k8s.io/client-go/kubernetes/typed/core/v1"


corev1client

soltysh · 2018-07-26T10:11:00Z

pkg/unidling/util/scale.go

 	kextapi "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
+	kubernetes "k8s.io/client-go/kubernetes/typed/core/v1"


corev1client

soltysh · 2018-07-26T10:24:51Z

pkg/oc/originpolymorphichelpers/logsforobject.go

+				return nil, err
+			}
+			return appsmanualclientv1.NewRolloutLogClient(appsClient.RESTClient(), t.Namespace).Logs(t.Name, *dopts), nil
+		case *buildapiv1.Build:


You're missing buildv1.BuildConfig as well.

soltysh · 2018-07-26T10:54:12Z

pkg/oc/originpolymorphichelpers/logsforobject.go

+			if err != nil {
+				return nil, err
+			}
+			return buildmanualclientv1.NewBuildLogClient(buildClient.RESTClient(), t.Namespace).Logs(t.Name, *bopts), nil
 		case *buildapi.Build:


Additionally, since we've just migrated logs to external, do we need internals here?

Actually, I take that back, I see we're using this in quite a few places so we need to provide a smooth path. Sighs....

soltysh

A few nits, fix them a feel free to lgtm
/approve

soltysh · 2018-07-26T20:26:33Z

pkg/oc/cli/logs/logs.go

-	"github.com/openshift/api/build"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsv1 "github.com/openshift/api/apps/v1"
+	buildapiv1 "github.com/openshift/api/build/v1"


openshift-ci-robot · 2018-07-26T20:29:55Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: juanvallejo, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

juanvallejo · 2018-07-26T20:40:57Z

/test extended_clusterup

juanvallejo · 2018-07-26T22:09:01Z

/test extended_builds

openshift-ci-robot · 2018-07-26T22:17:53Z

New changes are detected. LGTM label has been removed.

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 17, 2018

openshift-ci-robot requested review from enj and soltysh July 17, 2018 18:28

openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 17, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch 2 times, most recently from 60f9c87 to 2d5e0e4 Compare July 17, 2018 20:50

juanvallejo commented Jul 17, 2018

View reviewed changes

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from 2d5e0e4 to 0733f44 Compare July 17, 2018 22:08

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch 3 times, most recently from f2dc629 to 5c4ee6b Compare July 18, 2018 20:13

juanvallejo commented Jul 18, 2018

View reviewed changes

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch 2 times, most recently from 8240000 to 16898e0 Compare July 19, 2018 14:18

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from 16898e0 to fe66212 Compare July 19, 2018 14:33

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from fe66212 to ee05326 Compare July 19, 2018 22:08

openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 19, 2018

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from ee05326 to 7eb89e6 Compare July 20, 2018 15:27

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2018

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from 7eb89e6 to a9a649a Compare July 23, 2018 18:30

juanvallejo changed the title ~~[WIP] switch logs to externals~~ switch logs to externals Jul 23, 2018

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2018

soltysh requested changes Jul 26, 2018

View reviewed changes

soltysh self-assigned this Jul 26, 2018

soltysh reviewed Jul 26, 2018

View reviewed changes

juanvallejo added 2 commits July 26, 2018 09:43

UPSTREAM: 66352: update logs cmd to deal w external versions

d9cb4d2

make buildlog client external

3f9f93f

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from 53905d1 to c44f49e Compare July 26, 2018 13:47

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 26, 2018

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 26, 2018

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch 2 times, most recently from 6ef5eba to 2c27df7 Compare July 26, 2018 17:48

soltysh approved these changes Jul 26, 2018

View reviewed changes

soltysh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2018

switch logs to externals

8655041

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from 399a79d to ee1036b Compare July 26, 2018 20:38

juanvallejo added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2018

juanvallejo added 2 commits July 26, 2018 18:17

update idle command

74c9c46

update import restrictions

62c5374

juanvallejo force-pushed the jvallejo/switch-more-cmds-to-externals branch from ee1036b to 62c5374 Compare July 26, 2018 22:17

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2018

juanvallejo added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2018

openshift-merge-robot merged commit 3940adf into openshift:master Jul 27, 2018

soltysh mentioned this pull request Jul 27, 2018

update import-image cmd to use external versions #20333

Merged

juanvallejo deleted the jvallejo/switch-more-cmds-to-externals branch July 27, 2018 20:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

switch logs, idle commands to externals #20343

switch logs, idle commands to externals #20343

juanvallejo commented Jul 17, 2018 •

edited

juanvallejo Jul 17, 2018

deads2k Jul 18, 2018

juanvallejo commented Jul 17, 2018

juanvallejo commented Jul 18, 2018

juanvallejo Jul 18, 2018

mfojtik Jul 19, 2018

juanvallejo commented Jul 20, 2018

DirectXMan12 commented Jul 20, 2018

soltysh left a comment

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

juanvallejo Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh Jul 26, 2018

soltysh left a comment

soltysh Jul 26, 2018

openshift-ci-robot commented Jul 26, 2018

juanvallejo commented Jul 26, 2018

juanvallejo commented Jul 26, 2018

openshift-ci-robot commented Jul 26, 2018

switch logs, idle commands to externals #20343

switch logs, idle commands to externals #20343

Conversation

juanvallejo commented Jul 17, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

juanvallejo commented Jul 17, 2018

juanvallejo commented Jul 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

juanvallejo commented Jul 20, 2018

DirectXMan12 commented Jul 20, 2018

soltysh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

soltysh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jul 26, 2018

juanvallejo commented Jul 26, 2018

juanvallejo commented Jul 26, 2018

openshift-ci-robot commented Jul 26, 2018

juanvallejo commented Jul 17, 2018 •

edited