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.

Sign up for GitHub

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

Jump to bottom

Viewer CRD controller running under namespace #1562

Merged
merged 8 commits into from
Jul 3, 2019
Merged

Viewer CRD controller running under namespace #1562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e989a3
Viewer CRD controller running under namespace
jingzhang36 Jun 26, 2019
f3938c9
Change docker file and add manifest deployment yaml to support the ne…
jingzhang36 Jul 1, 2019
c326414
Change docker file to support new flag namespace for viewer crd contr…
jingzhang36 Jul 1, 2019
1832310
Modify kustomization.yaml and namespaced-install.yaml
jingzhang36 Jul 1, 2019
357add0
Change file name from ml-pipeline-viewer-crd-deployment to ml-pipelin…
jingzhang36 Jul 1, 2019
ed225dc
Fix typo
jingzhang36 Jul 1, 2019
59bbec4
Remove some duplicate configs in namespaced-install
jingzhang36 Jul 1, 2019
4074b75
Merge branch 'master' into test1
jingzhang36 Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/crd/controller/viewer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ go_library(
"@io_k8s_client_go//tools/clientcmd:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/builder:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/client:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/manager:go_default_library",
],
)

Expand Down
12 changes: 11 additions & 1 deletion backend/src/crd/controller/viewer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // Needed for GCP authentication.
)
Expand All @@ -42,6 +43,9 @@ var (
maxNumViewers = flag.Int("max_num_viewers", 50,
"Maximum number of viewer instances allowed within "+
"the cluster before the controller starts deleting the oldest one.")
namespace = flag.String("namespace", "kubeflow",
Copy link
Member

Choose a reason for hiding this comment

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

can we expose this through CRD container Dockerfile?
Here is an example
https://github.com/kubeflow/pipelines/blob/master/backend/Dockerfile.scheduledworkflow#L21
https://github.com/kubeflow/pipelines/blob/master/manifests/namespaced-install/ml-pipeline-scheduledworkflow-deployment-patch.yaml#L10

Copy link
Contributor Author

@jingzhang36 jingzhang36 Jul 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Done. And the default namespace is set to be "kubeflow".

"Namespace within which CRD controller is running. Default is "+
"kubeflow.")
)

func main() {
Expand All @@ -67,7 +71,13 @@ func main() {

// Create a controller that is in charge of Viewer types, and also responds to
// changes to any deployment and services that is owned by any Viewer instance.
mgr, err := builder.SimpleController().
mgr, err := manager.New(cfg, manager.Options{Namespace: *namespace})
if err != nil {
log.Fatal(err)
}

_, err = builder.SimpleController().
WithManager(mgr).
ForType(&viewerV1beta1.Viewer{}).
Owns(&appsv1.Deployment{}).
Owns(&corev1.Service{}).
Expand Down