From 86d6fac7afbb67216726e0f1fe30dd13e1273de7 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 12 Dec 2024 14:57:24 +0000
Subject: [PATCH] magnum: Add helm binary for magnum-cluster-api

Closes-Bug: #2091608

Change-Id: I52105f6cbf7529ce107cabf8a38a10525be7435c
(cherry picked from commit 592f341dd2e90095cfbd704ff7d66535da851d6f)
---
 docker/magnum/magnum-conductor/Dockerfile.j2 | 3 +++
 kolla/common/sources.py                      | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index df266ad5e6..972510246d 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -7,6 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
+ADD plugins-archive /
+RUN cp /plugins/linux-{{ debian_arch }}/helm /usr/local/bin/helm
+
 {% block magnum_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 5ba79d5a3c..a96cd5335c 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -189,6 +189,14 @@
         'type': 'url',
         'location': ('$tarballs_base/openstack/magnum/'
                      'magnum-${openstack_branch}.tar.gz')},
+    'magnum-conductor-plugin-helm': {
+        'version': 'v3.16.3',
+        'type': 'url',
+        'sha256': {
+            'amd64': 'f5355c79190951eed23c5432a3b920e071f4c00a64f75e077de0dd4cb7b294ea',  # noqa: E501
+            'arm64': '5bd34ed774df6914b323ff84a0a156ea6ff2ba1eaf0113962fa773f3f9def798'},  # noqa: E501
+        'location': ('https://get.helm.sh/helm'
+                     '-${version}-linux-${debian_arch}.tar.gz')},
     'manila-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/manila/'