Skip to content

cdi: Renaming binaries in the SPEC file to align with upstream naming conventions #12214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharath-srikanth-chellappa merged 1 commit into from
Feb 5, 2025
Merged

cdi: Renaming binaries in the SPEC file to align with upstream naming conventions #12214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-apiserver ] && mv -f /usr/bin/virt-cdi-apiserver /usr/bin/cdi-apiserver

#simple smoke test
RUN ls /usr/bin/cdi-apiserver

Expand Down
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-controller ] && mv -f /usr/bin/virt-cdi-controller /usr/bin/cdi-controller

#simple smoke test
RUN ls /usr/bin/cdi-controller

Expand Down
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-importer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-importer ] && mv -f /usr/bin/virt-cdi-importer /usr/bin/cdi-importer

#simple smoke test
RUN ls /usr/bin/cdi-importer

Expand Down
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-operator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-operator ] && mv -f /usr/bin/virt-cdi-operator /usr/bin/cdi-operator

#simple smoke test
RUN ls /usr/bin/cdi-operator

Expand Down
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-uploadproxy ] && mv -f /usr/bin/virt-cdi-uploadproxy /usr/bin/cdi-uploadproxy

#simple smoke test
RUN ls /usr/bin/cdi-uploadproxy

Expand Down
3 changes: 0 additions & 3 deletions .pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG USER

@INCLUDE_MAIN_RUN_INSTRUCTION@

# workaround till binaries rename is merged
RUN [ -f /usr/bin/virt-cdi-uploadserver ] && mv -f /usr/bin/virt-cdi-uploadserver /usr/bin/cdi-uploadserver

#simple smoke test
RUN ls /usr/bin/cdi-uploadserver

Expand Down
29 changes: 16 additions & 13 deletions SPECS/containerized-data-importer/containerized-data-importer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Summary: Container native virtualization
Name: containerized-data-importer
Version: 1.57.0
Release: 9%{?dist}
Release: 10%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -149,20 +149,20 @@ CGO_ENABLED=0 ./hack/build/build-go.sh build \
%install
mkdir -p %{buildroot}%{_bindir}

install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/virt-cdi-apiserver
install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/cdi-apiserver

install -p -m 0755 cmd/cdi-cloner/cloner_startup.sh %{buildroot}%{_bindir}/
install -p -m 0755 _out/cmd/cdi-cloner/cdi-cloner %{buildroot}%{_bindir}/

install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/virt-cdi-controller
install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/cdi-controller

install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/virt-cdi-importer
install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/cdi-importer

install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/virt-cdi-operator
install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/cdi-operator

install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/virt-cdi-uploadproxy
install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/cdi-uploadproxy

install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/virt-cdi-uploadserver
install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/cdi-uploadserver

install -p -m 0755 _out/tools/cdi-containerimage-server/cdi-containerimage-server %{buildroot}%{_bindir}/cdi-containerimage-server

Expand All @@ -180,7 +180,7 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m
%files api
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-apiserver
%{_bindir}/cdi-apiserver

%files cloner
%license LICENSE
Expand All @@ -191,31 +191,31 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m
%files controller
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-controller
%{_bindir}/cdi-controller

%files importer
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-importer
%{_bindir}/cdi-importer
%{_bindir}/cdi-containerimage-server
%{_bindir}/cdi-image-size-detection
%{_bindir}/cdi-source-update-poller

%files operator
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-operator
%{_bindir}/cdi-operator
%{_bindir}/csv-generator

%files uploadproxy
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-uploadproxy
%{_bindir}/cdi-uploadproxy

%files uploadserver
%license LICENSE
%doc README.md
%{_bindir}/virt-cdi-uploadserver
%{_bindir}/cdi-uploadserver

%files manifests
%license LICENSE
Expand All @@ -226,6 +226,9 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m
%{_datadir}/cdi/manifests

%changelog
* Mon Feb 03 2025 Sharath Srikanth Chellappa <sharathsr@microsoft.com> - 1.57.0-10
- Rename cdi binaries to be inline with upstream.

* Wed Jan 29 2025 Kanishk Bansal <kanbansal@microsoft.com> - 1.57.0-9
- Fix CVE-2024-28180 with an upstream patch

Expand Down