diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index c70e4ae..aa50bfa 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -11,7 +11,7 @@ permissions: contents: read env: - E2E_NAMESPACE: default + E2E_NAMESPACE: privilegedescalation-dev E2E_RELEASE: headlamp-e2e jobs: diff --git a/deployment/e2e-ci-runner-rbac.yaml b/deployment/e2e-ci-runner-rbac.yaml index d806f6b..ea93cff 100644 --- a/deployment/e2e-ci-runner-rbac.yaml +++ b/deployment/e2e-ci-runner-rbac.yaml @@ -2,9 +2,9 @@ # RBAC for the GitHub Actions CI runner to manage the E2E Headlamp instance. # CI-only test fixture — NOT for production use. # -# Grants the ARC runner service account permissions in the default namespace -# to deploy and tear down a dedicated Headlamp instance via Helm. -# E2E resources run in `default` — nothing persists beyond a test run. +# Grants the ARC runner service account permissions in the privilegedescalation-dev +# namespace to deploy and tear down a dedicated Headlamp instance via Helm. +# E2E resources run in `privilegedescalation-dev` — nothing persists beyond a test run. # # Plugin is loaded via ConfigMap volume mount — no custom Docker images. # @@ -14,7 +14,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: e2e-ci-runner - namespace: default + namespace: privilegedescalation-dev rules: # Helm needs to manage these resources for the Headlamp chart - apiGroups: ["apps"] @@ -22,7 +22,7 @@ rules: verbs: ["get", "list", "create", "update", "patch", "delete", "watch"] - apiGroups: [""] resources: ["services", "serviceaccounts", "configmaps", "secrets"] - verbs: ["get", "list", "create", "update", "patch", "delete"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - apiGroups: [""] resources: ["pods"] verbs: ["get", "list", "watch"] @@ -35,7 +35,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: e2e-ci-runner-binding - namespace: default + namespace: privilegedescalation-dev subjects: - kind: ServiceAccount name: runners-privilegedescalation-gha-rs-no-permission diff --git a/deployment/headlamp-e2e-values.yaml b/deployment/headlamp-e2e-values.yaml index 37d6539..dddd973 100644 --- a/deployment/headlamp-e2e-values.yaml +++ b/deployment/headlamp-e2e-values.yaml @@ -7,7 +7,7 @@ # # Usage: # helm install headlamp-e2e headlamp/headlamp \ -# -n default \ +# -n privilegedescalation-dev \ # -f deployment/headlamp-e2e-values.yaml \ # --set image.registry=ghcr.io \ # --set image.repository=headlamp-k8s/headlamp \ @@ -17,6 +17,9 @@ config: pluginsDir: /headlamp/plugins watchPlugins: false +clusterRoleBinding: + create: false + service: type: ClusterIP diff --git a/scripts/deploy-e2e-headlamp.sh b/scripts/deploy-e2e-headlamp.sh index 08512cc..77378ba 100755 --- a/scripts/deploy-e2e-headlamp.sh +++ b/scripts/deploy-e2e-headlamp.sh @@ -5,8 +5,8 @@ # a ConfigMap volume mount. No custom Docker images — the plugin is built # in CI and injected as a ConfigMap. # -# E2E resources are deployed to the `default` namespace. Nothing persists -# beyond the test run — teardown cleans up all created resources. +# E2E resources are deployed to the `privilegedescalation-dev` namespace. Nothing +# persists beyond the test run — teardown cleans up all created resources. # # Prerequisites: # - Plugin built (dist/ exists with plugin-main.js + package.json) @@ -15,7 +15,7 @@ # - RBAC applied: kubectl apply -f deployment/e2e-ci-runner-rbac.yaml # # Environment: -# E2E_NAMESPACE — namespace for E2E Headlamp (default: default) +# E2E_NAMESPACE — namespace for E2E Headlamp (default: privilegedescalation-dev) # E2E_RELEASE — Helm release name (default: headlamp-e2e) # HEADLAMP_VERSION — Headlamp image tag (default: latest) set -euo pipefail @@ -23,7 +23,7 @@ set -euo pipefail REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)" DIST_DIR="$REPO_ROOT/dist" -E2E_NAMESPACE="${E2E_NAMESPACE:-default}" +E2E_NAMESPACE="${E2E_NAMESPACE:-privilegedescalation-dev}" E2E_RELEASE="${E2E_RELEASE:-headlamp-e2e}" HEADLAMP_VERSION="${HEADLAMP_VERSION:-latest}" @@ -62,7 +62,7 @@ kubectl create configmap headlamp-polaris-plugin \ # --- Deploy with Helm --- echo "" echo "Adding Headlamp Helm repo..." -helm repo add headlamp https://headlamp-k8s.github.io/headlamp/ --force-update +helm repo add headlamp https://kubernetes-sigs.github.io/headlamp/ --force-update helm repo update echo "Installing/upgrading Headlamp E2E instance..." diff --git a/scripts/teardown-e2e-headlamp.sh b/scripts/teardown-e2e-headlamp.sh index b936851..cf310cf 100755 --- a/scripts/teardown-e2e-headlamp.sh +++ b/scripts/teardown-e2e-headlamp.sh @@ -4,13 +4,13 @@ # Tears down the dedicated E2E Headlamp instance deployed by deploy-e2e-headlamp.sh. # # Environment: -# E2E_NAMESPACE — namespace to clean up (default: default) +# E2E_NAMESPACE — namespace to clean up (default: privilegedescalation-dev) # E2E_RELEASE — Helm release to uninstall (default: headlamp-e2e) set -euo pipefail REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)" -E2E_NAMESPACE="${E2E_NAMESPACE:-default}" +E2E_NAMESPACE="${E2E_NAMESPACE:-privilegedescalation-dev}" E2E_RELEASE="${E2E_RELEASE:-headlamp-e2e}" echo "=== E2E Headlamp Teardown ==="