Skip to content

Commit

Permalink
fix: added replacing system-x-critial replacement
Browse files Browse the repository at this point in the history
- this was added for being able to run the ct install / upgrade behaviour
so that we also can test with that priorityClassName set pods, that normally get a
system-node critial or system-cluster-critical priorityClassName set.
These only will be allowed to run in namespace kube-system and that for
we need to drop the priorityClassName here to null for our tests.
- separated lint and install, as otherwise lint would fail because of the sed changes
- exclude gcp-csi-driver [D2IQ-65765]

[D2IQ-65765]: https://jira.d2iq.com/browse/D2IQ-65765
  • Loading branch information
sebbrandt87 committed Mar 19, 2020
1 parent 6fa3165 commit b1178b8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions test/ct-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ excluded-charts:
- azuredisk-csi-driver # DCOS-62804
- defaultstorageclass # DCOS-62803
- dispatch # DCOS-62802
- gcpdisk-csi-driver # D2IQ-65765
- gcpdiskprovisioner # DCOS-62801
- kommander # DCOS-62800
- kommander-karma # DCOS-62799
Expand Down
12 changes: 11 additions & 1 deletion test/e2e-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ install_dummylb() {
echo
}

replace_priority_class_name_system_x_critical() {
echo 'Replacing priorityClassName: system-X-critical'
grep -rl "priorityClassName: system-" . | xargs sed -i 's/system-.*-critical/null/g'
echo
}

main() {
run_ct_container "$1"
shift
Expand All @@ -141,7 +147,11 @@ main() {
install_dummylb
install_certmanager

docker_exec ct lint-and-install --upgrade --debug "$@"
docker_exec ct lint --debug "$@"

replace_priority_class_name_system_x_critical

docker_exec ct install --upgrade --debug "$@"
echo
}

Expand Down

0 comments on commit b1178b8

Please sign in to comment.