From 1bf1201360dfd40faaa01165d64b1079ef7261c0 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 1 Sep 2022 14:40:06 -0400 Subject: [PATCH 1/2] USHIFT-19: fix location of example configuration file in RPM Fixes an issue introduced in #914 Related to #663 Signed-off-by: Doug Hellmann --- packaging/microshift/{microshift.yaml => config.yaml} | 0 packaging/rpm/microshift.spec | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename packaging/microshift/{microshift.yaml => config.yaml} (100%) diff --git a/packaging/microshift/microshift.yaml b/packaging/microshift/config.yaml similarity index 100% rename from packaging/microshift/microshift.yaml rename to packaging/microshift/config.yaml diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 01c8babc61..d62c97cd4c 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -164,7 +164,7 @@ install -d -m755 %{buildroot}/%{_unitdir} install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service install -d -m755 %{buildroot}/%{_sysconfdir}/microshift -install -p -m644 packaging/microshift/microshift.yaml %{buildroot}%{_sysconfdir}/microshift/microshift.yaml +install -p -m644 packaging/microshift/config.yaml %{buildroot}%{_sysconfdir}/microshift/config.yaml # Memory tweaks to the OpenvSwitch services mkdir -p -m755 %{buildroot}%{_sysconfdir}/systemd/system/ovs-vswitchd.service.d @@ -233,7 +233,7 @@ systemctl enable --now --quiet openvswitch || true %{_bindir}/cleanup-all-microshift-data %{_unitdir}/microshift.service %{_sysconfdir}/crio/crio.conf.d/microshift.conf -%{_sysconfdir}/microshift/microshift.yaml +%{_sysconfdir}/microshift/config.yaml %files selinux From b0730998df94d61be5f5e292dc17274a217533d7 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 1 Sep 2022 18:46:25 +0000 Subject: [PATCH 2/2] restore example-user-containers.yaml in packaging directory --- packaging/rpm/example-user-containers.yaml | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packaging/rpm/example-user-containers.yaml diff --git a/packaging/rpm/example-user-containers.yaml b/packaging/rpm/example-user-containers.yaml new file mode 100644 index 0000000000..63d7658bd2 --- /dev/null +++ b/packaging/rpm/example-user-containers.yaml @@ -0,0 +1,35 @@ +# The cold replica-rpm containers can be built using paack: +# ./paack.py rpm example-user-containers.yaml fedora-35-aarch64 +packages: + - name: my-application-containers + version: 1.0.0 + release: 2 + license: Apache License 2.0 + summary: Application specific containers + description: | + This package provides a read only storage for the deployed application containers. + url: https://github.com/openshift/microshift + path: /usr/lib/user-app/containers + arch: + - name: x86_64 + image_arch: amd64 + images: + - docker.io/library/nginx:1.21.6 + - name: aarch64 + image_arch: arm64 + images: + - docker.io/library/nginx:1.21.6 + + - name: my-application-manifests + version: 1.0.0 + release: 2 + license: Apache License 2.0 + summary: Application specific manifests + description: | + This package provides a manifests for the deployed application containers. + manifestPath: /usr/lib/microshift/manifests + arch: + - name: x86_64 + manifests: ./example-manifests + - name: aarch64 + manifests: ./example-manifests \ No newline at end of file