diff options
| author | Zuul <zuul@review.opendev.org> | 2024-12-16 16:07:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-12-16 16:07:30 +0000 |
| commit | b1be32617803e2a6c24f449a37622717e2a6d102 (patch) | |
| tree | cf6aa44575e4c378a3cdaffcab19bedede752c3f | |
| parent | 3087808329b1ec8590b4d37f6589a7a74b021846 (diff) | |
| parent | 592f341dd2e90095cfbd704ff7d66535da851d6f (diff) | |
| download | kolla-b1be32617803e2a6c24f449a37622717e2a6d102.tar.gz kolla-b1be32617803e2a6c24f449a37622717e2a6d102.zip | |
Merge "magnum: Add helm binary for magnum-cluster-api"
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/common/sources.py | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 1cec96d27..640cf5d99 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 + {{ macros.kolla_patch_sources() }} {% block magnum_conductor_footer %}{% endblock %} diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 71f741d4e..faaea980a 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -189,6 +189,14 @@ SOURCES = { '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/' |