Change images to kubeflowkatib

kubeflow · Oct 30, 2020 · d42c82c · d42c82c
1 parent 42f42e9
commit d42c82c
Show file tree

Hide file tree

Showing 93 changed files with 499 additions and 416 deletions.
diff --git a/katib/components/katib-controller/kustomization.yaml b/katib/components/katib-controller/kustomization.yaml
@@ -14,13 +14,12 @@ resources:
   - ../../katib-controller/overlays/application/application.yaml
   - ../../katib-controller/overlays/istio/katib-ui-virtual-service.yaml
 images:
-  # TODO: Change images
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
+  - name: docker.io/kubeflowkatib/katib-controller
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
+    newName: docker.io/kubeflowkatib/katib-controller
+  - name: docker.io/kubeflowkatib/katib-ui
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
 commonLabels:
   app.kubernetes.io/component: katib
   app.kubernetes.io/name: katib-controller

diff --git a/katib/components/katib-db-manager/kustomization.yaml b/katib/components/katib-db-manager/kustomization.yaml
@@ -5,9 +5,9 @@ resources:
   - ../../katib-controller/base/katib-db-manager-deployment.yaml
   - ../../katib-controller/base/katib-db-manager-service.yaml
 images:
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
+  - name: docker.io/kubeflowkatib/katib-db-manager
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
 commonLabels:
   app.kubernetes.io/component: katib
   app.kubernetes.io/name: katib-controller
diff --git a/katib/katib-controller/base/katib-configmap.yaml b/katib/katib-controller/base/katib-configmap.yaml
@@ -3,17 +3,16 @@ kind: ConfigMap
 metadata:
   name: katib-config
 data:
-  # TODO: change images
   metrics-collector-sidecar: |-
     {
       "StdOut": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/file-metrics-collector:ce89cbf"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:ce89cbf"
       },
       "File": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/file-metrics-collector:ce89cbf"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:ce89cbf"
       },
       "TensorFlowEvent": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/tfevent-metrics-collector:ce89cbf",
+        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:ce89cbf",
         "resources": {
           "limits": {
             "memory": "1Gi"
@@ -24,22 +23,22 @@ data:
   suggestion: |-
     {
       "random": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-hyperopt:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:ce89cbf"
       },
       "grid": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-chocolate:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-chocolate:ce89cbf"
       },
       "hyperband": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-hyperband:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperband:ce89cbf"
       },
       "bayesianoptimization": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-skopt:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-skopt:ce89cbf"
       },
       "tpe": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-hyperopt:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:ce89cbf"
       },
       "enas": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-enas:ce89cbf",
+        "image": "docker.io/kubeflowkatib/suggestion-enas:ce89cbf",
         "imagePullPolicy": "Always",
         "resources": {
           "limits": {
@@ -48,9 +47,16 @@ data:
         }
       },
       "cmaes": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-goptuna:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:ce89cbf"
       },
       "darts": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1alpha3/suggestion-darts:ce89cbf"
+        "image": "docker.io/kubeflowkatib/suggestion-darts:ce89cbf"
+      }
+    }
+  early-stopping: |-
+    {
+      "medianstop": {
+        "image": "docker.io/kubeflowkatib/earlystopping-medianstop,
+        "imagePullPolicy": "Always"
       }
     }
diff --git a/katib/katib-controller/base/katib-controller-deployment.yaml b/katib/katib-controller/base/katib-controller-deployment.yaml
@@ -20,8 +20,7 @@ spec:
       serviceAccountName: katib-controller
       containers:
         - name: katib-controller
-          # TODO: Change image
-          image: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
+          image: docker.io/kubeflowkatib/katib-controller
           imagePullPolicy: IfNotPresent
           command: ["./katib-controller"]
           args:

diff --git a/katib/katib-controller/base/katib-db-manager-deployment.yaml b/katib/katib-controller/base/katib-db-manager-deployment.yaml
@@ -21,30 +21,29 @@ spec:
         sidecar.istio.io/inject: "false"
     spec:
       containers:
