Skip to content

Commit 78dcd5a

Browse files
authored
NO-JIRA: pext/aws: get change domain from profile. Fix openshift#64080 (openshift#64346)
1 parent 8a3ad02 commit 78dcd5a

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

ci-operator/step-registry/opct/conformance/external-aws/opct-conformance-external-aws-workflow.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ workflow:
1616
env:
1717
PROVIDER_NAME: aws
1818
PLATFORM_EXTERNAL_CCM_ENABLED: no
19-
BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com
2019
OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.0"
2120
documentation: |-
2221
The OPCT Conformance External E2E workflow executes the common end-to-end test suite using

ci-operator/step-registry/openshift/e2e/external/aws/clusterbot/openshift-e2e-external-aws-clusterbot-workflow.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ workflow:
1111
env:
1212
PROVIDER_NAME: aws
1313
PLATFORM_EXTERNAL_CCM_ENABLED: no
14-
BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com
1514
documentation: |-
1615
The origin E2E workflow to validate clusters installed on AWS with platform type external with clusterbot.

ci-operator/step-registry/openshift/e2e/external/aws/openshift-e2e-external-aws-workflow.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ workflow:
1414
env:
1515
PROVIDER_NAME: aws
1616
PLATFORM_EXTERNAL_CCM_ENABLED: no
17-
BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com
1817
# FIXME: The following test skips must be removed once the issue is fixed.
1918
# HAProxy: https://issues.redhat.com/browse/SPLAT-2089
2019
# [sig-network] LoadBalancers:

ci-operator/step-registry/platform-external/pre/conf/platform-external-pre-conf-commands.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ set -o nounset
44
set -o errexit
55
set -o pipefail
66

7-
echo "Using release image ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
8-
97
#
108
# Enable CCM
119
#
@@ -42,12 +40,22 @@ if [[ "${PLATFORM_EXTERNAL_CCM_ENABLED-}" == "yes" ]]; then
4240
CONFIG_PLATFORM_EXTERNAL_CCM="External"
4341
fi
4442

43+
# Setting the baseDomain from profile or leave the default.
44+
#
45+
if [[ -r "${CLUSTER_PROFILE_DIR}/baseDomain" ]]; then
46+
CLUSTER_BASE_DOMAIN=$(< ${CLUSTER_PROFILE_DIR}/baseDomain)
47+
echo "Using baseDomain from CI Profile, value: ${CLUSTER_BASE_DOMAIN}"
48+
else
49+
CLUSTER_BASE_DOMAIN="${BASE_DOMAIN}"
50+
echo "Using baseDomain from default,value: ${BASE_DOMAIN}"
51+
fi
52+
4553
#
46-
# Render the install-config.yaml
54+
# Patch the install-config.yaml
4755
#
4856
log "Creating install-config.yaml patch"
4957
cat > "${PATCH}" << EOF
50-
baseDomain: ${BASE_DOMAIN}
58+
baseDomain: ${CLUSTER_BASE_DOMAIN}
5159
platform:
5260
external:
5361
platformName: ${PROVIDER_NAME}

ci-operator/step-registry/platform-external/pre/conf/platform-external-pre-conf-ref.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ ref:
88
cpu: 10m
99
memory: 100Mi
1010
documentation: |-
11-
The IPI AWS configure step generates the AWS-specific install-config.yaml contents based on the cluster profile and optional input files.
12-
dependencies:
13-
- name: "release:latest"
14-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
15-
- name: "release:initial"
16-
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
11+
The configure step generates the install-config.yaml for the platform
12+
type External cluster for a standard OpenShift topology.
13+
The contents based on the cluster profile and optional job-level configuration.
1714
env:
1815
- name: PROVIDER_NAME
1916
default: ""
@@ -24,9 +21,11 @@ ref:
2421
documentation: |-
2522
When set to "yes" the CCM parameters will be set in the install-config.yaml.
2623
- name: BASE_DOMAIN
27-
default: ""
24+
default: "origin-ci-int-aws.dev.rhcloud.com"
2825
documentation: |-
29-
A fully-qualified domain or subdomain name. The base domain of the cloud provider is used for setting baseDomain variable of the install configuration of the cluster.
26+
A fully-qualified domain or subdomain name to fallback from cluster-profile.
27+
The base domain of the cloud provider is used for setting baseDomain variable
28+
of the install configuration of the cluster.
3029
- name: PLATFORM_EXTERNAL_OVERRIDE_RELEASE
3130
default: ""
3231
documentation: |-

0 commit comments

Comments
 (0)