From fbf093bd24c35df06d33c66ca9519bfba05470d1 Mon Sep 17 00:00:00 2001 From: Thejas N Date: Mon, 25 May 2026 11:58:00 +0530 Subject: [PATCH 1/2] osc: remove unsupported podvm instance types Signed-off-by: Thejas N --- .../sandboxed-containers-operator-peerpods-param-cm-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh index 5efbe820f55cf..e17ec911c4fa3 100755 --- a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh +++ b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh @@ -69,7 +69,7 @@ EOF AWS_SG_IDS: "${AWS_SG_IDS}" VXLAN_PORT: "9000" PODVM_INSTANCE_TYPE: "t3.medium" - PODVM_INSTANCE_TYPES: "t3.small,t3.medium,t3.large,t3.xlarge,g4dn.2xlarge,g5.2xlarge,p3.2xlarge" + PODVM_INSTANCE_TYPES: "t3.small,t3.medium,t3.large,t3.xlarge,g4dn.2xlarge,g5.2xlarge" PROXY_TIMEOUT: "30m" EOF } From f32aa65cf960d903b24546994e7212b8e651689a Mon Sep 17 00:00:00 2001 From: Thejas N Date: Mon, 25 May 2026 11:58:48 +0530 Subject: [PATCH 2/2] osc: make PODVM_INSTANCE_TYPES configurable in peerpods-param-cm step Replace the hardcoded list of AWS instance types with an env var ${PODVM_INSTANCE_TYPES:-} so callers can override it. The default retains all original types except p3.2xlarge, which is not available in all regions. CAA validates all entries at startup, so only types available in the target region should be included. Signed-off-by: Thejas N --- ...boxed-containers-operator-peerpods-param-cm-commands.sh | 2 +- ...andboxed-containers-operator-peerpods-param-cm-ref.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh index e17ec911c4fa3..5e2400096049c 100755 --- a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh +++ b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-commands.sh @@ -69,7 +69,7 @@ EOF AWS_SG_IDS: "${AWS_SG_IDS}" VXLAN_PORT: "9000" PODVM_INSTANCE_TYPE: "t3.medium" - PODVM_INSTANCE_TYPES: "t3.small,t3.medium,t3.large,t3.xlarge,g4dn.2xlarge,g5.2xlarge" + PODVM_INSTANCE_TYPES: "${PODVM_INSTANCE_TYPES}" PROXY_TIMEOUT: "30m" EOF } diff --git a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-ref.yaml b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-ref.yaml index 1d4d44b5bc950..261f745a1fc44 100644 --- a/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-ref.yaml +++ b/ci-operator/step-registry/sandboxed-containers-operator/peerpods/param-cm/sandboxed-containers-operator-peerpods-param-cm-ref.yaml @@ -15,3 +15,10 @@ ref: operator with peer-pods enabled (networking setup, firewall rules, secrets, ...) and generates "peerpods-param-cm.yaml" to be consumed by openshift-tests-private [sig-kata] tests. + - name: PODVM_INSTANCE_TYPES + default: "t3.small,t3.medium,t3.large,t3.xlarge,g4dn.2xlarge,g5.2xlarge" + documentation: |- + Comma-separated list of AWS instance types to populate + PODVM_INSTANCE_TYPES in peerpods-param-cm. CAA validates all + entries at startup so only include types available in the target + region.