From adf7bb6904149f8f6cb217844bf9095829b1c2c7 Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Thu, 18 Feb 2021 15:53:03 -0500 Subject: [PATCH 1/9] include thoth configuration file for kebechet (#323) Signed-off-by: Harshad Reddy Nalla --- .thoth.yaml | 12 ++++++++++++ version.py | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 .thoth.yaml create mode 100644 version.py diff --git a/.thoth.yaml b/.thoth.yaml new file mode 100644 index 000000000..339d00bbd --- /dev/null +++ b/.thoth.yaml @@ -0,0 +1,12 @@ +managers: + - name: version + configuration: + maintainers: + - crobby + - vpavlin + - lavlas + - nakfour + assignees: + - sesheta + labels: [bot] + changelog_file: true diff --git a/version.py b/version.py new file mode 100644 index 000000000..97790d5d7 --- /dev/null +++ b/version.py @@ -0,0 +1,5 @@ +#!/usr/bin/env python3 +"""This file is just for the release bots of opendatahub manifests""" + + +__version__ = "1.0.0" From 802314127fd0af38932f69dbbed0ebc99ae98c4a Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Thu, 18 Feb 2021 15:53:17 -0500 Subject: [PATCH 2/9] issue template for release via bots (#322) Signed-off-by: Harshad Reddy Nalla --- .github/ISSUE_TEMPLATE/major-release.md | 11 +++++++++++ .github/ISSUE_TEMPLATE/minor-release.md | 11 +++++++++++ .github/ISSUE_TEMPLATE/patch-release.md | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/major-release.md create mode 100644 .github/ISSUE_TEMPLATE/minor-release.md create mode 100644 .github/ISSUE_TEMPLATE/patch-release.md diff --git a/.github/ISSUE_TEMPLATE/major-release.md b/.github/ISSUE_TEMPLATE/major-release.md new file mode 100644 index 000000000..49d45369e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/major-release.md @@ -0,0 +1,11 @@ +--- +name: Major release +about: Create a new major release +title: New major release +assignees: 'sesheta' +labels: bot +--- + +Hey, Kebechet! + +Create a new major release, please. diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md new file mode 100644 index 000000000..27262e67c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/minor-release.md @@ -0,0 +1,11 @@ +--- +name: Minor release +about: Create a new minor release +title: New minor release +assignees: 'sesheta' +labels: bot +--- + +Hey, Kebechet! + +Create a new minor release, please. diff --git a/.github/ISSUE_TEMPLATE/patch-release.md b/.github/ISSUE_TEMPLATE/patch-release.md new file mode 100644 index 000000000..fae0f2589 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/patch-release.md @@ -0,0 +1,11 @@ +--- +name: Patch release +about: Create a new patch release +title: New patch release +assignees: 'sesheta' +labels: bot +--- + +Hey, Kebechet! + +Create a new patch release, please. From 0ff5f42c19fd89beebd652782fb99bc243228806 Mon Sep 17 00:00:00 2001 From: "khebhut[bot]" <64544372+khebhut[bot]@users.noreply.github.com> Date: Fri, 19 Feb 2021 09:02:23 -0500 Subject: [PATCH 3/9] Release of version 1.0.1 (#326) Co-authored-by: Kebechet --- CHANGELOG.md | 18 ++++++++++++++++++ version.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..a9bf7648b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ + +## Release 1.0.1 (2021-02-18T21:17:04) +### Features +* issue template for release via bots (#322) +* include thoth configuration file for kebechet (#323) +* Change ODH dashboard type to ClusterIP (#321) +* upgrade s2i notebook images for jupyterhub (#304) +* Update README.md (#307) +* Owners List Updates (#306) +* Update grafana to version 3.8.1 (#301) +* Update peak operator file to include odh-manifests repo url (#299) +* Adding changes to kfdef (#298) +* Updated jupyterhub imagestream image to 0.1.5 (#296) +### Bug Fixes +* Update JH image to v0.2.0 to fix cert issues and support groups (#312) +### Improvements +* Simplify test for dashboard pods, hopefully eliminating flake (#305) +* Use airflowui secure route for tests (#300) diff --git a/version.py b/version.py index 97790d5d7..da34e4359 100644 --- a/version.py +++ b/version.py @@ -2,4 +2,4 @@ """This file is just for the release bots of opendatahub manifests""" -__version__ = "1.0.0" +__version__ = "1.0.1" From 36f30a7980362efb15874802a81d9e871f5ed6bf Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Mon, 22 Feb 2021 14:58:42 -0500 Subject: [PATCH 4/9] set imagestream name same as the tag version (#325) Signed-off-by: Harshad Reddy Nalla --- .../overlays/additional/minimal-notebook-imagestream.yaml | 2 +- .../overlays/additional/scipy-notebook-imagestream.yaml | 2 +- .../overlays/additional/tensorflow-notebook-imagestream.yaml | 2 +- tests/basictests/jupyterhub.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml index ec2468fa9..698785967 100644 --- a/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml @@ -17,6 +17,6 @@ spec: from: kind: DockerImage name: quay.io/thoth-station/s2i-minimal-notebook:v0.0.7 - name: "v0.0.4" + name: "v0.0.7" referencePolicy: type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/scipy-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/scipy-notebook-imagestream.yaml index e48243855..f106187d9 100644 --- a/jupyterhub/notebook-images/overlays/additional/scipy-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/scipy-notebook-imagestream.yaml @@ -17,6 +17,6 @@ spec: from: kind: DockerImage name: quay.io/thoth-station/s2i-scipy-notebook:v0.0.2 - name: "v0.0.1" + name: "v0.0.2" referencePolicy: type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml index a0647bc5f..52facb6a0 100644 --- a/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml @@ -17,6 +17,6 @@ spec: from: kind: DockerImage name: quay.io/thoth-station/s2i-tensorflow-notebook:v0.0.2 - name: "v0.0.1" + name: "v0.0.2" referencePolicy: type: Source diff --git a/tests/basictests/jupyterhub.sh b/tests/basictests/jupyterhub.sh index 12d18c2a8..75cddd36e 100755 --- a/tests/basictests/jupyterhub.sh +++ b/tests/basictests/jupyterhub.sh @@ -11,7 +11,7 @@ JH_LOGIN_PASS=${OPENSHIFT_PASS:-"admin"} #Password used to login to JH OPENSHIFT_LOGIN_PROVIDER=${OPENSHIFT_LOGIN_PROVIDER:-"htpasswd-provider"} #OpenShift OAuth provider used for login JH_AS_ADMIN=${JH_AS_ADMIN:-"true"} #Expect the user to be Admin in JupyterHub -JUPYTER_IMAGES=(s2i-minimal-notebook:v0.0.4 s2i-scipy-notebook:v0.0.1 s2i-tensorflow-notebook:v0.0.1 s2i-spark-minimal-notebook:py36-spark2.4.5-hadoop2.7.3) +JUPYTER_IMAGES=(s2i-minimal-notebook:v0.0.7 s2i-scipy-notebook:v0.0.2 s2i-tensorflow-notebook:v0.0.2 s2i-spark-minimal-notebook:py36-spark2.4.5-hadoop2.7.3) JUPYTER_NOTEBOOK_FILES=(basic.ipynb basic.ipynb tensorflow.ipynb spark.ipynb) os::test::junit::declare_suite_start "$MY_SCRIPT" From 8532f7c941fb331921873e978682938786eafd1e Mon Sep 17 00:00:00 2001 From: Juana Nakfour Date: Tue, 23 Feb 2021 15:29:25 -0600 Subject: [PATCH 5/9] Changing Superset deployment to recreate strategy (#317) Co-authored-by: Juana Nakfour --- superset/base/deploymentconfig.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/superset/base/deploymentconfig.yaml b/superset/base/deploymentconfig.yaml index df3d52f93..d21d2b178 100644 --- a/superset/base/deploymentconfig.yaml +++ b/superset/base/deploymentconfig.yaml @@ -9,6 +9,8 @@ metadata: component.opendatahub.io/name: superset spec: replicas: 1 + strategy: + type: Recreate selector: deploymentconfig: superset template: From fbfbc9d0cdb790833c0f9804a2e71ef652a48a01 Mon Sep 17 00:00:00 2001 From: Chris Chase Date: Wed, 24 Feb 2021 15:46:58 -0500 Subject: [PATCH 6/9] Updated ODH dashboard image with latest. --- odh-dashboard/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odh-dashboard/base/deployment.yaml b/odh-dashboard/base/deployment.yaml index f430051b1..691cc7779 100644 --- a/odh-dashboard/base/deployment.yaml +++ b/odh-dashboard/base/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccount: odh-dashboard containers: - name: odh-dashboard - image: quay.io/opendatahub/odh-dashboard:v1.0 + image: quay.io/modh/odh-dashboard:latest imagePullPolicy: Always ports: - containerPort: 8080 From f91ad922e822f712d095b40588ffa0110cc3096e Mon Sep 17 00:00:00 2001 From: Chad Roberts Date: Wed, 24 Feb 2021 17:21:24 -0500 Subject: [PATCH 7/9] Adding optional var SKIP_KFDEF_INSTALL to allow for cases where the KfDef to be tested is created outside of the tests (#331) --- tests/README.md | 4 ++++ tests/scripts/install.sh | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/README.md b/tests/README.md index f04bcacf6..28d73e0bb 100644 --- a/tests/README.md +++ b/tests/README.md @@ -33,6 +33,10 @@ If you'd like to run the tests against an instance that already has Open Data Hu you set `SKIP_INSTALL=true` and that will cause the test run to skip the installation process and will only run the tests. example: `make run SKIP_INSTALL=true` +If you'd like to run the tests against an instance that already has a KfDef created, +you set `SKIP_KFDEF_INSTALL=true` and that will cause the test run +to skip the step of creating the default KfDef. example: `make run SKIP_KFDEF_INSTALL=true` + If you'd like to run a single test instead of all tests, you can set the TESTS_REGEX variable `TESTS_REGEX=`. That will only run the test that you specify instead of all of the tests. example: `make run TESTS_REGEX=grafana` diff --git a/tests/scripts/install.sh b/tests/scripts/install.sh index 7941a8251..67a31b708 100755 --- a/tests/scripts/install.sh +++ b/tests/scripts/install.sh @@ -68,13 +68,20 @@ if [ -z "${OPENSHIFT_USER}" ] || [ -z "${OPENSHIFT_PASS}" ]; then export OPENSHIFT_PASS=admin fi -echo "Creating the following KfDef" -cat ./kfctl_openshift.yaml > ${ARTIFACT_DIR}/kfctl_openshift.yaml -oc apply -f ./kfctl_openshift.yaml -kfctl_result=$? -if [ "$kfctl_result" -ne 0 ]; then +if ! [ -z "${SKIP_KFDEF_INSTALL}" ]; then + ## SKIP_KFDEF_INSTALL is useful in an instance where the + ## operator install comes with an init container to handle + ## the KfDef creation + echo "Relying on existing KfDef because SKIP_KFDEF_INSTALL was set" +else + echo "Creating the following KfDef" + cat ./kfctl_openshift.yaml > ${ARTIFACT_DIR}/kfctl_openshift.yaml + oc apply -f ./kfctl_openshift.yaml + kfctl_result=$? + if [ "$kfctl_result" -ne 0 ]; then echo "The installation failed" exit $kfctl_result + fi fi set +x popd From 1de140f6e9d6ef0de0d1eb68ad39e9cca175facc Mon Sep 17 00:00:00 2001 From: Chris Chase Date: Wed, 24 Feb 2021 15:46:58 -0500 Subject: [PATCH 8/9] Updated ODH dashboard image with latest. --- odh-dashboard/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odh-dashboard/base/deployment.yaml b/odh-dashboard/base/deployment.yaml index f430051b1..691cc7779 100644 --- a/odh-dashboard/base/deployment.yaml +++ b/odh-dashboard/base/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccount: odh-dashboard containers: - name: odh-dashboard - image: quay.io/opendatahub/odh-dashboard:v1.0 + image: quay.io/modh/odh-dashboard:latest imagePullPolicy: Always ports: - containerPort: 8080 From fc15e24849b1c13cf171b7b1fadbf13e6686cde3 Mon Sep 17 00:00:00 2001 From: Maulik Shah Date: Fri, 12 Feb 2021 13:52:21 -0500 Subject: [PATCH 9/9] Enable prometheus to scrape Jupyterhub metrics on the port 8080 --- jupyterhub/jupyterhub/base/jupyterhub-configmap.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jupyterhub/jupyterhub/base/jupyterhub-configmap.yaml b/jupyterhub/jupyterhub/base/jupyterhub-configmap.yaml index 349361c7a..8bfc4ee81 100644 --- a/jupyterhub/jupyterhub/base/jupyterhub-configmap.yaml +++ b/jupyterhub/jupyterhub/base/jupyterhub-configmap.yaml @@ -5,7 +5,8 @@ metadata: app: jupyterhub name: jupyterhub-cfg data: - jupyterhub_config.py: "" + jupyterhub_config.py: | + c.JupyterHub.authenticate_prometheus = False; jupyterhub_admins: "admin" gpu_mode: "" singleuser_pvc_size: 2Gi