apps: replace legacy client with generated in pkg/deploy/cmd #16149

mfojtik · 2017-09-05T17:21:55Z

Ignore first 3 commits, they are part of #16100

@deads2k last bits in apps group

mfojtik · 2017-09-05T17:23:37Z

pkg/deploy/cmd/delete.go

+type updateConfigFunc func(d *deployapi.DeploymentConfig)
+
+// updateConfigWithRetries will try to update a deployment config and ignore any update conflicts.
+func updateConfigWithRetries(dn appsinternal.DeploymentConfigsGetter, namespace, name string, applyUpdate updateConfigFunc) (*deployapi.DeploymentConfig, error) {


this should probably exists in some helper/util package

@tnozicka do you know if we have this helperized already? i'm pretty sure we doing this in couple places.

haven't seen such helper yet

deads2k · 2017-09-05T17:29:27Z

pkg/deploy/cmd/history.go

 }

 // DeploymentConfigHistoryViewer is an implementation of the kubectl HistoryViewer interface
 // for deployment configs.
 type DeploymentConfigHistoryViewer struct {
 	rn kcoreclient.ReplicationControllersGetter
-	dn client.DeploymentConfigsNamespacer


this was just dead? weird.

yeah... maybe a leftover from some refact.

deads2k · 2017-09-05T17:30:09Z

pkg/deploy/cmd/delete.go

 	kc                    kclientset.Interface
 	pollInterval, timeout time.Duration
 }

+type updateConfigFunc func(d *deployapi.DeploymentConfig)


Not a fan. Why do we still have this?

was just copy from the old client, seems like it is only used in one place, so right, we don't need this.

deads2k · 2017-09-05T17:30:41Z

pkg/deploy/cmd/delete.go

+type updateConfigFunc func(d *deployapi.DeploymentConfig)
+
+// updateConfigWithRetries will try to update a deployment config and ignore any update conflicts.
+func updateConfigWithRetries(dn appsinternal.DeploymentConfigsGetter, namespace, name string, applyUpdate updateConfigFunc) (*deployapi.DeploymentConfig, error) {


This just shouldn't exist. If you want patch behavior, write a patch.

If this was pre-existing, open an issue.

lets fix that, low hanging fruit and I will forget about it: #16166

deads2k · 2017-09-05T17:32:37Z

/lgtm

mfojtik · 2017-09-06T08:39:36Z

/retest

soltysh

lgtm

soltysh · 2017-09-06T10:29:56Z

pkg/cmd/util/clientcmd/factory_object_mapping.go

@@ -221,11 +222,15 @@ func (f *ring1Factory) LogsForObject(object, options runtime.Object, timeout tim

 func (f *ring1Factory) Scaler(mapping *meta.RESTMapping) (kubectl.Scaler, error) {
 	if deployapi.IsKindOrLegacy("DeploymentConfig", mapping.GroupVersionKind.GroupKind()) {
-		oc, kc, err := f.clientAccessFactory.Clients()
+		_, kc, err := f.clientAccessFactory.Clients()


I don't like this. Are we planning to change Clients() to return openshift clientsets in the end? I do hope. Although probably it'll happen only when we actually remove pkg/client

I don't like this. Are we planning to change Clients() to return openshift clientsets in the end? I do hope. Although probably it'll happen only when we actually remove pkg/client

I think we will remove Clients altogether and create separate helpers for each individual type of client.

soltysh · 2017-09-06T10:35:09Z

There are no actual api changes here, just comments for the generation. Applying the api-approved label.
/lgtm

soltysh · 2017-09-06T10:35:21Z

/retest

openshift-merge-robot · 2017-09-06T10:35:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, mfojtik, soltysh

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

Needs approval from an approver in each of these OWNERS Files:

~~pkg/client/OWNERS~~ [deads2k,mfojtik,soltysh]
~~pkg/cmd/OWNERS~~ [deads2k,mfojtik]
~~pkg/deploy/OWNERS~~ [deads2k,mfojtik,soltysh]
~~test/extended/OWNERS~~ [deads2k,mfojtik]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

mfojtik · 2017-09-06T12:03:58Z

/unneeds-api-review

mfojtik · 2017-09-06T12:04:27Z

/joke

openshift-ci-robot · 2017-09-06T12:04:28Z

@mfojtik: I don't trust stairs. They're always up to something.

In response to this:

/joke

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-merge-robot · 2017-09-06T14:48:47Z

Automatic merge from submit-queue

Automatic merge from submit-queue apps: use patch when pausing dc on delete Ignore the first 2 commits, they are part of #16149 Don't try to emulate PATCH behavior with retrying updates on conflicts (of course patch can also conflict, but chances are low). Also we use PATCH for pausing in `oc rollout pause` already, so this just unify this behavior. Ref: #16149 (comment)

openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 5, 2017

openshift-merge-robot assigned abhgupta and soltysh Sep 5, 2017

openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-api-review labels Sep 5, 2017

mfojtik commented Sep 5, 2017

View reviewed changes

deads2k reviewed Sep 5, 2017

View reviewed changes

openshift-ci-robot assigned deads2k Sep 5, 2017

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 5, 2017

mfojtik force-pushed the deploy-clientset-cmd branch from 824be43 to ff5079f Compare September 5, 2017 19:02

openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 5, 2017

mfojtik added 2 commits September 6, 2017 10:40

generate rollback client

99bc9f3

apps: update pkg/deploy/cmd to use generated client

9ff8c20

mfojtik force-pushed the deploy-clientset-cmd branch from ff5079f to 9ff8c20 Compare September 6, 2017 08:41

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 6, 2017

mfojtik mentioned this pull request Sep 6, 2017

apps: use patch when pausing dc on delete #16166

Merged

soltysh approved these changes Sep 6, 2017

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 6, 2017

soltysh added api-approved and removed needs-api-review labels Sep 6, 2017

openshift-merge-robot added the needs-api-review label Sep 6, 2017

openshift-merge-robot merged commit bb340c5 into openshift:master Sep 6, 2017

mfojtik deleted the deploy-clientset-cmd branch September 5, 2018 21:07

apps: replace legacy client with generated in pkg/deploy/cmd #16149

apps: replace legacy client with generated in pkg/deploy/cmd #16149

Uh oh!

Conversation

mfojtik commented Sep 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deads2k commented Sep 5, 2017

Uh oh!

mfojtik commented Sep 6, 2017

Uh oh!

soltysh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

soltysh commented Sep 6, 2017

Uh oh!

soltysh commented Sep 6, 2017

Uh oh!

openshift-merge-robot commented Sep 6, 2017

Uh oh!

mfojtik commented Sep 6, 2017

Uh oh!

mfojtik commented Sep 6, 2017

Uh oh!

openshift-ci-robot commented Sep 6, 2017

Uh oh!

openshift-merge-robot commented Sep 6, 2017

Uh oh!

Uh oh!

mfojtik commented Sep 5, 2017 •

edited

Loading