Skip to content
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.

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

fixes 'add docker-for-desktop platform to kfctl (golang)' #2433

Merged
merged 45 commits into from
Feb 14, 2019

Conversation

kkasravi
Copy link
Contributor

@kkasravi kkasravi commented Feb 8, 2019

fixes #2420

this PR is based off of PR #2428


This change is Reviewable

Kam D Kasravi added 30 commits June 29, 2018 18:13
@jlewi
Copy link
Contributor

jlewi commented Feb 10, 2019

Marking this as WIP until #2428 is merged.

Copy link
Member

@ashahba ashahba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kkasravi for the PR. Overall looks good just a few minor comments.

echo SUCCESS

# generate all --email [email protected] --ipName 35.233.240.120
test-known-platforms-generate: test-known-platforms-init
@cd ~/ksonnet && \
kfctl generate all -V && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just do:

PLUGINS_ENVIRONMENT=$(PLUGINS_ENVIRONMENT)

cd ~/minikube && \
kfctl generate all -V --mount-local && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V --mount-local && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

kfctl generate all -V --mount-local && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V --mount-local && \
cd ~/docker-for-desktop && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V --mount-local && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

kfctl generate all -V --mount-local && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V --mount-local && \
cd ~/docker-for-desktop && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V --mount-local && \
cd ~/foo && \
PLUGINS_ENVIRONMENT=$(GOPATH)/src/github.com/kubeflow/kubeflow/bootstrap/bin kfctl generate all -V && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

