From 662864a90cd2b46da9e01b365821e469745be386 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 4 Jan 2024 16:24:01 +0100 Subject: [PATCH] test version_map generator --- packages/apps/gen_versions_map.sh | 4 ++-- packages/apps/versions_map | 3 ++- packages/apps/virtual-machine/Chart.yaml | 2 +- packages/apps/virtual-machine/templates/vm.yaml | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/apps/gen_versions_map.sh b/packages/apps/gen_versions_map.sh index 541291da..70e7dae2 100755 --- a/packages/apps/gen_versions_map.sh +++ b/packages/apps/gen_versions_map.sh @@ -20,8 +20,8 @@ miss_map=$(echo "$new_map" | awk 'NR==FNR { new_map[$1 " " $2] = $3; next } { if resolved_miss_map=$( echo "$miss_map" | while read chart version commit; do if [ "$commit" = HEAD ]; then - line=$(awk '/^version:/ {print NR; exit}' "$chart/Chart.yaml") - change_commit=$(git --no-pager blame -L20,+1 "$chart/Chart.yaml" | awk '{print $1}') + line=$(git show HEAD:"$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') + change_commit=$(git --no-pager blame -L20,+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') commit=$(git describe --always "$change_commit~1") fi echo "$chart $version $commit" diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 9af515d0..3497e09f 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -7,5 +7,6 @@ rabbitmq 0.1.0 HEAD redis 0.1.0 HEAD tcp-balancer 0.1.0 HEAD virtual-machine 0.1.3 be43e42 -virtual-machine 0.1.4 HEAD +virtual-machine 0.1.4 f2015d6 +virtual-machine 0.1.5 HEAD vpn 0.1.0 HEAD diff --git a/packages/apps/virtual-machine/Chart.yaml b/packages/apps/virtual-machine/Chart.yaml index e6ba3c81..cbee4502 100644 --- a/packages/apps/virtual-machine/Chart.yaml +++ b/packages/apps/virtual-machine/Chart.yaml @@ -17,7 +17,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.1.4 +version: 0.1.5 # 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/virtual-machine/templates/vm.yaml b/packages/apps/virtual-machine/templates/vm.yaml index bad148be..bf83d73f 100644 --- a/packages/apps/virtual-machine/templates/vm.yaml +++ b/packages/apps/virtual-machine/templates/vm.yaml @@ -5,8 +5,6 @@ metadata: name: {{ include "virtual-machine.fullname" . }} labels: {{- include "virtual-machine.labels" . | nindent 4 }} - annotations: - a: b spec: running: true template: