From 48030ffe2e007072a85069513dbd74658d79dde3 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Mon, 6 Apr 2026 12:22:35 +0300 Subject: [PATCH] feat: add e2e-minishift Makefile target and workflow job Signed-off-by: Hristo Hristov --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff814eca..b2b2dbe8 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,7 @@ dev-setup: ./charts/capsule || true setup-monitoring: dev-setup-fluxcd + @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/monitoring | envsubst | kubectl apply -f - @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/monitoring/dashboards | kubectl apply -f - @$(MAKE) wait-for-helmreleases @@ -210,7 +211,14 @@ dev-setup-cert-manager: @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/cert-manager | envsubst | kubectl apply -f - dev-setup-fluxcd: - @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/fluxcd | envsubst | kubectl apply -f - + if [ "$$DISTRO" = "openshift" ]; then \ + echo "Running OpenShift"; \ + @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/overlays/openshift | envsubst | kubectl apply -f - + else \ + echo "Other distro"; \ + @$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/fluxcd | envsubst | kubectl apply -f - + fi + # Here to setup the current capsule version @@ -349,6 +357,7 @@ golint-fix: golangci-lint e2e-openshift: ginkgo $(MAKE) e2e-build-openshift && $(MAKE) e2e-exec && $(MAKE) e2e-destroy-openshift e2e-build-openshift: minc + export DISTRO=openshift $(MINC) config set provider docker $(MINC) create $(MINC) status