Skip to content

vsphere upi: updates for terraform changes#8259

Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
jcpowermac:BZ1819492
Apr 16, 2020
Merged

vsphere upi: updates for terraform changes#8259
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
jcpowermac:BZ1819492

Conversation

@jcpowermac
Copy link
Copy Markdown
Contributor

  • Added new terraform variables required in the recent
    changes in vsphere upi terraform

  • Added an additional run of the registry patch
    in some instances the config is not update properly.

  • vim - autocmd BufWritePre * %s/\s\+$//e removed white space

@jcpowermac
Copy link
Copy Markdown
Contributor Author

This PR can be merged without the changes to the installer:
openshift/installer#3429

@abhinavdahiya
Copy link
Copy Markdown
Contributor

can you separate the remove extra space commit from code changes please.

@abhinavdahiya
Copy link
Copy Markdown
Contributor

Added an additional run of the registry patch
in some instances the config is not update properly.

can you link to the BZ that explains why this change is required, or provide the details in the commit message. Currently it's unclear.

@bparees
Copy link
Copy Markdown
Contributor

bparees commented Apr 9, 2020

/approve

will wait for @abhinavdahiya to lgtm

@abhinavdahiya
Copy link
Copy Markdown
Contributor

Added new terraform variables required in the recent
changes in vsphere upi terraform

this template is used by all releases 4.{1,2,3,4} and master.. so please make sure adding these new variables do not break previous releases.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2020
Cleaning up the extra white space within upi e2e template
- The updates to vsphere terraform require an
additional variable to set the public key the LB rhcos instance
- The changes also include moving ignition to use the virtual machines
extra config in place of vapp which has a limitation of 64kb.
- In testing I witnessed issues with the image registry config
changing after being patched.  Added an additional run of
the function to confirm that it is patched correctly.
@jcpowermac
Copy link
Copy Markdown
Contributor Author

Added new terraform variables required in the recent
changes in vsphere upi terraform

this template is used by all releases 4.{1,2,3,4} and master.. so please make sure adding these new variables do not break previous releases.

I have extra variables in my terraform.tfvars it just seems to warn that they are there.
updated as asked

@jcpowermac
Copy link
Copy Markdown
Contributor Author

/test pj-rehearse

@patrickdillon
Copy link
Copy Markdown
Contributor

LGTM.

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jcpowermac: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/rehearse/openshift/installer/master/e2e-azure-upi 5887615 link /test pj-rehearse
ci/rehearse/openshift/cluster-image-registry-operator/master/e2e-vsphere 5887615 link /test pj-rehearse
ci/rehearse/openshift/cluster-version-operator/master/e2e-aws-upi 5887615 link /test pj-rehearse
ci/prow/pj-rehearse 5887615 link /test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Apr 16, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jcpowermac, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 469b8de into openshift:master Apr 16, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jcpowermac: Updated the following 2 configmaps:

  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci at cluster api.ci using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci at cluster ci/api-build01-ci-devcluster-openshift-com:6443 using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
Details

In response to this:

  • Added new terraform variables required in the recent
    changes in vsphere upi terraform

  • Added an additional run of the registry patch
    in some instances the config is not update properly.

  • vim - autocmd BufWritePre * %s/\s\+$//e removed white space

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants