Use podGroup instead of PDB in v1beta2 #954
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @thandayuthapani. Thanks for your PR. I'm waiting for a kubeflow member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
k82cn
reviewed
Mar 8, 2019
| @@ -21,6 +21,10 @@ required = [ | |||
| name = "github.com/stretchr/testify" | |||
| version = "1.2.2" | |||
|
|
|||
| [[constraint]] | |||
| name = "github.com/kubernetes-sigs/kube-batch" | |||
| version = "v0.3" | |||
There was a problem hiding this comment.
When using using v0.4 of kube-batch, there is dependency conflict for k8s.io/api, which in kubeflow, v1.11.2 is used but in kube-batch 1.13.2 is used, that is why v0.3 is used for kube-batch
There was a problem hiding this comment.
@richardsliu , any plan to upgrade k8s version? 1.14 is going to be release, and upstream only support three latest versions (1.12, 1.13, 1.14) until LTS.
There was a problem hiding this comment.
With v1beta2, the subresource status requires 1.13.
k82cn
reviewed
Mar 8, 2019
|
/ok-to-test |
k82cn
reviewed
Mar 8, 2019
pkg/util/kbutil/kbutil.go
Outdated
| var kubeBatchClientSet kubebatchclient.Interface | ||
|
|
||
| //SetKubeBatchClientSet sets kube-batch client set. | ||
| func SetKubeBatchClientInterface(clientset kubebatchclient.Interface) { |
There was a problem hiding this comment.
Those helper func seems unnecessary.
There was a problem hiding this comment.
we need kube-batch client interface to create and delete podGroup, but if we add it in TFController, then APIs will change, that is why, in util kube-batch util is created and we are setting and getting kube-batch client interface
There was a problem hiding this comment.
which APIs are you referring to?
There was a problem hiding this comment.
APIs for creation and deletion of PodGroup which has been implemented in kube-batch
There was a problem hiding this comment.
Since it is a common feature across operators, you may keep client interface in https://github.com/kubeflow/tf-operator/blob/master/pkg/common/jobcontroller/jobcontroller.go#L80
There was a problem hiding this comment.
But this change might affect v1beta1 also, since APIs are same for both v1beta1 and v1beta2. Since we change JobController API used for creating new JobController will change, so to accomadate this change we have to change to change function calls in v1beta1 also. If that is okay, I can make those changes.
There was a problem hiding this comment.
@thandayuthapani Let's keep the client interface in jobcontroller and make the necessary changes.
johnugeorge
reviewed
Mar 8, 2019
| // Check whether podGroup exists or not | ||
| podGroup, err := kubeBatchClientInterface.SchedulingV1alpha1().PodGroups(job.GetNamespace()).Get(job.GetName(), metav1.GetOptions{}) | ||
| if err == nil || !k8serrors.IsNotFound(err) { | ||
| if err == nil { |
There was a problem hiding this comment.
Have used same error check done for SyncPdb method
There was a problem hiding this comment.
I also find this confusing to read. Why not just split into 2 if-blocks?
johnugeorge
reviewed
Mar 8, 2019
| if err == nil { | ||
| err = errors.New(string(metav1.StatusReasonAlreadyExists)) | ||
| } | ||
| return podGroup, err |
There was a problem hiding this comment.
Do we need to return error if it already exists? Isn't this will be called for every reconcile ?
There was a problem hiding this comment.
In SyncPdb method it has been handled like this, so I have tried to mimic what SyncPdb was doing, but instead of PDB, have handled PodGroup
There was a problem hiding this comment.
I think, we missed this earlier. I don't see any need to return error. @richardsliu
There was a problem hiding this comment.
Okay. Will change that.
thandayuthapani
force-pushed
the
master
branch
2 times, most recently
from
c87d687 to
b411cd9
Compare
Travis tests have failedHey @thandayuthapani, 1st Buildgometalinter --config=linter_config.json --vendor ./...goveralls -service=travis-ci -v -package ./pkg/... -ignore "pkg/client/*/*.go,pkg/client/*/*/*.go,pkg/client/*/*/*/*.go,pkg/client/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*/*.go,pkg/util/testutil/*.go,pkg/apis/tensorflow/*/zz_generated.*.go,pkg/apis/tensorflow/*/*_generated.go,pkg/apis/common/*/zz_generated.*.go,pkg/apis/common/*/*_generated.go"2nd Buildgometalinter --config=linter_config.json --vendor ./...goveralls -service=travis-ci -v -package ./pkg/... -ignore "pkg/client/*/*.go,pkg/client/*/*/*.go,pkg/client/*/*/*/*.go,pkg/client/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*/*.go,pkg/util/testutil/*.go,pkg/apis/tensorflow/*/zz_generated.*.go,pkg/apis/tensorflow/*/*_generated.go,pkg/apis/common/*/zz_generated.*.go,pkg/apis/common/*/*_generated.go"TravisBuddy Request Identifier: 9ad29970-416b-11e9-b4f6-c1bea236eaae |
richardsliu
reviewed
Mar 8, 2019
| log.Infof("Deleting PodGroup %s", job.GetName()) | ||
|
|
||
| //delete podGroup | ||
| if err := kubeBatchClientInterface.SchedulingV1alpha1().PodGroups(job.GetNamespace()).Delete(job.GetName(), &metav1.DeleteOptions{}); err != nil { |
There was a problem hiding this comment.
Nit: easier to read if this is split into 2 lines at the "if"
| // Check whether podGroup exists or not | ||
| podGroup, err := kubeBatchClientInterface.SchedulingV1alpha1().PodGroups(job.GetNamespace()).Get(job.GetName(), metav1.GetOptions{}) | ||
| if err == nil || !k8serrors.IsNotFound(err) { | ||
| if err == nil { |
There was a problem hiding this comment.
I also find this confusing to read. Why not just split into 2 if-blocks?
thandayuthapani
force-pushed
the
master
branch
2 times, most recently
from
e87a4bd to
7163918
Compare
|
/retest |
|
/retest |
Travis tests have failedHey @thandayuthapani, 1st Buildgometalinter --config=linter_config.json --vendor ./...goveralls -service=travis-ci -v -package ./pkg/... -ignore "pkg/client/*/*.go,pkg/client/*/*/*.go,pkg/client/*/*/*/*.go,pkg/client/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*/*.go,pkg/util/testutil/*.go,pkg/apis/tensorflow/*/zz_generated.*.go,pkg/apis/tensorflow/*/*_generated.go,pkg/apis/common/*/zz_generated.*.go,pkg/apis/common/*/*_generated.go"2nd Buildgometalinter --config=linter_config.json --vendor ./...goveralls -service=travis-ci -v -package ./pkg/... -ignore "pkg/client/*/*.go,pkg/client/*/*/*.go,pkg/client/*/*/*/*.go,pkg/client/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*.go,pkg/client/*/*/*/*/*/*/*.go,pkg/util/testutil/*.go,pkg/apis/tensorflow/*/zz_generated.*.go,pkg/apis/tensorflow/*/*_generated.go,pkg/apis/common/*/zz_generated.*.go,pkg/apis/common/*/*_generated.go"TravisBuddy Request Identifier: 54e83b60-4939-11e9-ab4c-bfa38af62fb3 |
|
/lgtm |
johnugeorge
reviewed
Mar 19, 2019
|
|
||
| kubeBatchClientInterface := jc.KubeBatchClientSet | ||
| // Check whether podGroup exists or not | ||
| podGroup, err := kubeBatchClientInterface.SchedulingV1alpha1().PodGroups(job.GetNamespace()).Get(job.GetName(), metav1.GetOptions{}) |
There was a problem hiding this comment.
nitpick: use jc.KubeBatchClientSet directly?
johnugeorge
reviewed
Mar 19, 2019
| kubeBatchClientInterface := jc.KubeBatchClientSet | ||
|
|
||
| //check whether podGroup exists or not | ||
| _, err := kubeBatchClientInterface.SchedulingV1alpha1().PodGroups(job.GetNamespace()).Get(job.GetName(), metav1.GetOptions{}) |
There was a problem hiding this comment.
nitpick: use jc.KubeBatchClientSet directly?
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: johnugeorge 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TFJobyaml should contain annotation intfReplicaSpecswith key asscheduling.k8s.io/group-nameand value as TFJob name.Which issue(s) this PR fixes
Partial Fix #916
This change is