diff --git a/.github/workflows/test-charmed-katib.yaml b/.github/workflows/test-charmed-katib.yaml index a31f18499f3..a8f4fab4e5f 100644 --- a/.github/workflows/test-charmed-katib.yaml +++ b/.github/workflows/test-charmed-katib.yaml @@ -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 diff --git a/.github/workflows/test-go.yaml b/.github/workflows/test-go.yaml new file mode 100644 index 00000000000..978bc371bba --- /dev/null +++ b/.github/workflows/test-go.yaml @@ -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 diff --git a/.github/workflows/test-node.yaml b/.github/workflows/test-node.yaml new file mode 100644 index 00000000000..80db96b2fba --- /dev/null +++ b/.github/workflows/test-node.yaml @@ -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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 36e7fdb5dc7..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -jobs: - include: - - name: "Go unit tests, gofmt, golint and coveralls" - language: go - go: "1.15.8" - go_import_path: github.com/kubeflow/katib - install: - - curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v1.0.7/kubebuilder_1.0.7_linux_amd64.tar.gz" - - # extract the archive - - 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 - # get coveralls.io support - - go get github.com/mattn/goveralls - script: - - make check - - make test - after_success: - - goveralls -coverprofile=coverage.out - - name: "Prettier frontend check" - language: node_js - node_js: "12.18.1" - install: - - npm install --global prettier@2.2.0 - script: - - make prettier-check diff --git a/manifests/v1beta1/components/webhook/cert-generator.yaml b/manifests/v1beta1/components/cert-generator/cert-generator.yaml similarity index 100% rename from manifests/v1beta1/components/webhook/cert-generator.yaml rename to manifests/v1beta1/components/cert-generator/cert-generator.yaml diff --git a/manifests/v1beta1/components/cert-generator/kustomization.yaml b/manifests/v1beta1/components/cert-generator/kustomization.yaml new file mode 100644 index 00000000000..8549a86d668 --- /dev/null +++ b/manifests/v1beta1/components/cert-generator/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- cert-generator.yaml +- rbac.yaml diff --git a/manifests/v1beta1/components/webhook/rbac.yaml b/manifests/v1beta1/components/cert-generator/rbac.yaml similarity index 100% rename from manifests/v1beta1/components/webhook/rbac.yaml rename to manifests/v1beta1/components/cert-generator/rbac.yaml diff --git a/manifests/v1beta1/components/controller/katib-config.yaml b/manifests/v1beta1/components/controller/katib-config.yaml index 8f62db1c9ec..eb6c985e03c 100644 --- a/manifests/v1beta1/components/controller/katib-config.yaml +++ b/manifests/v1beta1/components/controller/katib-config.yaml @@ -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" @@ -24,25 +24,25 @@ 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" @@ -50,12 +50,12 @@ data: } }, "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" } } diff --git a/manifests/v1beta1/components/controller/kustomization.yaml b/manifests/v1beta1/components/controller/kustomization.yaml new file mode 100644 index 00000000000..01f8ebaafea --- /dev/null +++ b/manifests/v1beta1/components/controller/kustomization.yaml @@ -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 diff --git a/manifests/v1beta1/components/crd/kustomization.yaml b/manifests/v1beta1/components/crd/kustomization.yaml new file mode 100644 index 00000000000..b5f6e1196ba --- /dev/null +++ b/manifests/v1beta1/components/crd/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- experiment.yaml +- suggestion.yaml +- trial.yaml diff --git a/manifests/v1beta1/components/db-manager/kustomization.yaml b/manifests/v1beta1/components/db-manager/kustomization.yaml new file mode 100644 index 00000000000..f091cbc54f2 --- /dev/null +++ b/manifests/v1beta1/components/db-manager/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- db-manager.yaml +- service.yaml diff --git a/manifests/v1beta1/components/mysql/kustomization.yaml b/manifests/v1beta1/components/mysql/kustomization.yaml new file mode 100644 index 00000000000..9162dc4ad03 --- /dev/null +++ b/manifests/v1beta1/components/mysql/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- mysql.yaml +- pv.yaml +- pvc.yaml +- secret.yaml +- service.yaml diff --git a/manifests/v1beta1/components/namespace/kustomization.yaml b/manifests/v1beta1/components/namespace/kustomization.yaml new file mode 100644 index 00000000000..b7137908363 --- /dev/null +++ b/manifests/v1beta1/components/namespace/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kubeflow +resources: + # Namespace. + - namespace.yaml diff --git a/manifests/v1beta1/components/namespace.yaml b/manifests/v1beta1/components/namespace/namespace.yaml similarity index 100% rename from manifests/v1beta1/components/namespace.yaml rename to manifests/v1beta1/components/namespace/namespace.yaml diff --git a/manifests/v1beta1/components/ui/kustomization.yaml b/manifests/v1beta1/components/ui/kustomization.yaml new file mode 100644 index 00000000000..a327650458c --- /dev/null +++ b/manifests/v1beta1/components/ui/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- rbac.yaml +- service.yaml +- ui.yaml diff --git a/manifests/v1beta1/components/webhook/kustomization.yaml b/manifests/v1beta1/components/webhook/kustomization.yaml new file mode 100644 index 00000000000..5d3fdcce912 --- /dev/null +++ b/manifests/v1beta1/components/webhook/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- webhooks.yaml diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/certificate.yaml b/manifests/v1beta1/installs/katib-cert-manager/certificate.yaml similarity index 100% rename from manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/certificate.yaml rename to manifests/v1beta1/installs/katib-cert-manager/certificate.yaml diff --git a/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml new file mode 100644 index 00000000000..fb4d66549c0 --- /dev/null +++ b/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml @@ -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 diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/params.yaml b/manifests/v1beta1/installs/katib-cert-manager/params.yaml similarity index 100% rename from manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/params.yaml rename to manifests/v1beta1/installs/katib-cert-manager/params.yaml diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/patches/katib-cert-injection.yaml b/manifests/v1beta1/installs/katib-cert-manager/patches/katib-cert-injection.yaml similarity index 100% rename from manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/patches/katib-cert-injection.yaml rename to manifests/v1beta1/installs/katib-cert-manager/patches/katib-cert-injection.yaml diff --git a/manifests/v1beta1/installs/katib-external-db/kustomization.yaml b/manifests/v1beta1/installs/katib-external-db/kustomization.yaml index 607a22f2306..de95fc9ca81 100644 --- a/manifests/v1beta1/installs/katib-external-db/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-external-db/kustomization.yaml @@ -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: diff --git a/manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml b/manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml deleted file mode 100644 index eb6c985e03c..00000000000 --- a/manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: katib-config - namespace: kubeflow -data: - metrics-collector-sidecar: |- - { - "StdOut": { - "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.11.0" - }, - "File": { - "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.11.0" - }, - "TensorFlowEvent": { - "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.11.0", - "resources": { - "limits": { - "memory": "1Gi" - } - } - } - } - suggestion: |- - { - "random": { - "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.11.0" - }, - "tpe": { - "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.11.0" - }, - "grid": { - "image": "docker.io/kubeflowkatib/suggestion-chocolate:v0.11.0" - }, - "hyperband": { - "image": "docker.io/kubeflowkatib/suggestion-hyperband:v0.11.0" - }, - "bayesianoptimization": { - "image": "docker.io/kubeflowkatib/suggestion-skopt:v0.11.0" - }, - "cmaes": { - "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.11.0" - }, - "enas": { - "image": "docker.io/kubeflowkatib/suggestion-enas:v0.11.0", - "resources": { - "limits": { - "memory": "200Mi" - } - } - }, - "darts": { - "image": "docker.io/kubeflowkatib/suggestion-darts:v0.11.0" - } - } - early-stopping: |- - { - "medianstop": { - "image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.11.0" - } - } diff --git a/manifests/v1beta1/installs/katib-standalone/kustomization.yaml b/manifests/v1beta1/installs/katib-standalone/kustomization.yaml index 10abf240374..c1f0af1628c 100644 --- a/manifests/v1beta1/installs/katib-standalone/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-standalone/kustomization.yaml @@ -3,46 +3,31 @@ 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 DB mysql. - - ../../components/mysql/mysql.yaml - - ../../components/mysql/service.yaml - - ../../components/mysql/pv.yaml - - ../../components/mysql/pvc.yaml - - ../../components/mysql/secret.yaml + - ../../components/mysql/ # 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 -patchesStrategicMerge: - - katib-config-patch.yaml + newTag: v0.11.0 diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml deleted file mode 100644 index ac0aac4102d..00000000000 --- a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kubeflow -resources: - # Katib controller. - - ../../components/controller/controller.yaml - - ../../components/controller/service.yaml - - ../../components/controller/rbac.yaml - - ../../components/controller/katib-config.yaml - - ../../components/controller/trial-templates.yaml - # Katib CRDs. - - ../../components/crd/experiment.yaml - - ../../components/crd/suggestion.yaml - - ../../components/crd/trial.yaml - # Katib DB manager. - - ../../components/db-manager/db-manager.yaml - - ../../components/db-manager/service.yaml - # Katib DB mysql. - - ../../components/mysql/mysql.yaml - - ../../components/mysql/service.yaml - - ../../components/mysql/pvc.yaml - - ../../components/mysql/secret.yaml - # Katib UI. - - ../../components/ui/ui.yaml - - ../../components/ui/service.yaml - - ../../components/ui/rbac.yaml - # Katib webhooks. - - ../../components/webhook/webhooks.yaml - # Cert-manager certificate for webhooks - - certificate.yaml - # Kubeflow Katib components. - - ../katib-with-kubeflow/kubeflow-katib-roles.yaml - - ../katib-with-kubeflow/ui-virtual-service.yaml -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 - newName: docker.io/kubeflowkatib/katib-db-manager - - name: docker.io/kubeflowkatib/katib-ui - newTag: v0.11.0 - newName: docker.io/kubeflowkatib/katib-ui - - name: docker.io/kubeflowkatib/cert-generator - newTag: v0.11.0 - newName: docker.io/kubeflowkatib/cert-generator - -patchesStrategicMerge: - - ../katib-standalone/katib-config-patch.yaml - - patches/katib-cert-injection.yaml - -patchesJson6902: - - path: ../katib-with-kubeflow/patches/mysql-pvc.yaml - target: - version: v1 - name: katib-mysql - kind: PersistentVolumeClaim - namespace: kubeflow - -vars: -- fieldref: - fieldPath: metadata.namespace - name: KATIB_UI_NAMESPACE - objref: - apiVersion: apps/v1 - kind: Deployment - name: katib-ui -- 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 diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml index 4a174967629..5c3be9dbfdd 100644 --- a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml @@ -2,51 +2,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kubeflow resources: - # Katib controller. - - ../../components/controller/controller.yaml - - ../../components/controller/service.yaml - - ../../components/controller/rbac.yaml - - ../../components/controller/katib-config.yaml - - ../../components/controller/trial-templates.yaml - # Katib CRDs. - - ../../components/crd/experiment.yaml - - ../../components/crd/suggestion.yaml - - ../../components/crd/trial.yaml - # Katib DB manager. - - ../../components/db-manager/db-manager.yaml - - ../../components/db-manager/service.yaml - # Katib DB mysql. - - ../../components/mysql/mysql.yaml - - ../../components/mysql/service.yaml - - ../../components/mysql/pvc.yaml - - ../../components/mysql/secret.yaml - # Katib UI. - - ../../components/ui/ui.yaml - - ../../components/ui/service.yaml - - ../../components/ui/rbac.yaml - # Katib webhooks. - - ../../components/webhook/cert-generator.yaml - - ../../components/webhook/rbac.yaml - - ../../components/webhook/webhooks.yaml + - ../katib-cert-manager # Kubeflow Katib components. - kubeflow-katib-roles.yaml - ui-virtual-service.yaml 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 - newName: docker.io/kubeflowkatib/cert-generator patchesStrategicMerge: - - ../katib-standalone/katib-config-patch.yaml + - patches/remove-resources-patch.yaml patchesJson6902: - path: patches/mysql-pvc.yaml diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/patches/remove-resources-patch.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/patches/remove-resources-patch.yaml new file mode 100644 index 00000000000..a8d77b5d97a --- /dev/null +++ b/manifests/v1beta1/installs/katib-with-kubeflow/patches/remove-resources-patch.yaml @@ -0,0 +1,11 @@ +$patch: delete +apiVersion: v1 +kind: PersistentVolume +metadata: + name: katib-mysql +--- +$patch: delete +apiVersion: v1 +kind: Namespace +metadata: + name: kubeflow diff --git a/scripts/v1beta1/release.sh b/scripts/v1beta1/release.sh index cd49e4f6ad5..5bee6fe1526 100755 --- a/scripts/v1beta1/release.sh +++ b/scripts/v1beta1/release.sh @@ -71,14 +71,16 @@ echo -e "\nUpdating Katib image tags to ${TAG}\n" # For MacOS we should set -i '' to avoid temp files from sed. if [[ $(uname) == "Darwin" ]]; then sed -i '' -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-external-db/kustomization.yaml - sed -i '' -e "s@:[^[:space:]].*\"@:${TAG}\"@" ./manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml + sed -i '' -e "s@:[^[:space:]].*\"@:${TAG}\"@" ./manifests/v1beta1/components/controller/katib-config.yaml sed -i '' -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-standalone/kustomization.yaml sed -i '' -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml + sed -i '' -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml else sed -i -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-external-db/kustomization.yaml - sed -i -e "s@:[^[:space:]].*\"@:${TAG}\"@" ./manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml + sed -i -e "s@:[^[:space:]].*\"@:${TAG}\"@" ./manifests/v1beta1/components/controller/katib-config.yaml sed -i -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-standalone/kustomization.yaml sed -i -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml + sed -i -e "s@newTag: .*@newTag: ${TAG}@" ./manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml fi echo -e "Katib images have been updated\n" diff --git a/test/scripts/v1beta1/setup-katib.sh b/test/scripts/v1beta1/setup-katib.sh index 64e7f33fe0f..a608aff6ceb 100755 --- a/test/scripts/v1beta1/setup-katib.sh +++ b/test/scripts/v1beta1/setup-katib.sh @@ -39,7 +39,7 @@ kubectl cluster-info # Update images with current pull base sha. echo "Updating Katib images with the current PR SHA: ${VERSION}" KUSTOMIZE_PATH="manifests/v1beta1/installs/katib-standalone/kustomization.yaml" -CONFIG_PATCH="manifests/v1beta1/installs/katib-standalone/katib-config-patch.yaml" +CONFIG_PATCH="manifests/v1beta1/components/controller/katib-config.yaml" # Change tag to all images in kustomization and katib-config patch files. sed -i -e "s@newTag: .*@newTag: ${VERSION}@" ${KUSTOMIZE_PATH}