USHIFT-4537: introduce topolvm to upstream #4736

eslutsky · 2025-03-26T15:30:44Z

Which issue(s) this PR addresses:

Closes #

openshift-ci · 2025-03-26T15:31:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eslutsky

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [eslutsky]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: Evgeny Slutsky <[email protected]>

openshift-ci-robot · 2025-04-01T07:45:41Z

@eslutsky: This pull request references USHIFT-4537 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Which issue(s) this PR addresses:

Closes #

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Signed-off-by: Evgeny Slutsky <[email protected]>

eslutsky · 2025-04-03T06:50:02Z

/retest

openshift-ci · 2025-04-03T08:26:55Z

@eslutsky: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-tests-bootc-periodic-arm	`effa5ca`	link	true	`/test e2e-aws-tests-bootc-periodic-arm`
ci/prow/e2e-aws-tests-bootc-periodic	`effa5ca`	link	true	`/test e2e-aws-tests-bootc-periodic`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

pmtk · 2025-04-04T12:43:55Z

packaging/rpm/microshift.spec

+%if %{with_topolvm}
+# topolvm
+install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm
+# Copy all the manifests except the arch specific ones
+install -p -m644 assets/optional/topolvm/0* %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm
+install -p -m644 assets/optional/topolvm/kustomization.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm
+install -p -m644 packaging/topolvm/00-disableDefaultCSI.yaml %{buildroot}%{_sysconfdir}/microshift/config.d/01-disableDefaultCSI.yaml
+
+%endif


Suggested change

%if %{with_topolvm}

# topolvm

install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm

# Copy all the manifests except the arch specific ones

install -p -m644 assets/optional/topolvm/0* %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm

install -p -m644 assets/optional/topolvm/kustomization.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm

install -p -m644 packaging/topolvm/00-disableDefaultCSI.yaml %{buildroot}%{_sysconfdir}/microshift/config.d/01-disableDefaultCSI.yaml

%endif

%if %{with_topolvm}

# topolvm

install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm

