kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15783 from hakman/scale_us-east-2 

Use us-east-2 region for scale tests
This commit is contained in:
Kubernetes Prow Robot 2023-08-15 22:30:27 -07:00 committed by GitHub
parent 2aa8cef1e5 b8594e4c21
commit edf1982d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/e2e/pkg/tester/skip_regex.go
View File

@ -76,6 +76,10 @@ func (t *Tester) setSkipRegexFlag() error {
// https://github.com/cilium/cilium/issues/9207 // https://github.com/cilium/cilium/issues/9207
skipRegex += "|serve.endpoints.on.same.port.and.different.protocols" skipRegex += "|serve.endpoints.on.same.port.and.different.protocols"
if cluster.Spec.LegacyCloudProvider == "gce" {
skipRegex += "|fallback.to.local.terminating.endpoints.when.there.are.no.ready.endpoints.with.externalTrafficPolicy.Local"
}
if isPre28 { if isPre28 {
// These may be fixed in Cilium 1.13 but skipping for now // These may be fixed in Cilium 1.13 but skipping for now
skipRegex += "|Service.with.multiple.ports.specified.in.multiple.EndpointSlices" skipRegex += "|Service.with.multiple.ports.specified.in.multiple.EndpointSlices"

5
tests/e2e/scenarios/scalability/run-test.sh
View File

@ -86,6 +86,7 @@ echo "ADMIN_ACCESS=${ADMIN_ACCESS}"
# cilium does not yet pass conformance tests (shared hostport test) # cilium does not yet pass conformance tests (shared hostport test)
#create_args="--networking cilium" #create_args="--networking cilium"
create_args=() create_args=()
create_args=("--network-cidr=10.0.0.0/16")
create_args+=("--networking=${CNI_PLUGIN:-calico}") create_args+=("--networking=${CNI_PLUGIN:-calico}")
if [[ "${CNI_PLUGIN}" == "amazonvpc" ]]; then if [[ "${CNI_PLUGIN}" == "amazonvpc" ]]; then
create_args+=("--set spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true") create_args+=("--set spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true")
@ -102,9 +103,7 @@ create_args+=("--dns none")
create_args+=("--node-size=c6g.medium") create_args+=("--node-size=c6g.medium")
create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}") create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}")
create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}") create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}")
if [[ -n "${ZONES:-}" ]]; then create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c")
create_args+=("--zones=${ZONES}")
fi
# Enable cluster addons, this enables us to replace the built-in manifest # Enable cluster addons, this enables us to replace the built-in manifest