From bf9d57b21f1066b7d24937b43490cee55117eeea Mon Sep 17 00:00:00 2001 From: Vincent Dawkins Date: Tue, 9 Apr 2024 10:32:42 +0200 Subject: [PATCH 1/8] feature/CH-125_remove-z2jh remove z2jh --- applications/jupyterhub/zero-to-jupyterhub-k8s | 1 - 1 file changed, 1 deletion(-) delete mode 160000 applications/jupyterhub/zero-to-jupyterhub-k8s diff --git a/applications/jupyterhub/zero-to-jupyterhub-k8s b/applications/jupyterhub/zero-to-jupyterhub-k8s deleted file mode 160000 index c92c1237..00000000 --- a/applications/jupyterhub/zero-to-jupyterhub-k8s +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c92c12374795e84f36f5f16c4e8b8a448ad2f230 From abb58f670108830f7ba692a453bda20a43e234ea Mon Sep 17 00:00:00 2001 From: Afonso Pinto Date: Thu, 13 Jun 2024 16:03:26 +0100 Subject: [PATCH 2/8] Update README.md --- docs/applications/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/applications/README.md b/docs/applications/README.md index 82fe472a..e76bd861 100644 --- a/docs/applications/README.md +++ b/docs/applications/README.md @@ -1,6 +1,6 @@ # Create a new applicaton -Any Dockerfile added in a subfolder below the [applications](./applications) directory is interpreted as an application part of the deployment. +Any Dockerfile added in a subfolder below the [applications](../../applications) directory is interpreted as an application part of the deployment. ## Use harness-application @@ -116,6 +116,6 @@ The most important configuration entries are the following: - `livenessProbe`: defines a a url to use as a liveness probe # Example code -- [Sample application](../applications/samples) is a sample web application providing working examples of deployment configuration, backend and frontend code. +- [Sample application](../../applications/samples) is a sample web application providing working examples of deployment configuration, backend and frontend code. From 65ac65f01205553c1df8c181af75ef33f46754ce Mon Sep 17 00:00:00 2001 From: afonso Date: Wed, 3 Jul 2024 18:03:36 +0100 Subject: [PATCH 3/8] CH-131 fix: Only include base images build on codefresh configuration when necessary --- tools/deployment-cli-tools/ch_cli_tools/codefresh.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py index c4b7dd26..3fc5e833 100644 --- a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py +++ b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py @@ -261,10 +261,11 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig): image=image_tag_with_variables(app_name, tag, base_image_name), ) - codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE, - fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys()) - codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC, - include=helm_values[KEY_TASK_IMAGES].keys()) + if helm_values[KEY_TASK_IMAGES]: + codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE, + fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys()) + codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC, + include=helm_values[KEY_TASK_IMAGES].keys()) codefresh_steps_from_base_path(join( root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL) From e4d7522cc94534edc6296f4f869c0e9f242c2e42 Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Thu, 4 Jul 2024 05:12:58 +0200 Subject: [PATCH 4/8] CH-130 fix typer requirement --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1ee5ea18..745a9c74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -e libraries/models -e libraries/cloudharness-utils -e tools/deployment-cli-tools - +colorama<0.5.0,>=0.4.3 +typer==0.11.0 \ No newline at end of file From a2fc338bfa75b84a555ae9f00d855151c2bf9772 Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Thu, 4 Jul 2024 05:23:31 +0200 Subject: [PATCH 5/8] Fix test pipeline --- deployment/codefresh-test.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml index b87227bb..99fb6c88 100644 --- a/deployment/codefresh-test.yaml +++ b/deployment/codefresh-test.yaml @@ -13,18 +13,6 @@ steps: repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}' revision: '${{CF_BRANCH}}' git: github - post_main_clone: - title: Post main clone - type: parallel - stage: prepare - steps: - - title: Cloning cloud-harness repository... - type: git-clone - stage: prepare - repo: https://github.com/MetaCell/cloud-harness.git - revision: '${{CLOUDHARNESS_BRANCH}}' - working_directory: . - git: github prepare_deployment: title: Prepare helm chart image: python:3.9.10 From 08db8e4f8aff274f0d1d60e64336add54030ca22 Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Thu, 4 Jul 2024 05:32:30 +0200 Subject: [PATCH 6/8] CH-130 dependency tweak --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 745a9c74..21d5ad61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ -e libraries/cloudharness-utils -e tools/deployment-cli-tools colorama<0.5.0,>=0.4.3 -typer==0.11.0 \ No newline at end of file +typer<0.12.0 \ No newline at end of file From 0585050512abf298eecc2ab75dd8be489eaacd1a Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Thu, 4 Jul 2024 05:34:28 +0200 Subject: [PATCH 7/8] CH-130 improver logging --- install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index b13e8dd5..d1c4504a 100644 --- a/install.sh +++ b/install.sh @@ -4,7 +4,8 @@ CURRENT_PATH=$(pwd) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) cd $SCRIPT_DIR - +pip install --upgrade pip +cat requirements.txt pip install -r requirements.txt cd $CURRENT_PATH \ No newline at end of file From d11173291ab0d69b20aa24a995160e7076ef3ab8 Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Thu, 4 Jul 2024 05:38:14 +0200 Subject: [PATCH 8/8] Fix test pipeline --- deployment/codefresh-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml index 99fb6c88..672a2b26 100644 --- a/deployment/codefresh-test.yaml +++ b/deployment/codefresh-test.yaml @@ -19,7 +19,7 @@ steps: stage: prepare working_directory: . commands: - - bash cloud-harness/install.sh + - bash install.sh - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export