fix katib-with-kubeflow-cert-manager

kubeflow · Apr 3, 2021 · a5274b2 · a5274b2
1 parent 6a411ef
commit a5274b2
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 19 deletions.
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/katib-config-patch.yaml b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/katib-config-patch.yaml
@@ -0,0 +1,61 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: katib-config
+  namespace: kubeflow
+data:
+  metrics-collector-sidecar: |-
+    {
+      "StdOut": {
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:latest"
+      },
+      "File": {
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:latest"
+      },
+      "TensorFlowEvent": {
+        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:latest",
+        "resources": {
+          "limits": {
+            "memory": "1Gi"
+          }
+        }
+      }
+    }
+  suggestion: |-
+    {
+      "random": {
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:latest"
+      },
+      "tpe": {
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:latest"
+      },
+      "grid": {
+        "image": "docker.io/kubeflowkatib/suggestion-chocolate:latest"
+      },
+      "hyperband": {
+        "image": "docker.io/kubeflowkatib/suggestion-hyperband:latest"
+      },
+      "bayesianoptimization": {
+        "image": "docker.io/kubeflowkatib/suggestion-skopt:latest"
+      },
+      "cmaes": {
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:latest"
+      },
+      "enas": {
+        "image": "docker.io/kubeflowkatib/suggestion-enas:latest",
+        "resources": {
+          "limits": {
+            "memory": "200Mi"
+          }
+        }
+      },
+      "darts": {
+        "image": "docker.io/kubeflowkatib/suggestion-darts:latest"
+      }
+    }
+  early-stopping: |-
+    {
+      "medianstop": {
+        "image": "docker.io/kubeflowkatib/earlystopping-medianstop:latest"
+      }
+    }
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml
@@ -3,29 +3,17 @@ 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
+  - ../../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/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 webhooks.
-  - ../../components/webhook/webhooks.yaml
+  - ../../components/webhook/
   # Cert-manager certificate for webhooks
   - certificate.yaml
   # Kubeflow Katib components.
@@ -46,7 +34,8 @@ images:
     newName: docker.io/kubeflowkatib/cert-generator
 
 patchesStrategicMerge:
-  - ../katib-standalone/katib-config-patch.yaml
+  - katib-config-patch.yaml
+  - remove-pv-patch.yaml
   - patches/katib-cert-injection.yaml
 
 patchesJson6902:

diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/remove-pv-patch.yaml b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/remove-pv-patch.yaml
@@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: katib-mysql