From 229ad3bcdce2e3a2e6647fde6f257b01a4aa2cab Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Wed, 8 Nov 2023 15:45:34 -0800 Subject: [PATCH 1/2] chore: move openshift-multi to RH GCP --- chart/infra-server/static/workflow-openshift-multi.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-multi.yaml b/chart/infra-server/static/workflow-openshift-multi.yaml index d7f90fda6..4c6c57e40 100644 --- a/chart/infra-server/static/workflow-openshift-multi.yaml +++ b/chart/infra-server/static/workflow-openshift-multi.yaml @@ -112,11 +112,12 @@ spec: - "--machine-type={{inputs.parameters.machine-type}}" - "--install-metrics={{inputs.parameters.install-metrics}}" - "--install-monitoring={{inputs.parameters.install-monitoring}}" + - "--gcp-project=acs-team-temp-dev" env: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift + name: openshift-4-gcp-service-account key: google-credentials.json - name: wait @@ -140,5 +141,5 @@ spec: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift + name: openshift-4-gcp-service-account key: google-credentials.json From a0daede1041e7958093b830bc902ff9a8765454e Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Wed, 8 Nov 2023 16:45:22 -0800 Subject: [PATCH 2/2] setup DNS as per OCP 4.x --- chart/infra-server/static/workflow-openshift-multi.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/infra-server/static/workflow-openshift-multi.yaml b/chart/infra-server/static/workflow-openshift-multi.yaml index 4c6c57e40..8f674add2 100644 --- a/chart/infra-server/static/workflow-openshift-multi.yaml +++ b/chart/infra-server/static/workflow-openshift-multi.yaml @@ -113,6 +113,8 @@ spec: - "--install-metrics={{inputs.parameters.install-metrics}}" - "--install-monitoring={{inputs.parameters.install-monitoring}}" - "--gcp-project=acs-team-temp-dev" + - "--dns-project=acs-team-temp-dev" + - "--dns-zone=ocp-infra-rox-systems" env: - name: GOOGLE_CREDENTIALS valueFrom: