Skip to content

ROX-14946: change PSP auto-sensing in e2e tests #6567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johannes94 merged 5 commits into from
Jun 20, 2023
Merged

ROX-14946: change PSP auto-sensing in e2e tests #6567

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16fbdd0
replace PSP k8s version check with kubectl api-resources in e2e tests
johannes94 Jun 19, 2023
a5717e5
fix error code check
johannes94 Jun 19, 2023
c4d2f26
fix typo
johannes94 Jun 19, 2023
a6e0479
fix shell style
johannes94 Jun 20, 2023
61a9316
use common approach to determine PSP support
johannes94 Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions tests/e2e/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,9 @@ setup_generated_certs_for_test() {

setup_podsecuritypolicies_config() {
info "Set POD_SECURITY_POLICIES variable based on kubernetes version"
local version
version=$(kubectl version --output json)
local majorVersion
majorVersion=$(echo "$version" | jq -r .serverVersion.major)
local minorVersion
minorVersion=$(echo "$version" | jq -r .serverVersion.minor)

# PodSecurityPolicy was removed in version 1.25
if (( "$majorVersion" >= 1 && "$minorVersion" >= 25 )); then

SUPPORTS_PSP=$(kubectl api-resources | grep "podsecuritypolicies" -c || true)
if [[ "${SUPPORTS_PSP}" -eq 0 ]]; then
ci_export "POD_SECURITY_POLICIES" "false"
info "POD_SECURITY_POLICIES set to false"
else
Expand Down