Skip to content
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

USHIFT-4537: introduce topolvm to upstream #4736

Merged
merged 2 commits into from
Apr 8, 2025
Merged

USHIFT-4537: introduce topolvm to upstream #4736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcd630e
shift-week: add examples for using hostpath with upstream
eslutsky Mar 26, 2025
4d042a1
upstream: build microshift-topolvm optional manifests and RPMs
eslutsky Apr 7, 2025
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ PATCH := $(shell echo $(SOURCE_GIT_TAG) | awk -F'[._~-]' '{print $$3}')
SRC_ROOT :=$(shell pwd)

WITH_FLANNEL ?= 0
WITH_TOPOLVM ?= 0
OUTPUT_DIR :=_output
RPM_BUILD_DIR :=$(OUTPUT_DIR)/rpmbuild
CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin
Expand Down Expand Up @@ -268,6 +269,7 @@ rpm:
SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
WITH_FLANNEL=${WITH_FLANNEL} \
WITH_TOPOLVM=${WITH_TOPOLVM} \
./packaging/rpm/make-rpm.sh rpm local
.PHONY: rpm

Expand All @@ -278,6 +280,7 @@ srpm:
SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
WITH_FLANNEL=${WITH_FLANNEL} \
WITH_TOPOLVM=${WITH_TOPOLVM} \
./packaging/rpm/make-rpm.sh srpm local
.PHONY: srpm

Expand All @@ -295,6 +298,7 @@ rpm-podman:
--volume $$(pwd):/opt/microshift:z \
--env TARGET_ARCH=$(TARGET_ARCH) \
--env WITH_FLANNEL=$(WITH_FLANNEL) \
--env WITH_TOPOLVM=$(WITH_TOPOLVM) \
microshift-builder:$(RPM_BUILDER_IMAGE_TAG) \
bash -ilc 'cd /opt/microshift && make rpm & pid=$$! ; \
trap "echo Killing make PID $${pid}; kill $${pid}" INT ; \
Expand Down
9 changes: 9 additions & 0 deletions assets/optional/topolvm/01-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: v1
kind: Namespace
metadata:
name: topolvm-system
labels:
openshift.io/run-level: "0"
pod-security.kubernetes.io/enforce: privileged
pod-security.kubernetes.io/audit: privileged
pod-security.kubernetes.io/warn: privileged
Loading