Skip to content

[fcos] Update UPI to Terraform 0.12.x#3222

Closed
LorbusChris wants to merge 111 commits intoopenshift:fcosfrom
LorbusChris:upi-vsphere-fixup
Closed

[fcos] Update UPI to Terraform 0.12.x#3222
LorbusChris wants to merge 111 commits intoopenshift:fcosfrom
LorbusChris:upi-vsphere-fixup

Conversation

@LorbusChris
Copy link
Copy Markdown
Contributor

@LorbusChris LorbusChris commented Mar 3, 2020

Sync with upi changes from master

Add a new tf template file for NetworkManager keyfiles

/cc @vrutkovs

LorbusChris and others added 30 commits January 20, 2020 07:04
* Fixups for updated Terraform syntax

* Ignition: With the new provider version the Ignition spec
elements are required to be referenced by their `.rendered`
property instead of `.id`

* Azure: Fixes 'Warning: "attempts": [DEPRECATED] Retries are now
handled by the Azure SDK as such this field is no longer
necessary and will be removed in v2.0 of the Azure Provider'
The Terraform-provider bump brought in
hashicorp/terraform-provider-aws@864285b1bb (Tagging for VPC
Endpoints and VPC Endpoint Services, 2019-05-15,
hashicorp/terraform-provider-aws#8674, v2.16.0).

Also wire this into the deleteARN tree.  VPC endpoint ARNs look like:

  arn:aws:ec2:{region}:{account}:vpc-endpoint/vpce-123...
The definition of the Compute Base Path has changed in the Google API  and can't be used for determining Zone and Instance URLs anymore.

This commit hardcodes the correct base path.
A better way to do this should be found in the future to account for changes in the base path.

Old Compute Base Path: https://www.googleapis.com/compute/v1/projects/
New Compute Base Path:  https://compute.googleapis.com/compute/v1/projects/
Unchanged Zone URL: https://www.googleapis.com/compute/v1/projects/project-id/zones/us-central1-a
before proceeding.

In OKD-on-FCOS, the bootstrap host runs FCOS and does not have
the MCD binary included by default. This change gets the binary
and pivots into the machine-os-content payload at an early stage.
…rvice

This simplifies debugging when MCD image is being pulled
OVN attempts to resolve node name to find out its IP, so it cannot be
phoney. OVN, unfortunately, doesn't use search domains, so in order
to join the node CI terraform scripts use node IP as a name
openshift-merge-robot and others added 13 commits April 14, 2020 14:21
[fcos] Update base image to 31.20200323.3.2
The UPI documentation recommends keeping the worker Machineset in case
the user wants to create compute machines via the machine API. However,
the Machineset won't work unless the `image` property is updated to the
user-defined value.

This change adds a recommendation to update the OS image in case the
user wants to use the installer-provisioned Machineset.
Following objects are still present in the cluster, after deletion is
completed:
- Cinder volumes from PVs
- Swift container for image registry (bootstrap container is correctly
  deleted)
The Boostrap Ignition file needs to be edited before it's uploaded.

Before this change, the documentation described the "upload" step before
the "edit" step.
Now if the function fails, we stop the installation immediately,
but it's better to retry several times before finally stopping the
installation.
Signed-off-by: Roy Golan <rgolan@redhat.com>
…ty-operators

[fcos] add a new upstream community operator source
…es and reorg

- Update to terraform 0.12.x
- ipam moved to a module and updated for 0.12
- creation of vsphere objects moved to module
- removal of etcd dns records
- domain dns records separated from creating rhcos node a records
- create load balancer using openshift haproxy image and an additional
rhcos virtual machine
- create dns A record for lb ip and api, api-int, *.apps
- change virtual machine ignition extra config to file path string vs
ignition string.  Simplifies bootstrap and other instance configuration
- Updated Dockerfile CI UPI image for 0.12.24
@LorbusChris LorbusChris force-pushed the upi-vsphere-fixup branch 2 times, most recently from eb6f6fd to 68d2174 Compare April 22, 2020 10:36
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2020
@LorbusChris LorbusChris force-pushed the upi-vsphere-fixup branch 4 times, most recently from d8a1d54 to 85423e7 Compare April 22, 2020 15:41
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2020
@LorbusChris LorbusChris changed the title [fcos] Update UPI to Terraform 0.12.21 [fcos] Update UPI to Terraform 0.12.x Apr 22, 2020
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/test e2e-vsphere

1 similar comment
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/test e2e-vsphere

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

Test name Commit Details Rerun command
ci/prow/e2e-vsphere 17c60fa link /test e2e-vsphere

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.

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. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.