diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:11:48 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:12:29 +0200 |
| commit | 77b92c33f979ad5ae4321a1b3604ce90a99415a1 (patch) | |
| tree | fc7c72debd80e4742a457def77e95923845933fb /docker/zun/zun-cni-daemon/Dockerfile.j2 | |
| parent | 90cfc97e5bea5a4800e46d4af64ca352f561f11c (diff) | |
| download | kolla-77b92c33f979ad5ae4321a1b3604ce90a99415a1.tar.gz kolla-77b92c33f979ad5ae4321a1b3604ce90a99415a1.zip | |
Drop zun and kuryr
Zun is broken in 2026.1, it has been released broken and there are
no reviews on the patch to fix it [1].
[1]: https://review.opendev.org/c/openstack/zun/+/982362
Change-Id: I770b9e62c66f8cc63475d51f80eecacc8415b91f
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/zun/zun-cni-daemon/Dockerfile.j2')
| -rw-r--r-- | docker/zun/zun-cni-daemon/Dockerfile.j2 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 deleted file mode 100644 index 3534f8f3e..000000000 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_cni_daemon_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set zun_cni_daemon_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set zun_cni_daemon_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} - -{% block zun_cni_daemon_version %} -ARG zun_cni_daemon_version=0.7.1 -ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-{{debian_arch}}-v${zun_cni_daemon_version}.tgz -{% endblock %} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers - -RUN chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ - && curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \ - && tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \ - && rm -f /tmp/cni-plugins.tgz - -{{ macros.kolla_patch_sources() }} - -{% block zun_cni_daemon_footer %}{% endblock %} -{% block footer %}{% endblock %} |
