diff --git a/deployment/e2e-ci-runner-rbac.yaml b/deployment/e2e-ci-runner-rbac.yaml index 2ae6bd3..0dd9e97 100644 --- a/deployment/e2e-ci-runner-rbac.yaml +++ b/deployment/e2e-ci-runner-rbac.yaml @@ -1,7 +1,8 @@ --- -# RBAC for the GitHub Actions CI runner to manage the E2E Headlamp instance. +# RBAC for the GitHub Actions CI runner to manage E2E Headlamp instances. # CI-only test fixture — NOT for production use. # +<<<<<<< HEAD # Grants the ARC runner service account permissions in the headlamp-dev # namespace to deploy and tear down a dedicated Headlamp instance via Helm. # E2E resources run in `headlamp-dev` — nothing persists beyond a test run. @@ -43,4 +44,14 @@ subjects: roleRef: kind: Role name: e2e-ci-runner - apiGroup: rbac.authorization.k8s.io \ No newline at end of file + apiGroup: rbac.authorization.k8s.io +======= +# This file is a REFERENCE ONLY. The canonical manifest lives in: +# privilegedescalation/infra/base/rbac/e2e-ci-runner-headlamp-rbac.yaml +# +# The infra repo is managed by Flux GitOps and is the source of truth. +# Do not apply this file directly — it is kept here for developer reference only. +# +# E2E resources run in `privilegedescalation-dev` — nothing persists beyond a test run. +# RBAC is managed via Flux from privilegedescalation/infra — do not apply manually. +>>>>>>> 1f02811 (Reference shared infra RBAC in deployment scripts) diff --git a/scripts/deploy-e2e-headlamp.sh b/scripts/deploy-e2e-headlamp.sh index 8314b7d..4d9696a 100755 --- a/scripts/deploy-e2e-headlamp.sh +++ b/scripts/deploy-e2e-headlamp.sh @@ -11,7 +11,13 @@ # Prerequisites: # - Plugin built (dist/ exists with plugin-main.js + package.json) # - kubectl configured with cluster access +<<<<<<< HEAD # - RBAC applied (managed by Flux GitOps in privilegedescalation/infra) +======= +# RBAC is managed via Flux from privilegedescalation/infra/base/rbac/e2e-ci-runner-headlamp-rbac.yaml. +# The infra repo is the source of truth — do not apply this file directly. +# Apply RBAC first: kubectl apply -f privilegedescalation/infra/base/rbac/e2e-ci-runner-headlamp-rbac.yaml +>>>>>>> 1f02811 (Reference shared infra RBAC in deployment scripts) # # Environment: # E2E_NAMESPACE — namespace for E2E Headlamp (default: headlamp-dev) @@ -35,7 +41,7 @@ fi echo "Checking RBAC permissions in namespace '${E2E_NAMESPACE}'..." if ! kubectl auth can-i delete configmaps -n "$E2E_NAMESPACE" --quiet 2>/dev/null; then echo "ERROR: Missing RBAC — cannot delete configmaps in namespace '${E2E_NAMESPACE}'." >&2 - echo " Apply RBAC first: kubectl apply -f deployment/e2e-ci-runner-rbac.yaml" >&2 + echo " Apply RBAC first: kubectl apply -f privilegedescalation/infra/base/rbac/e2e-ci-runner-headlamp-rbac.yaml" >&2 exit 1 fi diff --git a/scripts/teardown-e2e-headlamp.sh b/scripts/teardown-e2e-headlamp.sh index 00d4f5a..b6685c1 100755 --- a/scripts/teardown-e2e-headlamp.sh +++ b/scripts/teardown-e2e-headlamp.sh @@ -3,6 +3,9 @@ # # Tears down the dedicated E2E Headlamp instance deployed by deploy-e2e-headlamp.sh. # +# RBAC is managed via Flux from privilegedescalation/infra/base/rbac/e2e-ci-runner-headlamp-rbac.yaml. +# The infra repo is the source of truth — do not apply this file directly. +# # Environment: # E2E_NAMESPACE — namespace to clean up (default: headlamp-dev) # E2E_RELEASE — release/resource name prefix (default: headlamp-e2e)