Skip to content

Commit

Permalink
ROX-25218: Consider 34.118.224.0/20 as a private network in GKE tests (
Browse files Browse the repository at this point in the history
  • Loading branch information
ovalenti authored Jul 16, 2024
1 parent d7b4eda commit 0e6ad94
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion COLLECTOR_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.19.0
3.19.x-11-g789bf657c7
4 changes: 4 additions & 0 deletions deploy/common/k8sbased.sh
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,10 @@ function launch_sensor {
kubectl -n "${sensor_namespace}" set env ds/collector ROX_AFTERGLOW_PERIOD="${ROX_AFTERGLOW_PERIOD}"
fi

if [[ -n "${ROX_NON_AGGREGATED_NETWORKS}" ]]; then
kubectl -n "${sensor_namespace}" set env ds/collector ROX_NON_AGGREGATED_NETWORKS="${ROX_NON_AGGREGATED_NETWORKS}"
fi

# For local installations (e.g. on Colima): hotload binary and update resource requests
if [[ "$(local_dev)" == "true" ]]; then
if [[ "${ROX_HOTRELOAD}" == "true" ]]; then
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ export_test_environment() {
if is_in_PR_context && pr_has_label ci-fail-fast; then
ci_export FAIL_FAST "true"
fi

if [[ "${CI_JOB_NAME}" =~ gke ]]; then
# GKE uses this network for services. Consider it as a private subnet.
ci_export ROX_NON_AGGREGATED_NETWORKS "${ROX_NON_AGGREGATED_NETWORKS:-34.118.224.0/20}"
fi
}

deploy_stackrox_operator() {
Expand Down

0 comments on commit 0e6ad94

Please sign in to comment.