Skip to content

Commit 39d13eb

Browse files
committed
ci-operator/templates/openshift/installer/cluster-launch-installer-*: Drop *_REGION from teardown
These came in with d00da5d (templates/openshift/installer: Add azure cluster test configuration, 2019-05-23, #3877), but the installer should be extracting the region from metadata.json [1,2]. [1]: https://github.com/openshift/installer/blob/d9a9648cf2330d467cca9f2988846d031464125e/pkg/types/aws/metadata.go#L5 [2]: https://github.com/openshift/installer/blob/d9a9648cf2330d467cca9f2988846d031464125e/pkg/types/azure/metadata.go#L5
1 parent dd17422 commit 39d13eb

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -917,12 +917,8 @@ objects:
917917
value: ${CLUSTER_TYPE}
918918
- name: AWS_SHARED_CREDENTIALS_FILE
919919
value: /etc/openshift-installer/.awscred
920-
- name: AWS_REGION
921-
value: us-east-1
922920
- name: AZURE_AUTH_LOCATION
923921
value: /etc/openshift-installer/osServicePrincipal.json
924-
- name: AZURE_REGION
925-
value: centralus
926922
- name: GOOGLE_CLOUD_KEYFILE_JSON
927923
value: /etc/openshift-installer/gce.json
928924
- name: KUBECONFIG

ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,12 +453,8 @@ objects:
453453
value: ${CLUSTER_TYPE}
454454
- name: AWS_SHARED_CREDENTIALS_FILE
455455
value: /etc/openshift-installer/.awscred
456-
- name: AWS_REGION
457-
value: us-east-1
458456
- name: AZURE_AUTH_LOCATION
459457
value: /etc/openshift-installer/osServicePrincipal.json
460-
- name: AZURE_REGION
461-
value: centralus
462458
- name: GOOGLE_CLOUD_KEYFILE_JSON
463459
value: /etc/openshift-installer/gce.json
464460
- name: KUBECONFIG

0 commit comments

Comments
 (0)