Skip to content

Commit 4aa0478

Browse files
committed
build microshift-topolvm optional RPM
Signed-off-by: Evgeny Slutsky <[email protected]>
1 parent d35ef3c commit 4aa0478

15 files changed

+14659
-11
lines changed

Diff for: Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ PATCH := $(shell echo $(SOURCE_GIT_TAG) | awk -F'[._~-]' '{print $$3}')
3030
SRC_ROOT :=$(shell pwd)
3131

3232
WITH_FLANNEL ?= 0
33+
WITH_TOPOLVM ?= 0
3334
OUTPUT_DIR :=_output
3435
RPM_BUILD_DIR :=$(OUTPUT_DIR)/rpmbuild
3536
CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin
@@ -268,6 +269,7 @@ rpm:
268269
SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
269270
SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
270271
WITH_FLANNEL=${WITH_FLANNEL} \
272+
WITH_TOPOLVM=${WITH_TOPOLVM} \
271273
./packaging/rpm/make-rpm.sh rpm local
272274
.PHONY: rpm
273275

@@ -278,6 +280,7 @@ srpm:
278280
SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
279281
SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
280282
WITH_FLANNEL=${WITH_FLANNEL} \
283+
WITH_TOPOLVM=${WITH_TOPOLVM} \
281284
./packaging/rpm/make-rpm.sh srpm local
282285
.PHONY: srpm
283286

@@ -295,6 +298,7 @@ rpm-podman:
295298
--volume $$(pwd):/opt/microshift:z \
296299
--env TARGET_ARCH=$(TARGET_ARCH) \
297300
--env WITH_FLANNEL=$(WITH_FLANNEL) \
301+
--env WITH_TOPOLVM=$(WITH_TOPOLVM) \
298302
microshift-builder:$(RPM_BUILDER_IMAGE_TAG) \
299303
bash -ilc 'cd /opt/microshift && make rpm & pid=$$! ; \
300304
trap "echo Killing make PID $${pid}; kill $${pid}" INT ; \

Diff for: assets/optional/topolvm/01-namespace.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: topolvm-system
5+
labels:
6+
openshift.io/run-level: "0"
7+
pod-security.kubernetes.io/enforce: privileged
8+
pod-security.kubernetes.io/audit: privileged
9+
pod-security.kubernetes.io/warn: privileged

0 commit comments

Comments
 (0)