make debug
```

To go back to where plugins are loaded (this should be the default) run
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about the wording but a better message would be a good idea

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks Ebi - we're going to move most of the plugins back to a static configuration to minimize complexity. The PLUGINS_ENVIRONMENT will probably be set to a specific directory when we add the brew installer.

@kkasravi kkasravi changed the title [WIP] fixes 'add docker-for-desktop platform to kfctl (golang)' fixes 'add docker-for-desktop platform to kfctl (golang)' Feb 12, 2019
Copy link
Contributor Author

@kkasravi kkasravi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 12 files reviewed, 5 unresolved discussions (waiting on @ashahba and @ellis-bigelow)


bootstrap/Makefile, line 107 at r4 (raw file):

Previously, ashahba (Abolfazl Shahbazi) wrote…

I'd just do:

PLUGINS_ENVIRONMENT=$(PLUGINS_ENVIRONMENT)

thanks - i think both are updated now


bootstrap/Makefile, line 109 at r4 (raw file):

Previously, ashahba (Abolfazl Shahbazi) wrote…

same as above

Done.


bootstrap/Makefile, line 111 at r4 (raw file):

Previously, ashahba (Abolfazl Shahbazi) wrote…

same as above

Done.


bootstrap/Makefile, line 113 at r4 (raw file):

Previously, ashahba (Abolfazl Shahbazi) wrote…

same as above

since we're removing some of the plugins and making them static the Makefile doesn't need the PLUGINS_ENVIRONMENT everywhere - but thanks. There are changes from the prior PR

@kkasravi
Copy link
Contributor Author

/assign @ashahba

@kkasravi
Copy link
Contributor Author

@jlewi @ashahba this is ready for review

Copy link
Contributor Author

@kkasravi kkasravi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 8 files reviewed, 5 unresolved discussions (waiting on @ashahba and @ellis-bigelow)


bootstrap/Makefile, line 107 at r4 (raw file):

Previously, kkasravi (Kam Kasravi) wrote…

thanks - i think both are updated now

Done.


bootstrap/Makefile, line 113 at r4 (raw file):

Previously, kkasravi (Kam Kasravi) wrote…

since we're removing some of the plugins and making them static the Makefile doesn't need the PLUGINS_ENVIRONMENT everywhere - but thanks. There are changes from the prior PR

Done.


bootstrap/cmd/kfctl/README.md, line 231 at r4 (raw file):

Previously, kkasravi (Kam Kasravi) wrote…

thanks Ebi - we're going to move most of the plugins back to a static configuration to minimize complexity. The PLUGINS_ENVIRONMENT will probably be set to a specific directory when we add the brew installer.

Done.

Copy link
Contributor

@jlewi jlewi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 32 files at r1, 1 of 3 files at r3, 4 of 13 files at r5.
Reviewable status: 7 of 8 files reviewed, 6 unresolved discussions (waiting on @ashahba, @ellis-bigelow, and @kkasravi)


bootstrap/pkg/client/ksonnet/ksonnet.go, line 294 at r5 (raw file):

		}
	}
	name := "meta-controller-cluster-role-binding"

How come we need separate logic to delete this cluster role binding?

@jlewi
Copy link
Contributor

jlewi commented Feb 14, 2019

just a thought

If you wanted a platform to experiment with the plugin model. docker-for-desktop might be a good one.
It looks like we don't have explicit instructions for it on the website
https://www.kubeflow.org/docs/

/cc @rogaha who added docker for desktop scripts in #1954

Copy link
Contributor Author

@kkasravi kkasravi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great idea, why don't i remove foo.go and move dockerfordesktop.go in it's place.

Reviewable status: 7 of 8 files reviewed, 6 unresolved discussions (waiting on @ashahba, @ellis-bigelow, and @jlewi)


bootstrap/pkg/client/ksonnet/ksonnet.go, line 294 at r5 (raw file):

Previously, jlewi (Jeremy Lewi) wrote…

How come we need separate logic to delete this cluster role binding?

it's an incomplete solution right now, I was starting to doing explicit deletes. kfctl needs to delete all cluster resources based on a list that currently is generated in the application component. We basically need to get this list from ksonnet. I'll fix under #2415.

@kkasravi
Copy link
Contributor Author

@jlewi replaced foo with dockerfordesktop

@jlewi
Copy link
Contributor

jlewi commented Feb 14, 2019

/lgtm
/approve
/hold for @ashahba

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlewi

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

@k8s-ci-robot k8s-ci-robot merged commit 072c74f into kubeflow:master Feb 14, 2019
saffaalvi pushed a commit to StatCan/kubeflow that referenced this pull request Feb 11, 2021
)

* revert to prior version

* fixes kfctl (golang) rename 'ks' directory and app to ksonnet and ksonnet.go respectively

* fixes 'kfctl - Fetch registry automatically'

* fixes 'refactor gcp, minikube, docker-for-desktop, ack to be kfctl plugins'

* change DefaultDevRepo to point to just the repo not repo/kubeflow

* fixes 'refactor gcp, minikube, docker-for-desktop, ack to be kfctl plugins'

* plugins for all existing KfApp instances {ksonnet, minikube, foo}.

* update golang version

* fixes 'docker-for-desktop'

* delete meta-controller-cluster-role-binding

* update README.md

* remove unused var DEBUG

* remove bootstrap/cmd/plugins/foo.go

* merge changes from upstream master

* remove old files, update README.md

* removing foo, making dockerfordesktop a plugin

* remove foo, make dockerfordesktop the plugin
saffaalvi pushed a commit to StatCan/kubeflow that referenced this pull request Feb 12, 2021
)

* revert to prior version

* fixes kfctl (golang) rename 'ks' directory and app to ksonnet and ksonnet.go respectively

* fixes 'kfctl - Fetch registry automatically'

* fixes 'refactor gcp, minikube, docker-for-desktop, ack to be kfctl plugins'

* change DefaultDevRepo to point to just the repo not repo/kubeflow

* fixes 'refactor gcp, minikube, docker-for-desktop, ack to be kfctl plugins'

* plugins for all existing KfApp instances {ksonnet, minikube, foo}.

* update golang version

* fixes 'docker-for-desktop'

* delete meta-controller-cluster-role-binding

* update README.md

* remove unused var DEBUG

* remove bootstrap/cmd/plugins/foo.go

* merge changes from upstream master

* remove old files, update README.md

* removing foo, making dockerfordesktop a plugin

* remove foo, make dockerfordesktop the plugin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add docker-for-desktop platform to kfctl (golang)
5 participants