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

feat: Add UI in manifests v1alpha2 #591

Merged
merged 5 commits into from
May 28, 2019
Merged

feat: Add UI in manifests v1alpha2 #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f897f4
feat: Add UI
gaocegege May 27, 2019
4d8d794
fix: Add name
gaocegege May 27, 2019
39c2dd6
fix: Rename
gaocegege May 28, 2019
50ec18e
fix: Fix ui
gaocegege May 28, 2019
b5d3d0e
feat: Support UI
gaocegege May 28, 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
4 changes: 2 additions & 2 deletions manifests/v1alpha2/katib-controller/katib-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ spec:
serviceAccountName: katib-controller
containers:
- name: katib-controller
image: katib/katib-controller
imagePullPolicy: Always
image: katib/v1alpha2/katib-controller
gaocegege marked this conversation as resolved.
Show resolved Hide resolved
imagePullPolicy: IfNotPresent
command: ["./katib-controller"]
ports:
- containerPort: 443
Expand Down
3 changes: 2 additions & 1 deletion manifests/v1alpha2/katib/manager-rest/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ spec:
spec:
containers:
- name: katib-manager-rest
image: katib/katib-manager-rest
image: katib/v1alpha2/katib-manager-rest
imagePullPolicy: IfNotPresent
command:
- './katib-manager-rest'
ports:
Expand Down
3 changes: 2 additions & 1 deletion manifests/v1alpha2/katib/manager/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ spec:
spec:
containers:
- name: katib-manager
image: katib/katib-manager
image: katib/v1alpha2/katib-manager
imagePullPolicy: IfNotPresent
env:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
Expand Down
3 changes: 1 addition & 2 deletions manifests/v1alpha2/katib/manager/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ metadata:
app: katib
component: manager
spec:
type: NodePort
type: ClusterIP
ports:
- port: 6789
protocol: TCP
nodePort: 30678
name: api
selector:
app: katib
Expand Down
3 changes: 2 additions & 1 deletion manifests/v1alpha2/katib/suggestion/random/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ spec:
spec:
containers:
- name: katib-suggestion-random
image: katib/suggestion-random
image: katib/v1alpha2/suggestion-random
imagePullPolicy: IfNotPresent
ports:
- name: api
containerPort: 6789
27 changes: 27 additions & 0 deletions manifests/v1alpha2/katib/ui/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: katib-ui
namespace: kubeflow
labels:
app: katib
component: ui
spec:
replicas: 1
template:
metadata:
name: katib-ui
labels:
app: katib
component: ui
spec:
containers:
- name: katib-ui
image: katib/v1alpha2/katib-ui
imagePullPolicy: IfNotPresent
command:
- './katib-ui'
ports:
- name: ui
containerPort: 80
serviceAccountName: katib-ui
37 changes: 37 additions & 0 deletions manifests/v1alpha2/katib/ui/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: katib-ui
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- "*"
- apiGroups:
- kubeflow.org
resources:
- experiments
- trials
verbs:
- "*"
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: katib-ui
namespace: kubeflow
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: katib-ui
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: katib-ui
subjects:
- kind: ServiceAccount
name: katib-ui
namespace: kubeflow
17 changes: 17 additions & 0 deletions manifests/v1alpha2/katib/ui/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
name: katib-ui
namespace: kubeflow
labels:
app: katib
component: ui
spec:
type: ClusterIP
ports:
- port: 80
protocol: TCP
name: ui
selector:
app: katib
component: ui
1 change: 1 addition & 0 deletions scripts/v1alpha2/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ kubectl apply -f manifests/v1alpha2/katib/manager
kubectl apply -f manifests/v1alpha2/katib/manager-rest
kubectl apply -f manifests/v1alpha2/katib/pv
kubectl apply -f manifests/v1alpha2/katib/db
kubectl apply -f manifests/v1alpha2/katib/ui
kubectl apply -f manifests/v1alpha2/katib/suggestion/random
cd - > /dev/null
2 changes: 0 additions & 2 deletions test/scripts/v1alpha2/build-ui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

# This shell script is used to build an image from our argo workflow

exit 0

set -o errexit
set -o nounset
set -o pipefail
Expand Down
9 changes: 5 additions & 4 deletions test/scripts/v1alpha2/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ echo "REGISTRY ${REGISTRY}"
echo "REPO_NAME ${REPO_NAME}"
echo "VERSION ${VERSION}"

sed -i -e "s@image: katib\/katib-controller@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-controller:${VERSION}@" manifests/v1alpha2/katib-controller/katib-controller.yaml
sed -i -e "s@image: katib\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager:${VERSION}@" manifests/v1alpha2/katib/manager/deployment.yaml
sed -i -e "s@image: katib\/katib-manager-rest@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager-rest:${VERSION}@" manifests/v1alpha2/katib/manager-rest/deployment.yaml
sed -i -e "s@image: katib\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-random:${VERSION}@" manifests/v1alpha2/katib/suggestion/random/deployment.yaml
sed -i -e "s@image: katib\/v1alpha2\/katib-controller@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-controller:${VERSION}@" manifests/v1alpha2/katib-controller/katib-controller.yaml
sed -i -e "s@image: katib\/v1alpha2\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager:${VERSION}@" manifests/v1alpha2/katib/manager/deployment.yaml
sed -i -e "s@image: katib\/v1alpha2\/katib-manager-rest@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager-rest:${VERSION}@" manifests/v1alpha2/katib/manager-rest/deployment.yaml
sed -i -e "s@image: katib\/v1alpha2\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-ui:${VERSION}@" manifests/v1alpha2/katib/ui/deployment.yaml
sed -i -e "s@image: katib\/v1alpha2\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-random:${VERSION}@" manifests/v1alpha2/katib/suggestion/random/deployment.yaml

./scripts/v1alpha2/deploy.sh

Expand Down