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

Support choosing tensorboard version from UI #2690

Merged
merged 37 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
556ace1
Support select tensorflow image for tensorboard
dldaisy Nov 29, 2019
f9259bf
modify test for tensorflow version select
dldaisy Nov 29, 2019
8d541fb
delete not available image entry
dldaisy Nov 29, 2019
e0d2f4b
Support tensorflow image selection to run tensorboard
dldaisy Dec 3, 2019
c89a22b
format code with prettier
dldaisy Dec 4, 2019
1bf624a
use HasPrefix instead of regexp
dldaisy Dec 4, 2019
301ec41
delete
dldaisy Dec 6, 2019
07ba4fc
modified tensorboard test
dldaisy Dec 11, 2019
68ae3bf
delete tensorboard
dldaisy Dec 11, 2019
45af753
modify typo
dldaisy Dec 11, 2019
324bc83
test tensorboard
dldaisy Dec 11, 2019
81dab3b
Merge remote-tracking branch 'upstream/master'
dldaisy Dec 11, 2019
9578720
Merge remote-tracking branch 'upstream/master'
dldaisy Dec 11, 2019
48bffbc
tensorboard test
dldaisy Dec 11, 2019
65ff6bb
fuck
dldaisy Dec 11, 2019
df9c9fa
fuck2
dldaisy Dec 11, 2019
9a22416
modify test
dldaisy Dec 17, 2019
d896c4c
merge master
dldaisy Dec 17, 2019
13b5cf6
modify typo in tensorboard hint
dldaisy Dec 17, 2019
c05c1ee
npm run format
dldaisy Dec 18, 2019
6bfb09a
modify tensorboard snapshot
dldaisy Dec 18, 2019
65b1d4a
compatible with previous kfp version. Allow vacant tensorflowImage fi…
dldaisy Dec 19, 2019
e8f6644
add 2 tests for dialog
dldaisy Dec 19, 2019
5bed8d8
modify default tensorflow image to 1.13.2
dldaisy Dec 19, 2019
2900699
merge get version and get tensorboard; let --bind_all support tensorb…
dldaisy Dec 20, 2019
a8308c7
modify reconciler.go
dldaisy Dec 23, 2019
d5a2e15
reconciler rollback
dldaisy Dec 23, 2019
5c5687a
modify corresponding test for --bind_all
dldaisy Dec 23, 2019
0042e1f
modify requested chances 12/23
dldaisy Dec 23, 2019
a6374ae
formControl sorted alphabetically
dldaisy Dec 23, 2019
e3ee9f8
select sorted alphabetically
dldaisy Dec 23, 2019
8801bb2
modify details from PR request 12/24
dldaisy Dec 24, 2019
4bf953a
moidfy format
dldaisy Dec 24, 2019
34e26ed
modify details 12/23
dldaisy Dec 24, 2019
fec3711
modify snapshot
dldaisy Dec 24, 2019
04048ac
retest
dldaisy Dec 24, 2019
f0e1790
retest
dldaisy Dec 24, 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
6 changes: 6 additions & 0 deletions backend/src/crd/controller/viewer/reconciler/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ package reconciler
import (
"context"
"fmt"
"strings"

"github.com/golang/glog"
viewerV1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1beta1"
Expand Down Expand Up @@ -180,6 +181,11 @@ func setPodSpecForTensorboard(view *viewerV1beta1.Viewer, s *corev1.PodSpec) {
// when https://github.com/kubeflow/pipelines/issues/2514 is done
// "--bind_all",
}

if !strings.HasPrefix(view.Spec.TensorboardSpec.TensorflowImage, `tensorflow/tensorflow:1.`) {
c.Args = append(c.Args, "--bind_all")
}

c.Ports = []corev1.ContainerPort{
corev1.ContainerPort{ContainerPort: viewerTargetPort},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ func TestReconcile_EachViewerCreatesADeployment(t *testing.T) {
Args: []string{
"tensorboard",
"--logdir=gs://tensorboard/logdir",
"--path_prefix=/tensorboard/viewer-123/"},
"--path_prefix=/tensorboard/viewer-123/",
"--bind_all"},
Ports: []corev1.ContainerPort{{ContainerPort: 6006}},
}}}}}}}

Expand Down Expand Up @@ -279,7 +280,8 @@ func TestReconcile_ViewerUsesSpecifiedVolumeMountsForDeployment(t *testing.T) {
Args: []string{
"tensorboard",
"--logdir=gs://tensorboard/logdir",
"--path_prefix=/tensorboard/viewer-123/"},
"--path_prefix=/tensorboard/viewer-123/",
"--bind_all"},
Ports: []corev1.ContainerPort{{ContainerPort: 6006}},
VolumeMounts: []v1.VolumeMount{
{Name: "/volume-mount-name", MountPath: "/mount/path"},
Expand Down
Loading