install -p -m644 assets/optional/topolvm/*.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/001-microshift-topolvm

install -p -m644 packaging/topolvm/00-disableDefaultCSI.yaml %{buildroot}%{_sysconfdir}/microshift/config.d/01-disableDefaultCSI.yaml

%endif

pmtk · 2025-04-04T12:50:19Z

okd/storage/README.md

+1. prepare the LVM backend on the host (example only)
+    ```bash
+    truncate --size=20G /tmp/lvmdisk
+    losetup -f /tmp/lvmdisk
+    device_name=$(losetup -j /tmp/lvmdisk | cut -d: -f1)
+    vgcreate -f -y myvg1 ${device_name}
+    lvcreate -T myvg1/thinpool -L 6G
+    ```
+1. build microshift with upstream TopoLVM Support


I think we could change the order of these two steps: first build, then prepare lvm, then run the container

pmtk · 2025-04-04T12:50:30Z

okd/storage/README.md

+  ```
+
+
+1. run microshift in OKD and wait for it to be ready


Suggested change

1. run microshift in OKD and wait for it to be ready

1. Run microshift in container and wait for it to be ready

pmtk · 2025-04-04T12:53:03Z

okd/storage/README.md

+    ```bash
+          sudo podman run --privileged --rm --name microshift-okd \
+            --volume /dev:/dev:rslave \
+            --hostname 127.0.0.1.nip.io \


I'm not sure if it's best course of action to use nip.io. Maybe in future we could use container's IP

pmtk · 2025-04-04T12:55:25Z

okd/storage/README.md

+    ```
+1. build microshift with upstream TopoLVM Support
+  ```bash
+  cd ~/microshift && sudo podman build --env WITH_FLANNEL=1 --env WITH_TOPOLVM=1 -f okd/src/microshift-okd-multi-build.Containerfile . -t microshift-okd


I don't like assuming that microshift repo is checked out to ~/microshift (especially that this guide does not contain git clone)

Suggested change

cd ~/microshift && sudo podman build --env WITH_FLANNEL=1 --env WITH_TOPOLVM=1 -f okd/src/microshift-okd-multi-build.Containerfile . -t microshift-okd

sudo podman build --env WITH_FLANNEL=1 --env WITH_TOPOLVM=1 -f okd/src/microshift-okd-multi-build.Containerfile . -t microshift-okd

pmtk · 2025-04-04T13:00:43Z

okd/storage/topolvm/prepare_topolvm_manifests.sh

+ chmod 700 /tmp/get_helm.sh
+ /tmp/get_helm.sh
+
+# TODO: install HELM


Is this still valid TODO?

pmtk · 2025-04-04T13:05:28Z

okd/storage/topolvm/prepare_topolvm_manifests.sh

+
+# patch replicas to 1
+# shellcheck disable=SC2016
+yq e '. | select(.kind == "Deployment") as $deployment | select(.kind != "Deployment") as $other | $deployment.spec.replicas = 1 | ($deployment, $other)' -i manifests/topolvm.yaml


I think this also works

Suggested change

yq e '. | select(.kind == "Deployment") as $deployment | select(.kind != "Deployment") as $other | $deployment.spec.replicas = 1 | ($deployment, $other)' -i manifests/topolvm.yaml

yq 'select(.kind == "Deployment").spec.replicas = 1' -i manifests/topolvm.yaml

pmtk · 2025-04-04T13:12:07Z

okd/storage/README.md

+    truncate --size=20G /tmp/lvmdisk
+    losetup -f /tmp/lvmdisk
+    device_name=$(losetup -j /tmp/lvmdisk | cut -d: -f1)
+    vgcreate -f -y myvg1 ${device_name}
+    lvcreate -T myvg1/thinpool -L 6G


Suggested change

truncate --size=20G /tmp/lvmdisk

losetup -f /tmp/lvmdisk

device_name=$(losetup -j /tmp/lvmdisk | cut -d: -f1)

vgcreate -f -y myvg1 ${device_name}

lvcreate -T myvg1/thinpool -L 6G

truncate --size=20G /tmp/lvmdisk

sudo losetup -f /tmp/lvmdisk

device_name=$(losetup -j /tmp/lvmdisk | cut -d: -f1)

sudo vgcreate -f -y myvg1 ${device_name}

sudo lvcreate -T myvg1/thinpool -L 6G

pmtk · 2025-04-04T13:23:37Z

okd/src/microshift-okd-multi-build.Containerfile

+    fi &&    if [ -n "$WITH_TOPOLVM" ] ; then \
+    dnf install -y microshift-topolvm ; \
+    systemctl disable openvswitch ; \


Suggested change

fi && if [ -n "$WITH_TOPOLVM" ] ; then \

dnf install -y microshift-topolvm ; \

systemctl disable openvswitch ; \

fi && \

if [ -n "$WITH_TOPOLVM" ] ; then \

dnf install -y microshift-topolvm ; \

pmtk · 2025-04-04T13:25:34Z

okd/storage/topolvm/manifests/kustomization.yaml

Do we need these files here? Are they any different from the ones in the assets/optional/topolvm?

openshift-ci bot requested review from agullon and dhensel-rh March 26, 2025 15:31

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2025

shift-week: add examples for using hostpath with upstream

b716736

Signed-off-by: Evgeny Slutsky <[email protected]>

eslutsky force-pushed the okd-storage branch 3 times, most recently from 4251f49 to 1035b88 Compare March 31, 2025 10:30

shift-week: add topolvm upstream manifests

d35ef3c

Signed-off-by: Evgeny Slutsky <[email protected]>

eslutsky force-pushed the okd-storage branch from 1035b88 to d35ef3c Compare March 31, 2025 14:41

eslutsky changed the title ~~shift-week: upstream introduce storage~~ USHIFT-4537: upstream introduce storage Apr 1, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 1, 2025

eslutsky changed the title ~~USHIFT-4537: upstream introduce storage~~ USHIFT-4537: introduce topolvm to upstream Apr 1, 2025

eslutsky force-pushed the okd-storage branch 5 times, most recently from 4aa0478 to 46439f4 Compare April 2, 2025 12:19

build microshift-topolvm optional RPM

effa5ca

Signed-off-by: Evgeny Slutsky <[email protected]>

eslutsky force-pushed the okd-storage branch from 46439f4 to effa5ca Compare April 2, 2025 16:01

pmtk reviewed Apr 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

USHIFT-4537: introduce topolvm to upstream #4736

USHIFT-4537: introduce topolvm to upstream #4736

eslutsky commented Mar 26, 2025

openshift-ci bot commented Mar 26, 2025

openshift-ci-robot commented Apr 1, 2025 •

edited by openshift-ci bot

Loading

eslutsky commented Apr 3, 2025

openshift-ci bot commented Apr 3, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

pmtk Apr 4, 2025

	1. run microshift in OKD and wait for it to be ready
	1. Run microshift in container and wait for it to be ready

	cd ~/microshift && sudo podman build --env WITH_FLANNEL=1 --env WITH_TOPOLVM=1 -f okd/src/microshift-okd-multi-build.Containerfile . -t microshift-okd
	sudo podman build --env WITH_FLANNEL=1 --env WITH_TOPOLVM=1 -f okd/src/microshift-okd-multi-build.Containerfile . -t microshift-okd

	yq e '. \| select(.kind == "Deployment") as $deployment \| select(.kind != "Deployment") as $other \| $deployment.spec.replicas = 1 \| ($deployment, $other)' -i manifests/topolvm.yaml
	yq 'select(.kind == "Deployment").spec.replicas = 1' -i manifests/topolvm.yaml

USHIFT-4537: introduce topolvm to upstream #4736

Are you sure you want to change the base?

USHIFT-4537: introduce topolvm to upstream #4736

Conversation

eslutsky commented Mar 26, 2025

openshift-ci bot commented Mar 26, 2025

openshift-ci-robot commented Apr 1, 2025 • edited by openshift-ci bot Loading

eslutsky commented Apr 3, 2025

openshift-ci bot commented Apr 3, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Apr 1, 2025 •

edited by openshift-ci bot

Loading