opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-11 17:27:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman-play-kube template: rename to podman-kube

Browse Source 
With the upcoming plans of introducing a podman-kube command with
various subcommands, rename the podman-play-kube systemd template
to podman-kube before releasing it.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2022-06-30 15:32:03 +02:00
parent 3426d56b92
commit c6fb533ca6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -808,7 +808,7 @@ ifneq (,$(findstring systemd,$(BUILDTAGS)))
PODMAN_UNIT_FILES = contrib/systemd/auto-update/podman-auto-update.service \ PODMAN_UNIT_FILES = contrib/systemd/auto-update/podman-auto-update.service \
contrib/systemd/system/podman.service \ contrib/systemd/system/podman.service \
contrib/systemd/system/podman-restart.service \ contrib/systemd/system/podman-restart.service \
contrib/systemd/system/podman-play-kube@.service contrib/systemd/system/podman-kube@.service
%.service: %.service.in %.service: %.service.in
sed -e 's;@@PODMAN@@;$(BINDIR)/podman;g' $< >$@.tmp.$$ \ sed -e 's;@@PODMAN@@;$(BINDIR)/podman;g' $< >$@.tmp.$$ \
@@ -822,14 +822,14 @@ install.systemd: $(PODMAN_UNIT_FILES)
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${USERSYSTEMDDIR}/podman.socket install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${USERSYSTEMDDIR}/podman.socket
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${USERSYSTEMDDIR}/podman.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${USERSYSTEMDDIR}/podman.service
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-restart.service ${DESTDIR}${USERSYSTEMDDIR}/podman-restart.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-restart.service ${DESTDIR}${USERSYSTEMDDIR}/podman-restart.service
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-play-kube@.service ${DESTDIR}${USERSYSTEMDDIR}/podman-play-kube@.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-kube@.service ${DESTDIR}${USERSYSTEMDDIR}/podman-kube@.service
# System services # System services
install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.service ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.service install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.service ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.service
install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.timer ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.timer install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.timer ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.timer
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${SYSTEMDDIR}/podman.socket install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${SYSTEMDDIR}/podman.socket
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${SYSTEMDDIR}/podman.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${SYSTEMDDIR}/podman.service
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-restart.service ${DESTDIR}${SYSTEMDDIR}/podman-restart.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-restart.service ${DESTDIR}${SYSTEMDDIR}/podman-restart.service
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-play-kube@.service ${DESTDIR}${SYSTEMDDIR}/podman-play-kube@.service install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-kube@.service ${DESTDIR}${SYSTEMDDIR}/podman-kube@.service
rm -f $(PODMAN_UNIT_FILES) rm -f $(PODMAN_UNIT_FILES)
else else
install.systemd: install.systemd:

0
contrib/systemd/system/podman-play-kube@.service.in → contrib/systemd/system/podman-kube@.service.in
View File

4
podman.spec.rpkg
View File

@@ -226,13 +226,13 @@ done
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket %{_unitdir}/%{name}.socket
%{_unitdir}/%{name}-restart.service %{_unitdir}/%{name}-restart.service
%{_unitdir}/%{name}-play-kube@.service %{_unitdir}/%{name}-kube@.service
%{_userunitdir}/%{name}-auto-update.service %{_userunitdir}/%{name}-auto-update.service
%{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}-auto-update.timer
%{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.service
%{_userunitdir}/%{name}.socket %{_userunitdir}/%{name}.socket
%{_userunitdir}/%{name}-restart.service %{_userunitdir}/%{name}-restart.service
%{_userunitdir}/%{name}-play-kube@.service %{_userunitdir}/%{name}-kube@.service
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%if 0%{?fedora} >= 36 %if 0%{?fedora} >= 36
%{_modulesloaddir}/%{name}-iptables.conf %{_modulesloaddir}/%{name}-iptables.conf

6
test/system/250-systemd.bats
View File

@@ -295,12 +295,12 @@ LISTEN_FDNAMES=listen_fdnames" | sort)
run_podman network rm -f $netname run_podman network rm -f $netname
} }
@test "podman-play-kube@.service template" { @test "podman-kube@.service template" {
skip_if_remote "systemd units do not work with remote clients" skip_if_remote "systemd units do not work with remote clients"
# If running from a podman source directory, build and use the source # If running from a podman source directory, build and use the source
# version of the play-kube-@ unit file # version of the play-kube-@ unit file
unit_name="podman-play-kube@.service" unit_name="podman-kube@.service"
unit_file="contrib/systemd/system/${unit_name}" unit_file="contrib/systemd/system/${unit_name}"
if [[ -e ${unit_file}.in ]]; then if [[ -e ${unit_file}.in ]]; then
echo "# [Building & using $unit_name from source]" >&3 echo "# [Building & using $unit_name from source]" >&3
@@ -329,7 +329,7 @@ spec:
EOF EOF
# Dispatch the YAML file # Dispatch the YAML file
service_name="podman-play-kube@$(systemd-escape $yaml_source).service" service_name="podman-kube@$(systemd-escape $yaml_source).service"
systemctl start $service_name systemctl start $service_name
systemctl is-active $service_name systemctl is-active $service_name