-      - name: katib-db-manager
-      # TODO change image
-        image: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
-        imagePullPolicy: IfNotPresent
-        env:
-          - name : DB_NAME
-            value: "mysql"
-          - name: DB_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: katib-mysql-secrets
-                key: MYSQL_ROOT_PASSWORD
-        command:
-          - './katib-db-manager'
-        ports:
-        - name: api
-          containerPort: 6789
-        readinessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:6789"]
-          initialDelaySeconds: 5
-        livenessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:6789"]
-          initialDelaySeconds: 10
-          periodSeconds: 60
-          failureThreshold: 5
+        - name: katib-db-manager
+          image: docker.io/kubeflowkatib/katib-db-manager
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: DB_NAME
+              value: "mysql"
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: katib-mysql-secrets
+                  key: MYSQL_ROOT_PASSWORD
+          command:
+            - "./katib-db-manager"
+          ports:
+            - name: api
+              containerPort: 6789
+          readinessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:6789"]
+            initialDelaySeconds: 5
+          livenessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:6789"]
+            initialDelaySeconds: 10
+            periodSeconds: 60
+            failureThreshold: 5
diff --git a/katib/katib-controller/base/katib-ui-deployment.yaml b/katib/katib-controller/base/katib-ui-deployment.yaml
@@ -22,8 +22,7 @@ spec:
     spec:
       containers:
         - name: katib-ui
-          # TODO: Change image
-          image: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
+          image: docker.io/kubeflowkatib/katib-ui
           imagePullPolicy: IfNotPresent
           command:
             - "./katib-ui"

diff --git a/katib/katib-controller/base/kustomization.yaml b/katib/katib-controller/base/kustomization.yaml
@@ -21,17 +21,16 @@ configMapGenerator:
       - params.env
 generatorOptions:
   disableNameSuffixHash: true
-  # TODO: change images
 images:
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
+  - name: docker.io/kubeflowkatib/katib-controller
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-controller
+  - name: docker.io/kubeflowkatib/katib-db-manager
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
-  - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
+    newName: docker.io/kubeflowkatib/katib-db-manager
+  - name: docker.io/kubeflowkatib/katib-ui
     newTag: ce89cbf
-    newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
   - name: mysql
     newTag: "8"
     newName: mysql

diff --git a/katib/katib-controller/base/params.yaml b/katib/katib-controller/base/params.yaml
@@ -1,7 +1,7 @@
 varReference:
-- path: data/config
-  kind: ConfigMap
-- path: data/config
-  kind: Deployment
-- path: metadata/annotations/getambassador.io\/config
-  kind: Service
+  - path: data/config
+    kind: ConfigMap
+  - path: data/config
+    kind: Deployment
+  - path: metadata/annotations/getambassador.io\/config
+    kind: Service
diff --git a/katib/katib-controller/overlays/application/application.yaml b/katib/katib-controller/overlays/application/application.yaml
@@ -5,58 +5,57 @@ metadata:
 spec:
   addOwnerRef: true
   componentKinds:
-  - group: core
-    kind: Service
-  - group: apps
-    kind: Deployment
-  - group: core
-    kind: Secret
-  - group: core
-    kind: ServiceAccount
-  - group: kubeflow.org
-    kind: Experiment
-  - group: kubeflow.org
-    kind: Suggestion
-  - group: kubeflow.org
-    kind: Trial
+    - group: core
+      kind: Service
+    - group: apps
+      kind: Deployment
+    - group: core
+      kind: Secret
+    - group: core
+      kind: ServiceAccount
+    - group: kubeflow.org
+      kind: Experiment
+    - group: kubeflow.org
+      kind: Suggestion
+    - group: kubeflow.org
+      kind: Trial
   descriptor:
-    description: Katib is a service for hyperparameter tuning and neural architecture
-      search.
+    description: Katib is a service for hyperparameter tuning and neural architecture search.
     keywords:
-    - katib
-    - katib-controller
-    - hyperparameter tuning
+      - katib
+      - katib-controller
+      - hyperparameter tuning
     links:
-    - description: About
-      url: https://github.com/kubeflow/katib
+      - description: About
+        url: https://github.com/kubeflow/katib
     maintainers:
-    - email: gaoce@caicloud.io
-      name: Ce Gao
-    - email: johnugeo@cisco.com
-      name: Johnu George
-    - email: liuhougang6@126.com
-      name: Hougang Liu
-    - email: ricliu@google.com
-      name: Richard Liu
-    - email: yuji.oshima0x3fd@gmail.com
-      name: YujiOshima
-    - email: andrey.velichkevich@gmail.com
-      name: Andrey Velichkevich
+      - email: gaoce@caicloud.io
+        name: Ce Gao
+      - email: johnugeo@cisco.com
+        name: Johnu George
+      - email: liuhougang6@126.com
+        name: Hougang Liu
+      - email: ricliu@google.com
+        name: Richard Liu
+      - email: yuji.oshima0x3fd@gmail.com
+        name: YujiOshima
+      - email: andrey.velichkevich@gmail.com
+        name: Andrey Velichkevich
     owners:
