From c2efcf33f8faf0853e1e8637e9e780753d8aa04d Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:39:56 +0200 Subject: [PATCH 1/3] Update kubeflow/kubeflow manifests from v1.9.1 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- README.md | 18 +++++++-------- .../upstream/base/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- .../base/configs/spawner_ui_config.yaml | 23 +++++++++++-------- .../upstream/base/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- .../profiles/upstream/base/kustomization.yaml | 2 +- .../overlays/kubeflow/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- .../upstream/base/kustomization.yaml | 2 +- 12 files changed, 32 insertions(+), 29 deletions(-) mode change 100644 => 100755 README.md diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 3df72e34e2..17e026ddb4 --- a/README.md +++ b/README.md @@ -44,15 +44,15 @@ This repo periodically syncs all official Kubeflow components from their respect | Component | Local Manifests Path | Upstream Revision | | - | - | - | | Training Operator | apps/training-operator/upstream | [v1.8.1](https://github.com/kubeflow/training-operator/tree/v1.8.1/manifests) | -| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/notebook-controller/config) | -| PVC Viewer Controller | apps/pvcviewer-roller/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/pvcviewer-controller/config) | -| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/tensorboard-controller/config) | -| Central Dashboard | apps/centraldashboard/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/centraldashboard/manifests) | -| Profiles + KFAM | apps/profiles/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/profile-controller/config) | -| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/admission-webhook/manifests) | -| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/crud-web-apps/jupyter/manifests) | -| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/crud-web-apps/tensorboards/manifests) | -| Volumes Web App | apps/volumes-web-app/upstream | [v1.9.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0/components/crud-web-apps/volumes/manifests) | +| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/notebook-controller/config) | +| PVC Viewer Controller | apps/pvcviewer-roller/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/pvcviewer-controller/config) | +| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/tensorboard-controller/config) | +| Central Dashboard | apps/centraldashboard/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/centraldashboard/manifests) | +| Profiles + KFAM | apps/profiles/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/profile-controller/config) | +| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/admission-webhook/manifests) | +| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/crud-web-apps/jupyter/manifests) | +| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/crud-web-apps/tensorboards/manifests) | +| Volumes Web App | apps/volumes-web-app/upstream | [v1.9.1](https://github.com/kubeflow/kubeflow/tree/v1.9.1/components/crud-web-apps/volumes/manifests) | | Katib | apps/katib/upstream | [v0.17.0](https://github.com/kubeflow/katib/tree/v0.17.0/manifests/v1beta1) | | KServe | contrib/kserve/kserve | [0.13.0](https://github.com/kserve/kserve/releases/tag/v0.13.0) | | KServe Models Web App | contrib/kserve/models-web-app | [0.13.0](https://github.com/kserve/models-web-app/tree/0.13.0/config) | diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml index 04fe85de8c..40317a036d 100644 --- 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.9.0 + newTag: v1.9.1 namespace: kubeflow generatorOptions: disableNameSuffixHash: true diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml index 08f70ab264..5e893252f3 100644 --- a/apps/centraldashboard/upstream/base/kustomization.yaml +++ b/apps/centraldashboard/upstream/base/kustomization.yaml @@ -13,7 +13,7 @@ resources: images: - name: docker.io/kubeflownotebookswg/centraldashboard newName: docker.io/kubeflownotebookswg/centraldashboard - newTag: v1.9.0 + newTag: v1.9.1 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 index 90af4d0753..cdc15e1833 100644 --- 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,16 @@ spawnerFormDefaults: ################################################################ image: # the default container image - value: kubeflownotebookswg/jupyter-scipy:v1.9.0 + value: kubeflownotebookswg/jupyter-scipy:v1.9.1 # the list of available container images in the dropdown options: - - kubeflownotebookswg/jupyter-scipy:v1.9.0 - - kubeflownotebookswg/jupyter-pytorch-full:v1.9.0 - - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.9.0 - - kubeflownotebookswg/jupyter-tensorflow-full:v1.9.0 - - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.9.0 + - kubeflownotebookswg/jupyter-scipy:v1.9.1 + - kubeflownotebookswg/jupyter-pytorch-full:v1.9.1 + - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.9.1 + - kubeflownotebookswg/jupyter-pytorch-gaudi-full:v1.9.1 + - kubeflownotebookswg/jupyter-tensorflow-full:v1.9.1 + - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.9.1 ################################################################ # VSCode-like Container Images (Group 1) @@ -60,11 +61,11 @@ spawnerFormDefaults: ################################################################ imageGroupOne: # the default container image - value: kubeflownotebookswg/codeserver-python:v1.9.0 + value: kubeflownotebookswg/codeserver-python:v1.9.1 # the list of available container images in the dropdown options: - - kubeflownotebookswg/codeserver-python:v1.9.0 + - kubeflownotebookswg/codeserver-python:v1.9.1 ################################################################ # RStudio-like Container Images (Group 2) @@ -81,11 +82,11 @@ spawnerFormDefaults: ################################################################ imageGroupTwo: # the default container image - value: kubeflownotebookswg/rstudio-tidyverse:v1.9.0 + value: kubeflownotebookswg/rstudio-tidyverse:v1.9.1 # the list of available container images in the dropdown options: - - kubeflownotebookswg/rstudio-tidyverse:v1.9.0 + - kubeflownotebookswg/rstudio-tidyverse:v1.9.1 ################################################################ # CPU Resources @@ -134,6 +135,8 @@ spawnerFormDefaults: uiName: "NVIDIA" - limitsKey: "amd.com/gpu" uiName: "AMD" + - limitsKey: "habana.ai/gaudi" + uiName: "Intel Gaudi" # 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 index ec62bdd747..cc6f0a66b7 100644 --- 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.9.0 + newTag: v1.9.1 # 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 index a6b02fd248..888f3afc20 100644 --- 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.9.0 + newTag: v1.9.1 diff --git a/apps/profiles/upstream/base/kustomization.yaml b/apps/profiles/upstream/base/kustomization.yaml index c6a15a0bf9..c6158e6e3a 100644 --- a/apps/profiles/upstream/base/kustomization.yaml +++ b/apps/profiles/upstream/base/kustomization.yaml @@ -12,7 +12,7 @@ patchesStrategicMerge: images: - name: docker.io/kubeflownotebookswg/profile-controller newName: docker.io/kubeflownotebookswg/profile-controller - newTag: v1.9.0 + newTag: v1.9.1 configMapGenerator: - name: namespace-labels-data diff --git a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml index 1b8fba691c..5bb579191c 100644 --- a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml +++ b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml @@ -29,4 +29,4 @@ vars: images: - name: docker.io/kubeflownotebookswg/kfam newName: docker.io/kubeflownotebookswg/kfam - newTag: v1.9.0 + newTag: v1.9.1 diff --git a/apps/pvcviewer-controller/upstream/base/kustomization.yaml b/apps/pvcviewer-controller/upstream/base/kustomization.yaml index 259b701ef7..3d30a580da 100644 --- a/apps/pvcviewer-controller/upstream/base/kustomization.yaml +++ b/apps/pvcviewer-controller/upstream/base/kustomization.yaml @@ -6,4 +6,4 @@ resources: images: - name: docker.io/kubeflownotebookswg/pvcviewer-controller newName: docker.io/kubeflownotebookswg/pvcviewer-controller - newTag: v1.9.0 + newTag: v1.9.1 diff --git a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml index 0a651adf84..b4cbdcada8 100644 --- a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml +++ b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml @@ -14,4 +14,4 @@ patchesStrategicMerge: images: - name: docker.io/kubeflownotebookswg/tensorboard-controller newName: docker.io/kubeflownotebookswg/tensorboard-controller - newTag: v1.9.0 + newTag: v1.9.1 diff --git a/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml index 366638beec..6e0554b359 100644 --- a/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml +++ b/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: images: - name: docker.io/kubeflownotebookswg/tensorboards-web-app newName: docker.io/kubeflownotebookswg/tensorboards-web-app - newTag: v1.9.0 + newTag: v1.9.1 # 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/volumes-web-app/upstream/base/kustomization.yaml b/apps/volumes-web-app/upstream/base/kustomization.yaml index e81cdf755a..8ad637cd97 100644 --- a/apps/volumes-web-app/upstream/base/kustomization.yaml +++ b/apps/volumes-web-app/upstream/base/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: images: - name: docker.io/kubeflownotebookswg/volumes-web-app newName: docker.io/kubeflownotebookswg/volumes-web-app - newTag: v1.9.0 + newTag: v1.9.1 # We need the name to be unique without the suffix because the original name is what # gets used with patches configMapGenerator: From 92f6243a2783ee24984c2f1ce73e3e5b1193d204 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:44:02 +0200 Subject: [PATCH 2/3] executable screipts Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- hack/synchronize-istio-cni-manifests.sh | 0 hack/synchronize-istio-manifests.sh | 0 hack/synchronize-katib-manifests.sh | 0 hack/synchronize-knative-manifests.sh | 0 hack/synchronize-kserve-kserve-manifests.sh | 0 hack/synchronize-kserve-web-app-manifests.sh | 0 hack/synchronize-kubeflow-manifests.sh | 2 +- hack/synchronize-model-registry-manifests.sh | 0 hack/synchronize-seldon-manifests.sh | 0 hack/synchronize-training-operator-manifests.sh | 0 hack/trivy_scan.py | 0 11 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 hack/synchronize-istio-cni-manifests.sh mode change 100644 => 100755 hack/synchronize-istio-manifests.sh mode change 100644 => 100755 hack/synchronize-katib-manifests.sh mode change 100644 => 100755 hack/synchronize-knative-manifests.sh mode change 100644 => 100755 hack/synchronize-kserve-kserve-manifests.sh mode change 100644 => 100755 hack/synchronize-kserve-web-app-manifests.sh mode change 100644 => 100755 hack/synchronize-kubeflow-manifests.sh mode change 100644 => 100755 hack/synchronize-model-registry-manifests.sh mode change 100644 => 100755 hack/synchronize-seldon-manifests.sh mode change 100644 => 100755 hack/synchronize-training-operator-manifests.sh mode change 100644 => 100755 hack/trivy_scan.py diff --git a/hack/synchronize-istio-cni-manifests.sh b/hack/synchronize-istio-cni-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-istio-manifests.sh b/hack/synchronize-istio-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-katib-manifests.sh b/hack/synchronize-katib-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-knative-manifests.sh b/hack/synchronize-knative-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-kserve-kserve-manifests.sh b/hack/synchronize-kserve-kserve-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-kserve-web-app-manifests.sh b/hack/synchronize-kserve-web-app-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-kubeflow-manifests.sh b/hack/synchronize-kubeflow-manifests.sh old mode 100644 new mode 100755 index d83462a6c2..9bad5a347d --- a/hack/synchronize-kubeflow-manifests.sh +++ b/hack/synchronize-kubeflow-manifests.sh @@ -14,7 +14,7 @@ set -euo pipefail IFS=$'\n\t' -COMMIT="v1.9.0" # You can use tags as well +COMMIT="v1.9.1" # You can use tags as well SRC_DIR=${SRC_DIR:=/tmp/kubeflow-kubeflow} BRANCH=${BRANCH:=synchronize-kubeflow-kubeflow-manifests-${COMMIT?}} diff --git a/hack/synchronize-model-registry-manifests.sh b/hack/synchronize-model-registry-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-seldon-manifests.sh b/hack/synchronize-seldon-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/synchronize-training-operator-manifests.sh b/hack/synchronize-training-operator-manifests.sh old mode 100644 new mode 100755 diff --git a/hack/trivy_scan.py b/hack/trivy_scan.py old mode 100644 new mode 100755 From 7c4536fd7840a44ab84e4d346319d44373feb5c0 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:54:30 +0200 Subject: [PATCH 3/3] 1.9.1 in tests and readme Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- contrib/ray/README.md | 2 +- .../kf-objects/notebook.test.kubeflow-user-example.com.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ray/README.md b/contrib/ray/README.md index 3ae2e6f8c4..7ed0b4490c 100644 --- a/contrib/ray/README.md +++ b/contrib/ray/README.md @@ -101,7 +101,7 @@ kubectl get svc -n $MY_KUBEFLOW_USER_NAMESPACE ## Step 5: Create a JupyterLab via Kubeflow Central Dashboard * Click "Notebooks" icon in the left panel. * Click "New Notebook" -* Select `kubeflownotebookswg/jupyter-scipy:v1.9.0` as OCI image (or any other with the same python version) +* Select `kubeflownotebookswg/jupyter-scipy:v1.9.1` as OCI image (or any other with the same python version) * Click "Launch" * Click "CONNECT" to connect into the JupyterLab instance. diff --git a/tests/gh-actions/kf-objects/notebook.test.kubeflow-user-example.com.yaml b/tests/gh-actions/kf-objects/notebook.test.kubeflow-user-example.com.yaml index fdc8e53e0c..6c7ac431d9 100644 --- a/tests/gh-actions/kf-objects/notebook.test.kubeflow-user-example.com.yaml +++ b/tests/gh-actions/kf-objects/notebook.test.kubeflow-user-example.com.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: test - image: kubeflownotebookswg/jupyter-scipy:v1.9.0 + image: kubeflownotebookswg/jupyter-scipy:v1.9.1 imagePullPolicy: IfNotPresent resources: limits: