From b40e1b09cb5b4603684f203e29cf79da2327cfd8 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 4 Sep 2024 16:23:21 +0200 Subject: [PATCH] Prepare release v0.14.0 (#333) Signed-off-by: Andrei Kvapil ## Summary by CodeRabbit - **New Features** - Upgraded various container images to version `v0.14.0`, enhancing application performance and potentially introducing new features and bug fixes. - **Bug Fixes** - Improved version tracking for packages by updating commit hashes, enhancing clarity and traceability. - **Chores** - Updated configuration files to reflect the new image versions for components, ensuring the latest updates are utilized across the application. Signed-off-by: Andrei Kvapil --- hack/gen_versions_map.sh | 20 ++++++++++++++++---- manifests/cozystack-installer.yaml | 4 ++-- packages/apps/mysql/Chart.yaml | 2 +- packages/apps/versions_map | 9 ++++++--- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/system/dashboard/values.yaml | 6 +++--- packages/system/kamaji/values.yaml | 2 +- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/hack/gen_versions_map.sh b/hack/gen_versions_map.sh index 8e635780..e3b24af8 100755 --- a/hack/gen_versions_map.sh +++ b/hack/gen_versions_map.sh @@ -24,24 +24,36 @@ resolved_miss_map=$( change_commit=$(git --no-pager blame -L"$line",+1 -- "$chart/Chart.yaml" | awk '{print $1}') if [ "$change_commit" = "00000000" ]; then - # Not commited yet, use previus commit + # Not committed yet, use previous commit line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') if [ $(echo $commit | cut -c1) = "^" ]; then - # Previus commit not exists + # Previous commit not exists commit=$(echo $commit | cut -c2-) fi else - # Commited, but version_map wasn't updated + # Committed, but version_map wasn't updated line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') change_commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') if [ $(echo $change_commit | cut -c1) = "^" ]; then - # Previus commit not exists + # Previous commit not exists commit=$(echo $change_commit | cut -c2-) else commit=$(git describe --always "$change_commit~1") fi fi + + # Check if the commit belongs to the main branch + if ! git merge-base --is-ancestor "$commit" main; then + # Find the closest parent commit that belongs to main + commit_in_main=$(git log --pretty=format:"%H" main -- "$chart/Chart.yaml" | head -n 1) + if [ -n "$commit_in_main" ]; then + commit="$commit_in_main" + else + # No valid commit found in main branch for $chart, skipping..." + continue + fi + fi fi echo "$chart $version $commit" done diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index b99ff62b..02406158 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -68,7 +68,7 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.13.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.14.0" env: - name: KUBERNETES_SERVICE_HOST value: localhost @@ -87,7 +87,7 @@ spec: fieldRef: fieldPath: metadata.name - name: darkhttpd - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.13.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.14.0" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/apps/mysql/Chart.yaml b/packages/apps/mysql/Chart.yaml index fcc21657..4b9ae3c7 100644 --- a/packages/apps/mysql/Chart.yaml +++ b/packages/apps/mysql/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.5.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 0ce16c98..85d5d4f2 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -2,11 +2,13 @@ bucket 0.1.0 HEAD clickhouse 0.1.0 ca79f72 clickhouse 0.2.0 7cd7de73 clickhouse 0.2.1 5ca8823 -clickhouse 0.3.0 HEAD +clickhouse 0.3.0 b00621e +clickhouse 0.4.0 HEAD ferretdb 0.1.0 4ffa8615 ferretdb 0.1.1 5ca8823 ferretdb 0.2.0 adaf603 -ferretdb 0.3.0 HEAD +ferretdb 0.3.0 aa2f553 +ferretdb 0.4.0 HEAD http-cache 0.1.0 a956713 http-cache 0.2.0 5ca8823 http-cache 0.3.0 HEAD @@ -31,7 +33,8 @@ kubernetes 0.10.0 HEAD mysql 0.1.0 f642698 mysql 0.2.0 8b975ff0 mysql 0.3.0 5ca8823 -mysql 0.4.0 HEAD +mysql 0.4.0 93018c4 +mysql 0.5.0 HEAD nats 0.1.0 5ca8823 nats 0.2.0 HEAD postgres 0.1.0 f642698 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 8b694ec2..4772bc67 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/aenix-io/cozystack/cozystack:v0.13.0@sha256:0943f277c63f20cea19bef0207dc47f47157b58309c09af18830aac7906d1416 + image: ghcr.io/aenix-io/cozystack/cozystack:v0.14.0@sha256:5a0269683feb4fff24e9044a41453dbedbc857ad450102b275e1d05aa3aec081 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index be1d523b..290405be 100644 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.13.0@sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791 + image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.14.0@sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791 diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 56fe5653..b92e181a 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -33,11 +33,11 @@ kubeapps: image: registry: ghcr.io/aenix-io/cozystack repository: dashboard - tag: v0.13.0 + tag: v0.14.0 digest: "sha256:4818712e9fc9c57cc321512760c3226af564a04e69d4b3ec9229ab91fd39abeb" kubeappsapis: image: registry: ghcr.io/aenix-io/cozystack repository: kubeapps-apis - tag: v0.13.0 - digest: "sha256:a8cf2b536573f4bc29d4dce323ef3007a65567d6f1fe7803490bd71f422aca88" + tag: v0.14.0 + digest: "sha256:7918268647b8f4862f312df9ba42e9edfd2f703223259e2e8b9e02da1ad71cc4" diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index f782364b..81f60505 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,5 +3,5 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.13.0@sha256:197d7c36f76d4d9c09cc82eb87f9e36f05799a2b9158ae27e4729f2dd636ad0d + tag: v0.14.0@sha256:47bf03ba0f5a4c25eb53df94a1962bbd2423b1b3d027de26945b06a363eebf2e repository: ghcr.io/aenix-io/cozystack/kamaji