Skip to content

Commit b622a1e

Browse files
authored
fix base domain issue (openshift#71092)
1 parent 455c34a commit b622a1e

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installer-rehearse-4.20.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ tests:
9595
allow_skip_on_success: true
9696
cluster_profile: gcp-qe
9797
env:
98-
COMPUTE_SERVICE_ACCOUNT: [email protected]
99-
CONTROL_PLANE_SERVICE_ACCOUNT: [email protected]
100-
GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes"
101-
workflow: cucushift-installer-rehearse-gcp-ipi-xpn-cco-manual-users-static
98+
PRIVATE_ZONE_PROJECT: openshift-qe-regional
99+
workflow: cucushift-installer-rehearse-gcp-ipi-xpn-minimal-permission-byo-hosted-zone-private
102100
- as: installer-rehearse-ibmcloud-dis
103101
cron: '@yearly'
104102
steps:

ci-operator/step-registry/gcp/provision/private-dns-zone/gcp-provision-private-dns-zone-commands.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ fi
2323

2424
CLUSTER_NAME="${NAMESPACE}-${UNIQUE_HASH}"
2525

26-
GCP_BASE_DOMAIN="$(< ${CLUSTER_PROFILE_DIR}/public_hosted_zone)"
27-
if [[ -n "${BASE_DOMAIN}" ]]; then
28-
GCP_BASE_DOMAIN="${BASE_DOMAIN}"
26+
CONFIG="${SHARED_DIR}/install-config.yaml"
27+
GCP_BASE_DOMAIN=$(yq-go r "${CONFIG}" baseDomain)
28+
if [[ "${GCP_BASE_DOMAIN}" == "" ]]; then
29+
echo "ERROR: can not read \"baseDomain\" from install-config.yaml, please check."
30+
exit 1
2931
fi
3032

3133
CLUSTER_PVTZ_PROJECT="${GCP_PROJECT}"

ci-operator/step-registry/gcp/provision/private-dns-zone/gcp-provision-private-dns-zone-ref.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ ref:
1919
default: "yes"
2020
documentation: |-
2121
Whether to pre-create the DNS private zone in the interested project.
22-
- name: BASE_DOMAIN
23-
default: ""
24-
documentation: |-
25-
The base domain.
2622
documentation: |-
27-
The step generates private DNS zone settings.
23+
The step reads baseDomain from '${SHARED_DIR}/install-config.yaml',
24+
and generates private DNS zone settings.

0 commit comments

Comments
 (0)