From a5a59c1ce10d152c1d0185630c35a68d18790b2c Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:23:07 -0600 Subject: [PATCH 1/7] add eks ipv6 --- chart/infra-server/static/flavors.yaml | 6 ++++++ chart/infra-server/static/workflow-eks.yaml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index e759687bc..578674423 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -812,6 +812,12 @@ value: us-west-2 kind: optional + - name: network + description: Network stack + value: ipv4 + kind: optional + help: Set network stack to ipv4(default) or ipv6 + ##################### # Azure AKS # ##################### diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml index 805b00d39..c649cba72 100644 --- a/chart/infra-server/static/workflow-eks.yaml +++ b/chart/infra-server/static/workflow-eks.yaml @@ -18,6 +18,8 @@ spec: value: "" - name: region value: "" + - name: network + value: "" templates: - name: start @@ -76,6 +78,8 @@ spec: value: "infra" - name: REGION value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' + - name: NETWORK_STACK + value: '{{ "{{" }}workflow.parameters.network{{ "}}" }}' volumeMounts: - name: data From 46db3bf7622e6248b15555d18b9492b9b10a7bc5 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:25:42 -0600 Subject: [PATCH 2/7] add ocp-4 network --- chart/infra-server/static/flavors.yaml | 6 ++++++ chart/infra-server/static/workflow-openshift-4.yaml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 578674423..496d773dd 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -283,6 +283,12 @@ value: us-east1 kind: optional + - name: network + description: Network stack + value: ipv4 + help: Network stack ipv4(default), dual/dual-ipv4-primary, dual-ipv6-primary + kind: optional + - name: fips-enabled description: should fips be enabled value: false diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 74866f881..21b801436 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -22,6 +22,8 @@ spec: - name: worker-node-service-account - name: region value: "" + - name: network + value: "" - name: pull-secret value: "" - name: fips-enabled @@ -151,6 +153,8 @@ spec: value: '{{ "{{" }}workflow.parameters.worker-node-service-account{{ "}}" }}' - name: REGION value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' + - name: NETWORK_STACK + value: '{{ "{{" }}workflow.parameters.network{{ "}}" }}' - name: FIPS_ENABLED value: '{{ "{{" }}workflow.parameters.fips-enabled{{ "}}" }}' - name: INSTALL_HYPERSHIFT From 3a8c1dd1d5d03074a1d6bc57490dbdd1c0c1d32b Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:31:49 -0600 Subject: [PATCH 3/7] add cloud choice --- chart/infra-server/static/flavors.yaml | 10 ++++++++-- chart/infra-server/static/workflow-eks.yaml | 4 ++-- chart/infra-server/static/workflow-openshift-4.yaml | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 496d773dd..e2cb347d9 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -278,12 +278,18 @@ value: openshift-worker-node@acs-team-temp-dev.iam.gserviceaccount.com kind: optional + - name: cloud-provider + description: Cloud provider + value: gcp + kind: optional + help: gcp or aws + - name: region description: Google Cloud region to deploy infrastructure into. value: us-east1 kind: optional - - name: network + - name: network-stack description: Network stack value: ipv4 help: Network stack ipv4(default), dual/dual-ipv4-primary, dual-ipv6-primary @@ -818,7 +824,7 @@ value: us-west-2 kind: optional - - name: network + - name: network-stack description: Network stack value: ipv4 kind: optional diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml index c649cba72..d257ebf7f 100644 --- a/chart/infra-server/static/workflow-eks.yaml +++ b/chart/infra-server/static/workflow-eks.yaml @@ -18,7 +18,7 @@ spec: value: "" - name: region value: "" - - name: network + - name: network-stack value: "" templates: @@ -79,7 +79,7 @@ spec: - name: REGION value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' - name: NETWORK_STACK - value: '{{ "{{" }}workflow.parameters.network{{ "}}" }}' + value: '{{ "{{" }}workflow.parameters.network-stack{{ "}}" }}' volumeMounts: - name: data diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 21b801436..c5bc8065e 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -20,9 +20,11 @@ spec: - name: worker-node-count value: "" - name: worker-node-service-account + - name: cloud-provider + value: "" - name: region value: "" - - name: network + - name: network-stack value: "" - name: pull-secret value: "" @@ -120,6 +122,8 @@ spec: key: google-credentials.json - name: GCP_PROJECT value : "acs-team-temp-dev" + - name: CLOUD_PROVIDER + value: '{{ "{{" }}workflow.parameters.cloud-provider{{ "}}" }}' - name: AWS_ACCESS_KEY_ID valueFrom: secretKeyRef: @@ -154,7 +158,7 @@ spec: - name: REGION value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' - name: NETWORK_STACK - value: '{{ "{{" }}workflow.parameters.network{{ "}}" }}' + value: '{{ "{{" }}workflow.parameters.network-stack{{ "}}" }}' - name: FIPS_ENABLED value: '{{ "{{" }}workflow.parameters.fips-enabled{{ "}}" }}' - name: INSTALL_HYPERSHIFT From 14a4db9233f2fb32bb941792d90f65550fb9d978 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:57:34 -0600 Subject: [PATCH 4/7] ocp perfscale reuses ocp workflow --- chart/infra-server/static/flavors.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index e2cb347d9..db5e3f3ad 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -687,11 +687,23 @@ value: openshift-worker-node@acs-team-temp-dev.iam.gserviceaccount.com kind: optional + - name: cloud-provider + description: Cloud provider + value: gcp + kind: optional + help: gcp or aws + - name: region description: Google Cloud region to deploy infrastructure into. value: us-east1 kind: optional + - name: network-stack + description: Network stack + value: ipv4 + help: Network stack ipv4(default), dual/dual-ipv4-primary, dual-ipv6-primary + kind: optional + - name: fips-enabled description: should fips be enabled value: false From f54d7c09e605c870bf47f31533e518855c5f9ab3 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 20 Oct 2026 11:41:22 -0600 Subject: [PATCH 5/7] empty commit From 593d7ddd310bf3bb1858c1b2adcde947d78667df Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 20 Oct 2026 12:34:04 -0600 Subject: [PATCH 6/7] reuse region for aws --- chart/infra-server/static/flavors.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index db5e3f3ad..507e3cf8b 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -285,7 +285,7 @@ help: gcp or aws - name: region - description: Google Cloud region to deploy infrastructure into. + description: Cloud region to deploy infrastructure into (empty for default). value: us-east1 kind: optional From a1deb797e63eb816624dc4db219b46bdb9b34a9e Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 20 Oct 2026 12:50:35 -0600 Subject: [PATCH 7/7] base-domain --- chart/infra-server/static/flavors.yaml | 10 ++++++++++ chart/infra-server/static/workflow-openshift-4.yaml | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 507e3cf8b..330ce6ea6 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -284,6 +284,11 @@ kind: optional help: gcp or aws + - name: base-domain + description: For gcp use ocp.infra.rox.systems or for aws use aws.dev.rox.systems + value: ocp.infra.rox.systems + kind: optional + - name: region description: Cloud region to deploy infrastructure into (empty for default). value: us-east1 @@ -693,6 +698,11 @@ kind: optional help: gcp or aws + - name: base-domain + description: For gcp use ocp.infra.rox.systems or for aws use aws.dev.rox.systems + value: ocp.infra.rox.systems + kind: optional + - name: region description: Google Cloud region to deploy infrastructure into. value: us-east1 diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index c5bc8065e..f50722991 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -22,6 +22,8 @@ spec: - name: worker-node-service-account - name: cloud-provider value: "" + - name: base-domain + value: "" - name: region value: "" - name: network-stack @@ -113,7 +115,7 @@ spec: args: - create - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - - ocp.infra.rox.systems + - '{{ "{{" }}workflow.parameters.base-domain{{ "}}" }}' env: - name: GOOGLE_CREDENTIALS valueFrom: