openshift · openshift-merge-robot · Nov 16, 2022 · Nov 16, 2022
diff --git a/...one/provision/cucushift-installer-rehearse-aws-ipi-baselinecaps-none-provision-chain.yaml b/...one/provision/cucushift-installer-rehearse-aws-ipi-baselinecaps-none-provision-chain.yaml
@@ -7,6 +7,12 @@ chain:
   - chain: ipi-install
   - ref: enable-qe-catalogsource
   env:
+    - name: CONTROL_PLANE_INSTANCE_TYPE
+      default: "m6i.xlarge"
+      documentation: "Instance type for control plane nodes"
+    - name: COMPUTE_NODE_TYPE
+      default: "m6i.xlarge"
+      documentation: "Instance type for compute nodes"
     - name: BASELINE_CAPABILITY_SET
       default: "None"
       documentation: |-

diff --git a/...iam-role/provision/cucushift-installer-rehearse-aws-ipi-byo-iam-role-provision-chain.yaml b/...iam-role/provision/cucushift-installer-rehearse-aws-ipi-byo-iam-role-provision-chain.yaml
@@ -6,5 +6,12 @@ chain:
   - ref: ipi-conf-aws-byo-iam-role
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster using BYO IAM role on AWS for QE e2e tests.
diff --git a/...o-route53/provision/cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.yaml b/...o-route53/provision/cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.yaml
@@ -12,5 +12,12 @@ chain:
   - chain: ipi-install
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster using pre created route53 hosted zone on AWS for QE e2e tests.
diff --git a/...earse-aws-ipi-disconnected-private-cco-manual-security-token-service-provision-chain.yaml b/...earse-aws-ipi-disconnected-private-cco-manual-security-token-service-provision-chain.yaml
@@ -20,6 +20,12 @@ chain:
     - ref: enable-qe-catalogsource-disconnected
     - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...nected-private-cco-manual-security-token-service-with-ep-sts-ec2-elb-provision-chain.yaml b/...nected-private-cco-manual-security-token-service-with-ep-sts-ec2-elb-provision-chain.yaml
@@ -21,6 +21,12 @@ chain:
     - ref: enable-qe-catalogsource-disconnected
     - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/.../provision/cucushift-installer-rehearse-aws-ipi-disconnected-private-provision-chain.yaml b/.../provision/cucushift-installer-rehearse-aws-ipi-disconnected-private-provision-chain.yaml
@@ -20,6 +20,12 @@ chain:
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...vision/cucushift-installer-rehearse-aws-ipi-disconnected-private-sdn-provision-chain.yaml b/...vision/cucushift-installer-rehearse-aws-ipi-disconnected-private-sdn-provision-chain.yaml
@@ -21,6 +21,12 @@ chain:
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...nstaller-rehearse-aws-ipi-disconnected-private-sno-baselinecaps-none-provision-chain.yaml b/...nstaller-rehearse-aws-ipi-disconnected-private-sno-baselinecaps-none-provision-chain.yaml
@@ -20,6 +20,12 @@ chain:
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...vision/cucushift-installer-rehearse-aws-ipi-disconnected-private-sno-provision-chain.yaml b/...vision/cucushift-installer-rehearse-aws-ipi-disconnected-private-sno-provision-chain.yaml
@@ -21,6 +21,12 @@ chain:
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...ucushift-installer-rehearse-aws-ipi-disconnected-private-techpreview-provision-chain.yaml b/...ucushift-installer-rehearse-aws-ipi-disconnected-private-techpreview-provision-chain.yaml
@@ -21,6 +21,12 @@ chain:
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ADD_INGRESS_RECORDS_MANUALLY
     default: "yes"
     documentation: "Enable manually create apps dns record."

