From 2433481c025db2cdf38d8bb0ca97b95ce78382ce Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Wed, 8 Jan 2025 13:16:57 +0200 Subject: [PATCH 1/3] update CI --- .github/workflows/chart-release.yaml | 1 + .github/workflows/update-charts-dispatch.yaml | 35 ++++++------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index 2b02be9a7..9c529f248 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -10,6 +10,7 @@ on: - main paths-ignore: - "**/.argocd-source-*" + - ".github/**" jobs: release-helm-charts: diff --git a/.github/workflows/update-charts-dispatch.yaml b/.github/workflows/update-charts-dispatch.yaml index bf8191eb2..0f6afec1b 100644 --- a/.github/workflows/update-charts-dispatch.yaml +++ b/.github/workflows/update-charts-dispatch.yaml @@ -4,10 +4,8 @@ on: repository_dispatch: types: [ - trigger-workflow-testkube-cloud-api-main, + trigger-workflow-testkube-cloud-services, trigger-workflow-testkube-cloud-ui-main, - trigger-workflow-testkube-worker-service-main, - trigger-workflow-testkube-logs-service-main, trigger-workflow-testkube-agent-main ] @@ -32,22 +30,19 @@ jobs: version: v3.10.0 - name: Update Helm chart with changes files - if: github.event.action != 'trigger-workflow-testkube-agent-main' + if: github.event.action != 'trigger-workflow-testkube-agent-main' && github.event.action != 'trigger-workflow-testkube-cloud-ui-main' run: | # update application version - ./scripts/update.sh \ - -c ${{ github.event.client_payload.app }} \ - -a ${{ github.event.client_payload.appVersion }} \ - --verbose - - echo -e "### ${{ github.event.client_payload.app }} Helm chart diff" >> $GITHUB_STEP_SUMMARY - echo -e '```' >> $GITHUB_STEP_SUMMARY - git --no-pager diff >> $GITHUB_STEP_SUMMARY - echo -e '```' >> $GITHUB_STEP_SUMMARY + charts=("testkube-cloud-api" "testkube-worker-service" "testkube-logs-service" ) + for chart in "${charts[@]}"; do + ./scripts/update.sh -c "$chart" -a ${{ github.event.client_payload.appVersion }} --verbose + done - # update helm chart version - new_chart_version=$(./scripts/update.sh -c ${{ github.event.client_payload.app }} --print-chart-version) - echo "CHART_VERSION=$new_chart_version" >> $GITHUB_ENV + - name: Update Helm chart with changes for testkube-cloud-ui service + if: github.event.action != 'trigger-workflow-testkube-agent-main' && github.event.action != 'trigger-workflow-testkube-cloud-services' + run: | + # update application version + ./scripts/update.sh -c "testkube-cloud-ui" -a ${{ github.event.client_payload.appVersion }} --verbose - name: Update Agent version if: github.event.action == 'trigger-workflow-testkube-agent-main' @@ -67,14 +62,6 @@ jobs: echo "Bumping testkube-enterprise Helm-chart version" ./scripts/update.sh -c testkube-enterprise --strategy patch - enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version) - echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV - - echo -e "### Testkube Enterprise Helm chart diff" >> $GITHUB_STEP_SUMMARY - echo -e '```' >> $GITHUB_STEP_SUMMARY - git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY - echo -e '```' >> $GITHUB_STEP_SUMMARY - - name: Check for changes in generated Helm docs models (helm-docs) run: | ./scripts/helm-docs.sh From 3460eba5659cd3ef692cf21b590ea24968ff6b50 Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Thu, 9 Jan 2025 12:41:07 +0200 Subject: [PATCH 2/3] update migration image --- scripts/sync.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/sync.sh b/scripts/sync.sh index 514002c16..985dd4fcf 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -22,6 +22,8 @@ enterprise_worker_service_app_version=$("$update_script" -c testkube-worker-serv # Update the values.yaml in the enterprise chart echo "Updating testkube-cloud-api version in testkube-enterprise Helm chart to $enterprise_api_app_version" +yq eval -i '.testkube-cloud-api.migrationImage.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/values.yaml" +echo "Updating testkube-migrations version in testkube-enterprise Helm chart to $enterprise_api_app_version" yq eval -i '.testkube-cloud-api.image.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/values.yaml" echo "Updating testkube-cloud-api version in testkube-enterprise Helm chart for local-install values file to $enterprise_api_app_version" yq eval -i '.testkube-cloud-api.image.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/local-values.yaml" @@ -35,6 +37,8 @@ echo "Updating testkube-worker-service version in testkube-enterprise Helm chart yq eval -i '.testkube-worker-service.image.tag = env(enterprise_worker_service_app_version)' "charts/testkube-enterprise/local-values.yaml" echo "Updating testkube-cloud-api version in testkube-cloud-api values.yaml to $enterprise_api_app_version" yq eval -i '.image.tag = env(enterprise_api_app_version)' "charts/testkube-cloud-api/values.yaml" +echo "Updating testkube-migrations version in testkube-cloud-api values.yaml to $enterprise_api_app_version" +yq eval -i '.migrationImage.tag = env(enterprise_api_app_version)' "charts/testkube-cloud-api/values.yaml" echo "Updating testkube-cloud-ui version in testkube-cloud-ui values.yaml to $enterprise_ui_app_version" yq eval -i '.image.tag = env(enterprise_ui_app_version)' "charts/testkube-cloud-ui/values.yaml" echo "Updating testkube-worker-service version in testkube-worker-service values.yaml to $enterprise_worker_service_app_version" From b9f1d6ff4151f63581fac48baa91ca78193f0611 Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Thu, 9 Jan 2025 12:43:21 +0200 Subject: [PATCH 3/3] update migration image --- scripts/sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/sync.sh b/scripts/sync.sh index 985dd4fcf..43ececaad 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -22,9 +22,9 @@ enterprise_worker_service_app_version=$("$update_script" -c testkube-worker-serv # Update the values.yaml in the enterprise chart echo "Updating testkube-cloud-api version in testkube-enterprise Helm chart to $enterprise_api_app_version" -yq eval -i '.testkube-cloud-api.migrationImage.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/values.yaml" -echo "Updating testkube-migrations version in testkube-enterprise Helm chart to $enterprise_api_app_version" yq eval -i '.testkube-cloud-api.image.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/values.yaml" +echo "Updating testkube-migrations version in testkube-enterprise Helm chart to $enterprise_api_app_version" +yq eval -i '.testkube-cloud-api.migrationImage.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/values.yaml" echo "Updating testkube-cloud-api version in testkube-enterprise Helm chart for local-install values file to $enterprise_api_app_version" yq eval -i '.testkube-cloud-api.image.tag = env(enterprise_api_app_version)' "charts/testkube-enterprise/local-values.yaml" echo "Updating testkube-cloud-ui version in testkube-enterprise Helm chart to $enterprise_ui_app_version"