Synchronize katib and kubeflow/kubeflow (#2672)

* Update kubeflow/katib manifests from v0.16.0 (#2565) Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * Update kubeflow/kubeflow manifests from v1.8.0 (#2567) Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --------- Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Co-authored-by: Daniela Plascencia <daniela.plascencia@canonical.com>
kubeflow · Apr 8, 2024 · 03a33a7 · 03a33a7
1 parent 9fa11e0
commit 03a33a7
Show file tree

Hide file tree

Showing 24 changed files with 137 additions and 138 deletions.
diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml
@@ -16,7 +16,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/poddefaults-webhook
   newName: docker.io/kubeflownotebookswg/poddefaults-webhook
-  newTag: v1.8.0-rc.0
+  newTag: v1.8.0
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml
@@ -18,7 +18,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/centraldashboard
   newName: docker.io/kubeflownotebookswg/centraldashboard
-  newTag: v1.8.0-rc.0
+  newTag: v1.8.0
 configMapGenerator:
 - envs:
   - params.env

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml b/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml
@@ -37,15 +37,15 @@ spawnerFormDefaults:
   ################################################################
   image:
     # the default container image
-    value: kubeflownotebookswg/jupyter-scipy:v1.8.0-rc.0
+    value: kubeflownotebookswg/jupyter-scipy:v1.8.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/jupyter-scipy:v1.8.0-rc.0
-    - kubeflownotebookswg/jupyter-pytorch-full:v1.8.0-rc.0
-    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0-rc.0
-    - kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0-rc.0
-    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0-rc.0
+    - kubeflownotebookswg/jupyter-scipy:v1.8.0
+    - kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
+    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0
+    - kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0
+    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0
 
   ################################################################
   # VSCode-like Container Images (Group 1)
@@ -60,11 +60,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupOne:
     # the default container image
-    value: kubeflownotebookswg/codeserver-python:v1.8.0-rc.0
+    value: kubeflownotebookswg/codeserver-python:v1.8.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/codeserver-python:v1.8.0-rc.0
+    - kubeflownotebookswg/codeserver-python:v1.8.0
 
   ################################################################
   # RStudio-like Container Images (Group 2)
@@ -81,11 +81,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupTwo:
     # the default container image
-    value: kubeflownotebookswg/rstudio-tidyverse:v1.8.0-rc.0
+    value: kubeflownotebookswg/rstudio-tidyverse:v1.8.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/rstudio-tidyverse:v1.8.0-rc.0
+    - kubeflownotebookswg/rstudio-tidyverse:v1.8.0
 
   ################################################################
   # CPU Resources
@@ -129,12 +129,11 @@ spawnerFormDefaults:
       # the list of available vendors in the dropdown
       #  `limitsKey` - what will be set as the actual limit
       #  `uiName` - what will be displayed in the dropdown UI
-      vendors: []
-      #vendors:
-      #  - limitsKey: "nvidia.com/gpu"
-      #    uiName: "NVIDIA"
-      #  - limitsKey: "amd.com/gpu"
-      #    uiName: "AMD"
+      vendors:
+      - limitsKey: "nvidia.com/gpu"
+        uiName: "NVIDIA"
+      - limitsKey: "amd.com/gpu"
+        uiName: "AMD"
 
       # the default value of the limit
       # (possible values: "none", "1", "2", "4", "8")

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml
@@ -23,7 +23,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/jupyter-web-app
   newName: docker.io/kubeflownotebookswg/jupyter-web-app
-  newTag: v1.8.0-rc.0
+  newTag: v1.8.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml b/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml
@@ -5,4 +5,4 @@ resources:
 images:
 - name: docker.io/kubeflownotebookswg/notebook-controller
   newName: docker.io/kubeflownotebookswg/notebook-controller
-  newTag: v1.8.0-rc.0
+  newTag: v1.8.0
diff --git a/apps/katib/upstream/components/controller/trial-templates.yaml b/apps/katib/upstream/components/controller/trial-templates.yaml
@@ -15,7 +15,7 @@ data:
         spec:
           containers:
             - name: training-container
-              image: docker.io/kubeflowkatib/mxnet-mnist:v0.16.0-rc.1
+              image: docker.io/kubeflowkatib/mxnet-mnist:v0.16.0
               command:
                 - "python3"
                 - "/opt/mxnet-mnist/mnist.py"
@@ -33,7 +33,7 @@ data:
         spec:
           containers:
             - name: training-container
-              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.16.0-rc.1
+              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.16.0
               command:
                 - python3
                 - -u
@@ -54,7 +54,7 @@ data:
             spec:
               containers:
                 - name: pytorch
-                  image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0-rc.1
+                  image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0
                   command:
                     - "python3"
                     - "/opt/pytorch-mnist/mnist.py"
@@ -68,7 +68,7 @@ data:
             spec:
               containers:
                 - name: pytorch
-                  image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0-rc.1
+                  image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.16.0
                   command:
                     - "python3"
                     - "/opt/pytorch-mnist/mnist.py"

diff --git a/apps/katib/upstream/installs/katib-cert-manager/katib-config.yaml b/apps/katib/upstream/installs/katib-cert-manager/katib-config.yaml
@@ -14,40 +14,40 @@ init:
 runtime:
   metricsCollectors:
     - kind: StdOut
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: File
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: TensorFlowEvent
-      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0
       resources:
         limits:
           memory: 1Gi
   suggestions:
     - algorithmName: random
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: tpe
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: grid
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: hyperband
-      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0
     - algorithmName: bayesianoptimization
-      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0
     - algorithmName: cmaes
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: sobol
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: multivariate-tpe
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: enas
-      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0
       resources:
         limits:
           memory: 200Mi
     - algorithmName: darts
-      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0
     - algorithmName: pbt
-      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0
       persistentVolumeClaimSpec:
         accessModes:
           - ReadWriteMany
@@ -56,4 +56,4 @@ runtime:
             storage: 5Gi
   earlyStoppings:
     - algorithmName: medianstop
-      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0
diff --git a/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml b/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml
@@ -22,13 +22,13 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
   - name: docker.io/kubeflowkatib/katib-ui
     newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
 
 patchesStrategicMerge:
   - patches/katib-cert-injection.yaml

diff --git a/apps/katib/upstream/installs/katib-external-db/katib-config.yaml b/apps/katib/upstream/installs/katib-external-db/katib-config.yaml
@@ -16,40 +16,40 @@ init:
 runtime:
   metricsCollectors:
     - kind: StdOut
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: File
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: TensorFlowEvent
-      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0
       resources:
         limits:
           memory: 1Gi
   suggestions:
     - algorithmName: random
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: tpe
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: grid
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: hyperband
-      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0
     - algorithmName: bayesianoptimization
-      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0
     - algorithmName: cmaes
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: sobol
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: multivariate-tpe
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: enas
-      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0
       resources:
         limits:
           memory: 200Mi
     - algorithmName: darts
-      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0
     - algorithmName: pbt
-      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0
       persistentVolumeClaimSpec:
         accessModes:
           - ReadWriteMany
@@ -58,4 +58,4 @@ runtime:
             storage: 5Gi
   earlyStoppings:
     - algorithmName: medianstop
-      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0
diff --git a/apps/katib/upstream/installs/katib-external-db/kustomization.yaml b/apps/katib/upstream/installs/katib-external-db/kustomization.yaml
@@ -18,13 +18,13 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
   - name: docker.io/kubeflowkatib/katib-ui
     newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.16.0-rc.1
+    newTag: v0.16.0
 patchesStrategicMerge:
   - patches/db-manager.yaml
 # Modify katib-mysql-secrets with parameters for the DB.

diff --git a/apps/katib/upstream/installs/katib-leader-election/katib-config.yaml b/apps/katib/upstream/installs/katib-leader-election/katib-config.yaml
@@ -17,40 +17,40 @@ init:
 runtime:
   metricsCollectors:
     - kind: StdOut
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: File
-      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/file-metrics-collector:v0.16.0
     - kind: TensorFlowEvent
-      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.16.0
       resources:
         limits:
           memory: 1Gi
   suggestions:
     - algorithmName: random
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: tpe
-      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.16.0
     - algorithmName: grid
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: hyperband
-      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-hyperband:v0.16.0
     - algorithmName: bayesianoptimization
-      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-skopt:v0.16.0
     - algorithmName: cmaes
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: sobol
-      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-goptuna:v0.16.0
     - algorithmName: multivariate-tpe
-      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-optuna:v0.16.0
     - algorithmName: enas
-      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-enas:v0.16.0
       resources:
         limits:
           memory: 200Mi
     - algorithmName: darts
-      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-darts:v0.16.0
     - algorithmName: pbt
-      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/suggestion-pbt:v0.16.0
       persistentVolumeClaimSpec:
         accessModes:
           - ReadWriteMany
@@ -59,4 +59,4 @@ runtime:
             storage: 5Gi
   earlyStoppings:
     - algorithmName: medianstop
-      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0-rc.1
+      image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.16.0