mirror of
https://github.com/projectcapsule/capsule.git
synced 2026-04-06 10:47:40 +00:00
Compare commits
12 Commits
copilot/cr
...
copilot/ru
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
772fb2a8c2 | ||
|
|
48030ffe2e | ||
|
|
11f1b13f5b | ||
|
|
8a0bc42776 | ||
|
|
dea77f4dc6 | ||
|
|
ad9bc5a554 | ||
|
|
9ad218a06c | ||
|
|
72dab64be2 | ||
|
|
83fb10d39e | ||
|
|
90905f74d7 | ||
|
|
e3d4f8c4ce | ||
|
|
20ee2e7b01 |
16
.github/workflows/e2e.yml
vendored
16
.github/workflows/e2e.yml
vendored
@@ -65,3 +65,19 @@ jobs:
|
|||||||
|
|
||||||
- name: e2e (Enterprise)
|
- name: e2e (Enterprise)
|
||||||
run: sudo KUBERNETES_SUPPORTED_VERSION=${{ matrix.k8s-version }} make e2e
|
run: sudo KUBERNETES_SUPPORTED_VERSION=${{ matrix.k8s-version }} make e2e
|
||||||
|
e2e-openshift:
|
||||||
|
name: E2E Testing (MINC)
|
||||||
|
runs-on: ubuntu-latest-8-cores
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
|
||||||
|
with:
|
||||||
|
go-version-file: 'go.mod'
|
||||||
|
|
||||||
|
- uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
|
||||||
|
|
||||||
|
- name: e2e
|
||||||
|
run: sudo make e2e-openshift
|
||||||
|
|||||||
27
Makefile
27
Makefile
@@ -189,6 +189,7 @@ dev-setup:
|
|||||||
./charts/capsule || true
|
./charts/capsule || true
|
||||||
|
|
||||||
setup-monitoring: dev-setup-fluxcd
|
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 | envsubst | kubectl apply -f -
|
||||||
@$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/monitoring/dashboards | kubectl apply -f -
|
@$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/monitoring/dashboards | kubectl apply -f -
|
||||||
@$(MAKE) wait-for-helmreleases
|
@$(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 -
|
@$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/cert-manager | envsubst | kubectl apply -f -
|
||||||
|
|
||||||
dev-setup-fluxcd:
|
dev-setup-fluxcd:
|
||||||
|
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 -
|
@$(KUBECTL) kustomize --load-restrictor='LoadRestrictionsNone' hack/distro/fluxcd | envsubst | kubectl apply -f -
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Here to setup the current capsule version
|
# Here to setup the current capsule version
|
||||||
@@ -345,7 +353,19 @@ golint: golangci-lint
|
|||||||
golint-fix: golangci-lint
|
golint-fix: golangci-lint
|
||||||
$(GOLANGCI_LINT) run -c .golangci.yaml --verbose --fix
|
$(GOLANGCI_LINT) run -c .golangci.yaml --verbose --fix
|
||||||
|
|
||||||
|
.PHONY: e2e-openshift
|
||||||
|
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 --disable-overlay-cache true
|
||||||
|
$(MINC) status
|
||||||
|
$(MAKE) dev-install-deps
|
||||||
|
$(MAKE) e2e-install
|
||||||
|
|
||||||
|
e2e-destroy-openshift: minc
|
||||||
|
$(MINC) delete
|
||||||
# Running e2e tests in a KinD instance
|
# Running e2e tests in a KinD instance
|
||||||
.PHONY: e2e
|
.PHONY: e2e
|
||||||
e2e: ginkgo
|
e2e: ginkgo
|
||||||
@@ -472,6 +492,13 @@ ct:
|
|||||||
@test -s $(CT) && $(CT) version | grep -q $(CT_VERSION) || \
|
@test -s $(CT) && $(CT) version | grep -q $(CT_VERSION) || \
|
||||||
$(call go-install-tool,$(CT),github.com/$(CT_LOOKUP)/v3/ct@$(CT_VERSION))
|
$(call go-install-tool,$(CT),github.com/$(CT_LOOKUP)/v3/ct@$(CT_VERSION))
|
||||||
|
|
||||||
|
MINC:= $(LOCALBIN)/minc
|
||||||
|
MINC_VERSION := v0.1.0
|
||||||
|
MINC_LOOKUP := minc-org/minc
|
||||||
|
minc:
|
||||||
|
echo "Installing minc to $(MINC)" && \
|
||||||
|
$(call go-install-tool,$(MINC),github.com/$(MINC_LOOKUP)/cmd/minc@$(MINC_VERSION))
|
||||||
|
|
||||||
KIND := $(LOCALBIN)/kind
|
KIND := $(LOCALBIN)/kind
|
||||||
KIND_VERSION := v0.31.0
|
KIND_VERSION := v0.31.0
|
||||||
KIND_LOOKUP := kubernetes-sigs/kind
|
KIND_LOOKUP := kubernetes-sigs/kind
|
||||||
|
|||||||
35
hack/distro/overlays/openshift/kustomization.yaml
Normal file
35
hack/distro/overlays/openshift/kustomization.yaml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
|
||||||
|
resources:
|
||||||
|
- ../../fluxcd
|
||||||
|
|
||||||
|
patches:
|
||||||
|
- target:
|
||||||
|
kind: Deployment
|
||||||
|
labelSelector: app.kubernetes.io/part-of=flux
|
||||||
|
patch: |
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: not-used-with-target
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
securityContext:
|
||||||
|
$patch: delete
|
||||||
|
containers:
|
||||||
|
- name: manager
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 65534
|
||||||
|
seccompProfile:
|
||||||
|
$patch: delete
|
||||||
|
|
||||||
|
- target:
|
||||||
|
kind: Namespace
|
||||||
|
labelSelector: app.kubernetes.io/part-of=flux
|
||||||
|
patch: |-
|
||||||
|
- op: remove
|
||||||
|
path: /metadata/labels/pod-security.kubernetes.io~1warn
|
||||||
|
- op: remove
|
||||||
|
path: /metadata/labels/pod-security.kubernetes.io~1warn-version
|
||||||
Reference in New Issue
Block a user