From 73fd1235c2809717bbf4dd11a821faa623c064a8 Mon Sep 17 00:00:00 2001
From: Laszlo Fogas <laszlo@laszlo.cloud>
Date: Mon, 26 Jul 2021 11:30:01 +0200
Subject: [PATCH] Fixing duplicated annotation; added tests; prepped for bugfix
 release

---
 charts/onechart/Chart.yaml                     |  2 +-
 charts/onechart/templates/ingress.yaml         |  2 +-
 .../onechart/tests/ingress_taxonomy_test.yaml  | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 charts/onechart/tests/ingress_taxonomy_test.yaml

diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
index a7dee97..d8a27f0 100644
--- a/charts/onechart/Chart.yaml
+++ b/charts/onechart/Chart.yaml
@@ -15,4 +15,4 @@ 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.25.0
+version: 0.24.1
diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml
index 140abd7..7ba8953 100644
--- a/charts/onechart/templates/ingress.yaml
+++ b/charts/onechart/templates/ingress.yaml
@@ -22,7 +22,7 @@ metadata:
     gimlet.io/git-sha: {{ .root.Values.gitSha }}
     {{- end }}
     {{- if .root.Values.gitRepository }}
-    gimlet.io/git-sha: {{ .root.Values.gitRepository }}
+    gimlet.io/git-repository: {{ .root.Values.gitRepository }}
     {{- end }}
   {{- end }}
 spec:
diff --git a/charts/onechart/tests/ingress_taxonomy_test.yaml b/charts/onechart/tests/ingress_taxonomy_test.yaml
new file mode 100644
index 0000000..d76fd05
--- /dev/null
+++ b/charts/onechart/tests/ingress_taxonomy_test.yaml
@@ -0,0 +1,18 @@
+suite: test service
+templates:
+  - ingress.yaml
+tests:
+  - it: Should set Gimlet taxonomy on Ingress
+    set:
+      gitRepository: github.com/laszlocph/demo-app
+      gitSha: xyz
+      ingress:
+        host: chart-example.local
+        tlsEnabled: true
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            gimlet.io/git-repository: github.com/laszlocph/demo-app
+            gimlet.io/git-sha: xyz
+