diff --git a/...rovision/cucushift-installer-rehearse-aws-ipi-ingress-lbtype-classic-provision-chain.yaml b/...rovision/cucushift-installer-rehearse-aws-ipi-ingress-lbtype-classic-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: ingress-aws-conf-lbtype-classic
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with Ingress Classic LB for QE e2e tests.
diff --git a/...lb/provision/cucushift-installer-rehearse-aws-ipi-ingress-lbtype-nlb-provision-chain.yaml b/...lb/provision/cucushift-installer-rehearse-aws-ipi-ingress-lbtype-nlb-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: ingress-aws-conf-lbtype-nlb
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with Ingress NLB for QE e2e tests.
diff --git a/...gress/nlb/provision/cucushift-installer-rehearse-aws-ipi-ingress-nlb-provision-chain.yaml b/...gress/nlb/provision/cucushift-installer-rehearse-aws-ipi-ingress-nlb-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: ingress-aws-nlb-manifest
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with Ingress NLB for QE e2e tests.
diff --git a/...i/localzone/provision/cucushift-installer-rehearse-aws-ipi-localzone-provision-chain.yaml b/...i/localzone/provision/cucushift-installer-rehearse-aws-ipi-localzone-provision-chain.yaml
@@ -16,6 +16,12 @@ chain:
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: ENABLE_AWS_LOCALZONE
     default: "yes"
   - name: LOCALZONE_WORKER_NUMBER

diff --git a/...-cidr/provision/cucushift-installer-rehearse-aws-ipi-ovn-custom-cidr-provision-chain.yaml b/...-cidr/provision/cucushift-installer-rehearse-aws-ipi-ovn-custom-cidr-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: ovn-conf-custom-cidr
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with OVN custom-cidr for QE e2e tests.
diff --git a/...s-nlb/provision/cucushift-installer-rehearse-aws-ipi-ovn-ingress-nlb-provision-chain.yaml b/...s-nlb/provision/cucushift-installer-rehearse-aws-ipi-ovn-ingress-nlb-provision-chain.yaml
@@ -6,5 +6,12 @@ chain:
   - ref: ingress-aws-nlb-manifest
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with OVN and Ingress NLB for QE e2e tests.
diff --git a/...i/ovn/ipsec/provision/cucushift-installer-rehearse-aws-ipi-ovn-ipsec-provision-chain.yaml b/...i/ovn/ipsec/provision/cucushift-installer-rehearse-aws-ipi-ovn-ipsec-provision-chain.yaml
@@ -6,5 +6,12 @@ chain:
   - ref: ovn-conf-ipsec-manifest
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with OVN ipsec for QE e2e tests.
diff --git a/...earse/aws/ipi/ovn/provision/cucushift-installer-rehearse-aws-ipi-ovn-provision-chain.yaml b/...earse/aws/ipi/ovn/provision/cucushift-installer-rehearse-aws-ipi-ovn-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: ovn-conf
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with OVN for QE e2e tests.
diff --git a/...n/sdn2ovn/provision/cucushift-installer-rehearse-aws-ipi-ovn-sdn2ovn-provision-chain.yaml b/...n/sdn2ovn/provision/cucushift-installer-rehearse-aws-ipi-ovn-sdn2ovn-provision-chain.yaml
@@ -6,5 +6,12 @@ chain:
   - chain: ipi-install
   - ref: ovn-sdn-migration  
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on aws with OVN for QE e2e tests.
diff --git a/...installer-rehearse-aws-ipi-private-cco-manual-security-token-service-provision-chain.yaml b/...installer-rehearse-aws-ipi-private-cco-manual-security-token-service-provision-chain.yaml
@@ -16,6 +16,12 @@ chain:
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: PUBLISH
     default: "Internal"
     documentation: "Cluster publish strategy."

diff --git a/...sec/provision/cucushift-installer-rehearse-aws-ipi-private-ovn-ipsec-provision-chain.yaml b/...sec/provision/cucushift-installer-rehearse-aws-ipi-private-ovn-ipsec-provision-chain.yaml
@@ -15,6 +15,12 @@ chain:
     - ref: aws-provision-tags-for-byo-vpc
     - ref: enable-qe-catalogsource
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: PUBLISH
     default: "Internal"
     documentation: "Cluster publish strategy."

