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

Automated cherry pick of #1498: fix kustomize manifests for kubeflow #1514: Create workflow for Go Cherry pick of #1498 #1514 on release-0.11. #1498: fix kustomize manifests for kubeflow #1514: Create workflow for Go #1515

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
cc7535e
fix kustomize manifests for kubeflow
davidspek Mar 30, 2021
2a70d8f
fix standalone and external-db manifests
davidspek Mar 30, 2021
bfa61f9
remove old namespace file
davidspek Mar 30, 2021
4ed004f
remove PV from kubeflow manifest
davidspek Mar 30, 2021
552fa75
fix katib-external-db reference outside of root
davidspek Mar 30, 2021
7ce198b
fix katib-with-kubeflow-cert-manager
davidspek Apr 3, 2021
330adb4
Move image tags to katib-config.yaml and remove patches
davidspek Apr 7, 2021
124c756
use common namespace kustomization
davidspek Apr 7, 2021
86c6c15
Make kubeflow-cert use kubeflow as a base
davidspek Apr 7, 2021
4ecf909
Remove katib-cert-generator job from kubeflow-cert-generator manifests
davidspek Apr 7, 2021
6dd12cd
Move pv-patch to patches folder
davidspek Apr 7, 2021
2b58308
Create katib-cert-manager and make kubeflowuse this as base
davidspek Apr 10, 2021
acbe180
Fix release and CI scripts for new layout
davidspek Apr 10, 2021
b4478cb
Remove unnecessary cert-generator images from kustomization.yaml
davidspek Apr 10, 2021
d140fbc
Remove unnecessary SA, CR and CRB from katib-cert-manager
davidspek Apr 10, 2021
bc8db22
Remove commonLabel from katib-with-kubeflow
davidspek Apr 10, 2021
b8040dd
Separate cert-generator from webhook kustomization
davidspek Apr 12, 2021
f3f6b3c
Create workflow for Go
andreyvelich Apr 8, 2021
fa844d8
Add GOPATH env
andreyvelich Apr 8, 2021
826f199
Move check up
andreyvelich Apr 8, 2021
3c5ae61
Add env
andreyvelich Apr 8, 2021
873d73f
Add go mod download
andreyvelich Apr 8, 2021
55f507e
Add ls command
andreyvelich Apr 8, 2021
1a2b487
Add path
andreyvelich Apr 8, 2021
6d9bd81
Change path for run
andreyvelich Apr 9, 2021
32667fa
Change GOPATH
andreyvelich Apr 9, 2021
51780bd
Add kubebuilder
andreyvelich Apr 9, 2021
376e771
Download coveralls
andreyvelich Apr 9, 2021
240dcb2
Add node test
andreyvelich Apr 9, 2021
110b15a
Remove Travis
andreyvelich Apr 9, 2021
f2bd197
Add coveralls step
andreyvelich Apr 9, 2021
fc6bfff
Change coveralls use
andreyvelich Apr 9, 2021
a41d62c
Add working dir
andreyvelich Apr 9, 2021
3e610fd
Remove run
andreyvelich Apr 9, 2021
8902a0d
Fix the patch
andreyvelich Apr 13, 2021
10ca19f
Remove patch
andreyvelich Apr 13, 2021
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
20 changes: 10 additions & 10 deletions .github/workflows/test-charmed-katib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v2
- name: Check out code
uses: actions/checkout@v2

- name: Install dependencies
run: |
sudo apt-get install python3-setuptools
sudo pip3 install black flake8
- name: Install dependencies
run: |
sudo apt-get install python3-setuptools
sudo pip3 install black flake8

- name: Check black
run: black --check operators
- name: Check black
run: black --check operators

- name: Check flake8
run: cd operators && flake8
- name: Check flake8
run: cd operators && flake8

build:
name: Test
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/test-go.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Go Test

on:
- push
- pull_request

jobs:
test:
name: Test
runs-on: ubuntu-latest
env:
GOPATH: ${{ github.workspace }}/go
defaults:
run:
working-directory: ${{ env.GOPATH }}/src/github.com/kubeflow/katib

