From ad7b9054ca5ebc53031a10dc3f03675c88845b11 Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Mon, 22 Nov 2021 10:57:43 +0100
Subject: [PATCH] Change kolla_version LABEL to git sha-1

Downstream users are often building their own
custom images from their own forked git.
Reasoning can be various - added fixes not merged yet,
some customizations and etc.

Because of this, it's very usefull to have information
about git commit in images, and this is exactly what
that patch does.

If images are built from pip source, kolla_version
LABEL contains kolla version.

Change-Id: If81989603185528dae86df52e8f8d0f94cdca85d
---
 kolla/image/build.py                                         | 3 ++-
 kolla/version.py                                             | 5 +++++
 .../notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml   | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml

diff --git a/kolla/image/build.py b/kolla/image/build.py
index 999c542757..02188a2b36 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -818,7 +818,8 @@ class KollaWorker(object):
         return ret
 
     def create_dockerfiles(self):
-        kolla_version = version.version_info.cached_version_string()
+        kolla_version = version.git_info if len(version.git_info) != 0 else \
+            version.version_info.cached_version_string()
         supported_distro_name = common_config.DISTRO_PRETTY_NAME.get(
             self.base)
         for path in self.docker_build_paths:
diff --git a/kolla/version.py b/kolla/version.py
index 4430b70c55..edd74a8fbe 100644
--- a/kolla/version.py
+++ b/kolla/version.py
@@ -10,6 +10,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+import pbr.git
 import pbr.version
 
+kolla_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
 version_info = pbr.version.VersionInfo('kolla')
+git_info = pbr.git.get_git_short_sha(git_dir=os.path.join(kolla_path, ".git"))
diff --git a/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml b/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml
new file mode 100644
index 0000000000..9e38d5d5ad
--- /dev/null
+++ b/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Change ``kolla_version`` label to git sha-1 if images
+    are built with kolla from git.