Skip to content

Commit

Permalink
Merge pull request #3678 from kubeflow/master
Browse files Browse the repository at this point in the history
Sync v0.6 to master head.
Manual merge since CLA won't pass
  • Loading branch information
kunmingg committed Jul 17, 2019
2 parents 15c2e21 + e6944f3 commit 1784d6f
Show file tree
Hide file tree
Showing 21 changed files with 870 additions and 536 deletions.
1 change: 1 addition & 0 deletions bootstrap/config/kfctl_gcp_iap.0.6.yaml
Expand Up @@ -167,6 +167,7 @@ spec:
- common
- examples
- admission-webhook
- istio
- jupyter
- katib-v1alpha2
- metacontroller
Expand Down
145 changes: 145 additions & 0 deletions bootstrap/config/kfctl_k8s_istio.yaml
@@ -0,0 +1,145 @@
# This is the config to install Kubeflow on an existing k8s cluster.
# If the cluster already has istio, comment out the istio install part (2 places) below.
apiVersion: kfdef.apps.kubeflow.org/v1alpha1
kind: KfDef
metadata:
name: demo
namespace: kubeflow
spec:
componentParams:
application:
- name: overlay
value: application
argo:
- name: overlay
value: istio
centraldashboard:
- name: overlay
value: istio
# Istio install. If not needed, comment out istio-crds and istio-install.
istio-crds:
- name: namespace
value: istio-system
istio-install:
- name: namespace
value: istio-system
jupyter:
- name: overlay
value: application
jupyter-web-app:
- name: overlay
value: istio
- name: overlay
value: application
katib-ui: # Issue: https://github.com/kubeflow/manifests/issues/151
- name: overlay
value: istio
minio:
- name: minioPd
value: dls-kf-storage-artifact-store
- name: minioPvName
value: minio-pv
- name: minioPvcName
value: minio-pv-claim
mysql:
- name: mysqlPd
value: dls-kf-storage-metadata-store
- name: mysqlPvName
value: mysql-pv
- name: mysqlPvcName
value: mysql-pv-claim
notebook-controller:
- name: overlay
value: istio
- name: overlay
value: application
pipelines-ui:
- name: overlay
value: istio
profiles:
- name: overlay
value: istio
- initRequired: true
name: admin
value: johnDoe@acme.com
spartakus:
- initRequired: true
name: usageId
value: <randomly-generated-id>
- initRequired: true
name: reportUsage
value: "true"
tensorboard:
- name: overlay
value: istio
tf-job-operator:
- name: overlay
value: istio
seldon-core-operator:
- name: overlay
value: application
components:
# Istio install. If not needed, comment out istio-crds and istio-install.
- istio-crds
- istio-install
# This component is the istio resources for Kubeflow (e.g. gateway), not about installing istio.
- istio
- application-crds
- application
- metacontroller
- argo
- centraldashboard
- bootstrap
- webhook
- jupyter-web-app
- katib-db
- katib-manager
- katib-controller
- katib-ui
- metrics-collector
- suggestion
- notebook-controller
- pytorch-job-crds
- pytorch-operator
- spartakus
- tensorboard
- tf-job-operator
- api-service
- minio
- mysql
- persistent-agent
- pipelines-runner
- pipelines-ui
- pipelines-viewer
- scheduledworkflow
- profiles
- seldon-core-operator
enableApplications: true
packageManager: kustomize
packages:
- argo
- common
- examples
- admission-webhook
- istio
- jupyter
- katib-v1alpha2
- metacontroller
- modeldb
- mpi-job
- pytorch-job
- seldon
- tensorboard
- tf-serving
- tf-training
- pipeline
- profiles
- application
useIstio: true
repos:
- name: manifests
root: manifests-master
uri: https://github.com/kubeflow/manifests/archive/master.tar.gz
- name: kubeflow
root: kubeflow-master
uri: https://github.com/kubeflow/kubeflow/archive/master.tar.gz
2 changes: 2 additions & 0 deletions bootstrap/config/overlays/basic_auth/kfctl_default.yaml
Expand Up @@ -8,12 +8,14 @@ spec:
- cert-manager-crds
- cert-manager
- cloud-endpoints
- profiles
- gpu-driver
- basic-auth
- basic-auth-ingress
packages:
- cert-manager
- gcp
- profiles
componentParams:
ambassador:
- name: ambassadorServiceType
Expand Down
5 changes: 5 additions & 0 deletions bootstrap/config/overlays/istio/kfctl_default.yaml
Expand Up @@ -20,6 +20,9 @@ spec:
istio-install:
- name: namespace
value: istio-system
istio:
- name: clusterRbacConfig
value: "ON"
iap-ingress:
- name: namespace
value: istio-system
Expand Down Expand Up @@ -50,3 +53,5 @@ spec:
tf-job-operator:
- name: overlay
value: istio
packages:
- istio
25 changes: 12 additions & 13 deletions bootstrap/go.mod
Expand Up @@ -8,8 +8,6 @@ require (
github.com/Masterminds/semver v1.4.2 // indirect
github.com/Masterminds/sprig v2.18.0+incompatible // indirect
github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cenkalti/backoff v2.1.1+incompatible
github.com/coreos/etcd v3.3.11+incompatible // indirect
Expand All @@ -29,9 +27,8 @@ require (
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-openapi/spec v0.18.0 // indirect
github.com/go-openapi/strfmt v0.18.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.2.0
github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.3.1
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-jsonnet v0.12.1 // indirect
Expand All @@ -42,26 +39,29 @@ require (
github.com/hashicorp/go-getter v1.0.2
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
github.com/huandu/xstrings v1.2.0 // indirect
github.com/imdario/mergo v0.3.6
github.com/imdario/mergo v0.3.7
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/kr/pty v1.1.3 // indirect
github.com/ksonnet/ksonnet v0.13.1
github.com/ksonnet/ksonnet-lib v0.1.12 // indirect
github.com/kubeflow/kubeflow/components/profile-controller/v2 v2.0.0
github.com/mitchellh/go-homedir v1.0.0
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/onrik/logrus v0.2.1
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/otiai10/copy v1.0.1
github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
github.com/russross/blackfriday v0.0.0-00010101000000-000000000000 // indirect
github.com/prometheus/common v0.2.0
github.com/russross/blackfriday v1.5.2 // indirect
github.com/sergi/go-diff v1.0.0 // indirect
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
github.com/sirupsen/logrus v1.3.0
github.com/spf13/afero v1.2.0
github.com/spf13/afero v1.2.1
github.com/spf13/cobra v0.0.3
github.com/spf13/viper v1.3.1
github.com/utahta/go-openuri v0.1.0
github.com/utahta/go-openuri v0.1.0 // indirect
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/crypto v0.0.0
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
Expand All @@ -70,9 +70,8 @@ require (
google.golang.org/api v0.6.0
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gopkg.in/square/go-jose.v2 v2.3.0
gopkg.in/square/go-jose.v2 v2.3.0 // indirect
k8s.io/api v0.0.0-20180308224125-73d903622b73
k8s.io/api/v2 v2.0.0
k8s.io/apiextensions-apiserver v0.0.0-20190116054503-cf30b7cf64c2
Expand All @@ -82,9 +81,8 @@ require (
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go/v2 v2.0.0
k8s.io/helm v2.13.0+incompatible // indirect
k8s.io/kube-openapi v0.0.0-20190115222348-ced9eb3070a5 // indirect
k8s.io/kubernetes v0.0.0-00010101000000-000000000000 // indirect
sigs.k8s.io/application/v2 v2.0.0
sigs.k8s.io/application/v2 v2.0.0 // indirect
sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
sigs.k8s.io/controller-runtime/v2 v2.0.0
sigs.k8s.io/kustomize/v2 v2.0.0-00010101000000-000000000000
Expand All @@ -99,6 +97,7 @@ replace (
github.com/go-openapi/spec => github.com/go-openapi/spec v0.18.0
github.com/go-openapi/swag => github.com/go-openapi/swag v0.17.0
github.com/kubeflow/kubeflow/bootstrap v0.0.0 => ./
github.com/kubeflow/kubeflow/components/profile-controller/v2 => /tmp/v2/github.com/kubeflow/kubeflow/components/profile-controller
github.com/mitchellh/go-homedir => github.com/mitchellh/go-homedir v1.0.0
github.com/russross/blackfriday => github.com/russross/blackfriday v1.5.2-0.20180428102519-11635eb403ff // indirect
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
Expand Down

0 comments on commit 1784d6f

Please sign in to comment.