github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43624 from liggitt/legacy-abac-test

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43048, 43624, 43649)

Remove E2E_UPGRADE_TEST check in config-test.sh

Once https://github.com/kubernetes/test-infra/pull/2330 merges, the upgrade tests will drive the exact behavior they want, and we can remove the check for envvars leaked from the job env
This commit is contained in:
Kubernetes Submit Queue 2017-03-25 13:29:23 -07:00 committed by GitHub
commit 1251280236
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/gce/config-test.sh
View File

@ -242,15 +242,9 @@ SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"
ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}" ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}"
# Optional: Enable legacy ABAC policy that makes all service accounts superusers. # Optional: Enable legacy ABAC policy that makes all service accounts superusers.
if [[ "${E2E_UPGRADE_TEST:-}" == "true" ]]; then # Disabling this by default in tests ensures default RBAC policies are sufficient from 1.6+
# Enable (match the regular default) when running upgrade tests (E2E_UPGRADE_TEST=true is set by upgrade CI jobs). # Upgrade test jobs that go from a version < 1.6 to a version >= 1.6 should override this to be true.
# This ensures the combination of legacy ABAC and default RBAC policies work properly for upgrade scenarios. ENABLE_LEGACY_ABAC="${ENABLE_LEGACY_ABAC:-false}" # true, false
ENABLE_LEGACY_ABAC="${ENABLE_LEGACY_ABAC:-true}" # true, false
else
# Disable by default when running regular e2e tests.
# This ensures default RBAC policies alone are sufficient for e2e tests from 1.6+
ENABLE_LEGACY_ABAC="${ENABLE_LEGACY_ABAC:-false}" # true, false
fi
# TODO(dawn1107): Remove this once the flag is built into CVM image. # TODO(dawn1107): Remove this once the flag is built into CVM image.
# Kernel panic upon soft lockup issue # Kernel panic upon soft lockup issue