steps:
- name: Check out code
uses: actions/checkout@v2
with:
path: ${{ env.GOPATH }}/src/github.com/kubeflow/katib

- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.15.8

- name: Run Go test
run: |
go mod download

curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v1.0.7/kubebuilder_1.0.7_linux_amd64.tar.gz"
tar -zxvf kubebuilder_1.0.7_linux_amd64.tar.gz
sudo mv kubebuilder_1.0.7_linux_amd64 /usr/local/kubebuilder
export PATH=$PATH:/usr/local/kubebuilder/bin

make check
make test

- name: Coveralls report
uses: shogo82148/actions-goveralls@v1
with:
path-to-profile: coverage.out
working-directory: ${{ env.GOPATH }}/src/github.com/kubeflow/katib
24 changes: 24 additions & 0 deletions .github/workflows/test-node.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Frontend Test

on:
- push
- pull_request

jobs:
test:
name: Test
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v2

- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: 12.18.1

- name: Run Node test
run: |
npm install --global prettier@2.2.0
make prettier-check
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- cert-generator.yaml
- rbac.yaml
24 changes: 12 additions & 12 deletions manifests/v1beta1/components/controller/katib-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ data:
metrics-collector-sidecar: |-
{
"StdOut": {
"image": "docker.io/kubeflowkatib/file-metrics-collector"
"image": "docker.io/kubeflowkatib/file-metrics-collector:v0.11.0"
},
"File": {
"image": "docker.io/kubeflowkatib/file-metrics-collector"
"image": "docker.io/kubeflowkatib/file-metrics-collector:v0.11.0"
},
"TensorFlowEvent": {
"image": "docker.io/kubeflowkatib/tfevent-metrics-collector",
"image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.11.0",
"resources": {
"limits": {
"memory": "1Gi"
Expand All @@ -24,38 +24,38 @@ data:
suggestion: |-
{
"random": {
"image": "docker.io/kubeflowkatib/suggestion-hyperopt"
"image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.11.0"
},
"tpe": {
"image": "docker.io/kubeflowkatib/suggestion-hyperopt"
"image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.11.0"
},
"grid": {
"image": "docker.io/kubeflowkatib/suggestion-chocolate"
"image": "docker.io/kubeflowkatib/suggestion-chocolate:v0.11.0"
},
"hyperband": {
"image": "docker.io/kubeflowkatib/suggestion-hyperband"
"image": "docker.io/kubeflowkatib/suggestion-hyperband:v0.11.0"
},
"bayesianoptimization": {
"image": "docker.io/kubeflowkatib/suggestion-skopt"
"image": "docker.io/kubeflowkatib/suggestion-skopt:v0.11.0"
},
"cmaes": {
"image": "docker.io/kubeflowkatib/suggestion-goptuna"
"image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.11.0"
},
"enas": {
"image": "docker.io/kubeflowkatib/suggestion-enas",
"image": "docker.io/kubeflowkatib/suggestion-enas:v0.11.0",
"resources": {
"limits": {
"memory": "200Mi"
}
}
},
"darts": {
"image": "docker.io/kubeflowkatib/suggestion-darts"
"image": "docker.io/kubeflowkatib/suggestion-darts:v0.11.0"
}
}
early-stopping: |-
{
"medianstop": {
"image": "docker.io/kubeflowkatib/earlystopping-medianstop"
"image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.11.0"
}
}
9 changes: 9 additions & 0 deletions manifests/v1beta1/components/controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- controller.yaml
- katib-config.yaml
- rbac.yaml
- service.yaml
- trial-templates.yaml
7 changes: 7 additions & 0 deletions manifests/v1beta1/components/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- experiment.yaml
- suggestion.yaml
- trial.yaml
6 changes: 6 additions & 0 deletions manifests/v1beta1/components/db-manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- db-manager.yaml
- service.yaml
9 changes: 9 additions & 0 deletions manifests/v1beta1/components/mysql/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- mysql.yaml
- pv.yaml
- pvc.yaml
- secret.yaml
- service.yaml
6 changes: 6 additions & 0 deletions manifests/v1beta1/components/namespace/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
# Namespace.
- namespace.yaml
7 changes: 7 additions & 0 deletions manifests/v1beta1/components/ui/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- rbac.yaml
- service.yaml
- ui.yaml
5 changes: 5 additions & 0 deletions manifests/v1beta1/components/webhook/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- webhooks.yaml
60 changes: 60 additions & 0 deletions manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: kubeflow
resources:
# Namespace.
- ../../components/namespace
# Katib controller.
- ../../components/controller/
# Katib CRDs.
- ../../components/crd/
# Katib DB manager.
- ../../components/db-manager/
# Katib DB mysql.
- ../../components/mysql/
# Katib UI.
- ../../components/ui/
# Katib webhooks.
- ../../components/webhook/
# Cert-manager certificate for webhooks
- certificate.yaml
images:
- name: docker.io/kubeflowkatib/katib-controller
newName: docker.io/kubeflowkatib/katib-controller
newTag: v0.11.0
- name: docker.io/kubeflowkatib/katib-db-manager
newName: docker.io/kubeflowkatib/katib-db-manager
newTag: v0.11.0
- name: docker.io/kubeflowkatib/katib-ui
newName: docker.io/kubeflowkatib/katib-ui
newTag: v0.11.0

patchesStrategicMerge:
- patches/katib-cert-injection.yaml

vars:
- fieldref:
fieldPath: metadata.namespace
name: KATIB_NAMESPACE
objref:
apiVersion: v1
kind: Service
name: katib-controller
- fieldref:
fieldPath: metadata.name
name: KATIB_SERVICE_NAME
objref:
apiVersion: v1
kind: Service
name: katib-controller
- name: KATIB_CERT_NAME
objref:
kind: Certificate
group: cert-manager.io
version: v1alpha2
name: katib-webhook-cert
fieldref:
fieldpath: metadata.name

configurations:
- params.yaml
34 changes: 12 additions & 22 deletions manifests/v1beta1/installs/katib-external-db/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,33 @@ kind: Kustomization
namespace: kubeflow
resources:
# Namespace.
- ../../components/namespace.yaml
- ../../components/namespace/
# Katib controller.
- ../../components/controller/controller.yaml
- ../../components/controller/service.yaml
- ../../components/controller/rbac.yaml
- ../../components/controller/katib-config.yaml
- ../../components/controller/trial-templates.yaml
- ../../components/controller/
# Katib CRDs.
- ../../components/crd/experiment.yaml
- ../../components/crd/suggestion.yaml
- ../../components/crd/trial.yaml
- ../../components/crd/
# Katib DB manager.
- ../../components/db-manager/db-manager.yaml
- ../../components/db-manager/service.yaml
- ../../components/db-manager/
# Katib UI.
- ../../components/ui/ui.yaml
- ../../components/ui/service.yaml
- ../../components/ui/rbac.yaml
- ../../components/ui/
# Katib Cert Generator
- ../../components/cert-generator/
# Katib webhooks.
- ../../components/webhook/cert-generator.yaml
- ../../components/webhook/rbac.yaml
- ../../components/webhook/webhooks.yaml
- ../../components/webhook/
images:
- name: docker.io/kubeflowkatib/katib-controller
newTag: v0.11.0
newName: docker.io/kubeflowkatib/katib-controller
- name: docker.io/kubeflowkatib/katib-db-manager
newTag: v0.11.0
- name: docker.io/kubeflowkatib/katib-db-manager
newName: docker.io/kubeflowkatib/katib-db-manager
- name: docker.io/kubeflowkatib/katib-ui
newTag: v0.11.0
- name: docker.io/kubeflowkatib/katib-ui
newName: docker.io/kubeflowkatib/katib-ui
- name: docker.io/kubeflowkatib/cert-generator
newTag: v0.11.0
- name: docker.io/kubeflowkatib/cert-generator
newName: docker.io/kubeflowkatib/cert-generator
newTag: v0.11.0
patchesStrategicMerge:
- ../katib-standalone/katib-config-patch.yaml
- db-manager-patch.yaml
# Modify katib-mysql-secrets with parameters for the DB.
secretGenerator:
Expand Down
Loading