Merge pull request #372 from stackhpc/upstream/2024.1-2025-01-06

Synchronise 2024.1 with upstream

Author: priteau

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 %}
 

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/'