Skip to content

Commit 5db004b

Browse files
committed
Fix sonic-ctrmgrd-rs installation for INCLUDE_KUBERNETES condition (sonic-net#23598)
Fix sonic-ctrmgrd-rs installation for INCLUDE_KUBERNETES = y condition. Otherwise the package will not be installed, and the python container wait script will break. Work item tracking Microsoft ADO (number only): 34121264
1 parent fcb751a commit 5db004b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

files/build_templates/sonic_debian_extension.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable systemd-bootchart
530530
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-storage==0.36.0
531531
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3
532532

533+
# sonic-ctrmgrd-rs is required by container script
534+
install_deb_package $debs_path/sonic-ctrmgrd-rs_*.deb
535+
533536
{% if include_kubernetes == "y" %}
534537
# Point to kubelet to /etc/resolv.conf
535538
#
@@ -577,9 +580,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ctrmgrd.service
577580
# kubelet service is controlled by ctrmgrd daemon.
578581
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable kubelet.service
579582
{% else %}
580-
# sonic-ctrmgrd-rs is required by container script
581-
install_deb_package $debs_path/sonic-ctrmgrd-rs_*.deb
582-
583583
# container script for docker commands, which is required as
584584
# all docker commands are replaced with container commands.
585585
# So just copy that file only.

0 commit comments

Comments
 (0)