diff --git a/...s/ipi/private/provision/cucushift-installer-rehearse-aws-ipi-private-provision-chain.yaml b/...s/ipi/private/provision/cucushift-installer-rehearse-aws-ipi-private-provision-chain.yaml
@@ -13,6 +13,12 @@ chain:
     - ref: aws-provision-tags-for-byo-vpc
     - ref: enable-qe-catalogsource
   env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   - name: PUBLISH
     default: "Internal"
     documentation: "Cluster publish strategy."

diff --git a/...ller/rehearse/aws/ipi/provision/cucushift-installer-rehearse-aws-ipi-provision-chain.yaml b/...ller/rehearse/aws/ipi/provision/cucushift-installer-rehearse-aws-ipi-provision-chain.yaml
@@ -4,5 +4,12 @@ chain:
   - chain: ipi-conf-aws
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS for QE e2e tests.
diff --git a/...t-installer-rehearse-aws-ipi-proxy-cco-manual-security-token-service-provision-chain.yaml b/...t-installer-rehearse-aws-ipi-proxy-cco-manual-security-token-service-provision-chain.yaml
@@ -15,5 +15,12 @@ chain:
   - chain: ipi-install
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with security token service for QE e2e tests.
diff --git a/...e/aws/ipi/proxy/provision/cucushift-installer-rehearse-aws-ipi-proxy-provision-chain.yaml b/...e/aws/ipi/proxy/provision/cucushift-installer-rehearse-aws-ipi-proxy-provision-chain.yaml
@@ -12,5 +12,12 @@ chain:
   - chain: ipi-install
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS for QE e2e tests.
diff --git a/...i/proxy/sdn/provision/cucushift-installer-rehearse-aws-ipi-proxy-sdn-provision-chain.yaml b/...i/proxy/sdn/provision/cucushift-installer-rehearse-aws-ipi-proxy-sdn-provision-chain.yaml
@@ -13,5 +13,12 @@ chain:
   - chain: ipi-install
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with SDN for QE e2e tests.
diff --git a/...iew/provision/cucushift-installer-rehearse-aws-ipi-proxy-techpreview-provision-chain.yaml b/...iew/provision/cucushift-installer-rehearse-aws-ipi-proxy-techpreview-provision-chain.yaml
@@ -13,5 +13,12 @@ chain:
   - chain: ipi-install
   - ref: aws-provision-tags-for-byo-vpc
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with feature gate for QE e2e tests. For 4.10 it will only cover ccm, for 4.11 it will cover capi+ccm, if ccm GA in 4.12 then it will only cover capi in 4.12.
diff --git a/...grate/provision/cucushift-installer-rehearse-aws-ipi-sdn-mtu-migrate-provision-chain.yaml b/...grate/provision/cucushift-installer-rehearse-aws-ipi-sdn-mtu-migrate-provision-chain.yaml
@@ -12,5 +12,11 @@ chain:
     default: "400"
   - name: MTU_INCREASE
     default: "200"
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with SDN for QE MTU migration testing and migrate cluster to a decreased MTU and then increased MTU.
diff --git a/...earse/aws/ipi/sdn/provision/cucushift-installer-rehearse-aws-ipi-sdn-provision-chain.yaml b/...earse/aws/ipi/sdn/provision/cucushift-installer-rehearse-aws-ipi-sdn-provision-chain.yaml
@@ -5,5 +5,12 @@ chain:
   - ref: sdn-conf
   - chain: ipi-install
   - ref: enable-qe-catalogsource
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on AWS with SDN for QE e2e tests.
diff --git a/.../provision/cucushift-installer-rehearse-aws-ipi-sdn-sdn2ovn-rollback-provision-chain.yaml b/.../provision/cucushift-installer-rehearse-aws-ipi-sdn-sdn2ovn-rollback-provision-chain.yaml
@@ -7,5 +7,12 @@ chain:
   - ref: enable-qe-catalogsource
   - ref: ovn-sdn-migration
   - ref: ovn-sdn-migration-rollback
+  env:
+  - name: CONTROL_PLANE_INSTANCE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for control plane nodes"
+  - name: COMPUTE_NODE_TYPE
+    default: "m6i.xlarge"
+    documentation: "Instance type for compute nodes"
   documentation: |-
     Create an IPI cluster on aws with SDN and then migration to OVN and then rollback