-    - email: gaoce@caicloud.io
-      name: Ce Gao
-    - email: johnugeo@cisco.com
-      name: Johnu George
-    - email: liuhougang6@126.com
-      name: Hougang Liu
-    - email: ricliu@google.com
-      name: Richard Liu
-    - email: yuji.oshima0x3fd@gmail.com
-      name: YujiOshima
-    - email: andrey.velichkevich@gmail.com
-      name: Andrey Velichkevich
+      - email: gaoce@caicloud.io
+        name: Ce Gao
+      - email: johnugeo@cisco.com
+        name: Johnu George
+      - email: liuhougang6@126.com
+        name: Hougang Liu
+      - email: ricliu@google.com
+        name: Richard Liu
+      - email: yuji.oshima0x3fd@gmail.com
+        name: YujiOshima
+      - email: andrey.velichkevich@gmail.com
+        name: Andrey Velichkevich
     type: katib
-    version: v1alpha3
+    version: v1beta1
   selector:
     matchLabels:
       app.kubernetes.io/component: katib

diff --git a/katib/katib-controller/overlays/application/kustomization.yaml b/katib/katib-controller/overlays/application/kustomization.yaml
@@ -1,9 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 bases:
-- ../../base
+  - ../../base
 commonLabels:
   app.kubernetes.io/component: katib
   app.kubernetes.io/name: katib-controller
 kind: Kustomization
 resources:
-- application.yaml
+  - application.yaml
diff --git a/katib/katib-controller/overlays/ibm-storage-config/katib-mysql-deployment.yaml b/katib/katib-controller/overlays/ibm-storage-config/katib-mysql-deployment.yaml
@@ -6,6 +6,6 @@ spec:
   template:
     spec:
       containers:
-      - name: katib-mysql
-        # Base's livenessProbe created some kernel errors on non-POSIX filesystem
-        livenessProbe: null
+        - name: katib-mysql
+          # Base's livenessProbe created some kernel errors on non-POSIX filesystem
+          livenessProbe: null
diff --git a/katib/katib-controller/overlays/ibm-storage-config/kustomization.yaml b/katib/katib-controller/overlays/ibm-storage-config/kustomization.yaml
@@ -1,9 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../../base
+  - ../../base
 patchesStrategicMerge:
-- katib-mysql-deployment.yaml
+  - katib-mysql-deployment.yaml
 images:
   - name: mysql
     newTag: "5.6"

diff --git a/katib/katib-controller/overlays/istio/katib-ui-virtual-service.yaml b/katib/katib-controller/overlays/istio/katib-ui-virtual-service.yaml
@@ -4,17 +4,17 @@ metadata:
   name: katib-ui
 spec:
   gateways:
-  - kubeflow-gateway
+    - kubeflow-gateway
   hosts:
-  - '*'
+    - "*"
   http:
-  - match:
-    - uri:
-        prefix: /katib/
-    rewrite:
-      uri: /katib/
-    route:
-    - destination:
-        host: katib-ui.$(katib-ui-namespace).svc.$(clusterDomain)
-        port:
-          number: 80
+    - match:
+        - uri:
+            prefix: /katib/
+      rewrite:
+        uri: /katib/
+      route:
+        - destination:
+            host: katib-ui.$(katib-ui-namespace).svc.$(clusterDomain)
+            port:
+              number: 80
diff --git a/katib/katib-controller/overlays/istio/kustomization.yaml b/katib/katib-controller/overlays/istio/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../../base
+  - ../../base
 resources:
-- katib-ui-virtual-service.yaml
+  - katib-ui-virtual-service.yaml
 configurations:
-- params.yaml
+  - params.yaml
diff --git a/katib/katib-controller/overlays/istio/params.yaml b/katib/katib-controller/overlays/istio/params.yaml
@@ -1,3 +1,3 @@
 varReference:
-- path: spec/http/route/destination/host
-  kind: VirtualService
+  - path: spec/http/route/destination/host
+    kind: VirtualService