Merge pull request #8433 from neisw/trt-1674-4.17-capi-revert-1

TRT-1674: 4.17 capi revert 1

Author: openshift-merge-bot[bot]

data/data/vsphere/OWNERS

@@ -0,0 +1,7 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+# This file just uses aliases defined in OWNERS_ALIASES.
+
+approvers:
+  - vsphere-approvers
+reviewers:
+  - vsphere-reviewers

data/data/vsphere/bootstrap/main.tf

@@ -0,0 +1,91 @@
+locals {
+  description = "Created By OpenShift Installer"
+  vcenter_key = keys(var.vsphere_vcenters)[0]
+}
+
+provider "vsphere" {
+  user                 = var.vsphere_vcenters[local.vcenter_key].user
+  password             = var.vsphere_vcenters[local.vcenter_key].password
+  vsphere_server       = var.vsphere_vcenters[local.vcenter_key].server
+  allow_unverified_ssl = false
+}
+
+
+data "vsphere_datacenter" "datacenter" {
+  count = 1
+  name  = var.vsphere_control_planes[count.index].workspace.datacenter
+}
+
+data "vsphere_resource_pool" "resource_pool" {
+  count = 1
+  name  = var.vsphere_control_planes[count.index].workspace.resourcePool
+}
+
+data "vsphere_datastore" "datastore" {
+  count         = 1
+  name          = var.vsphere_control_planes[count.index].workspace.datastore
+  datacenter_id = data.vsphere_datacenter.datacenter[count.index].id
+}
+
+data "vsphere_virtual_machine" "template" {
+  count         = 1
+  name          = var.vsphere_control_planes[count.index].template
+  datacenter_id = data.vsphere_datacenter.datacenter[count.index].id
+}
+
+resource "vsphere_virtual_machine" "vm_bootstrap" {
+  count = 1
+
+  name                        = "${var.cluster_id}-bootstrap"
+  resource_pool_id            = data.vsphere_resource_pool.resource_pool[count.index].id
+  datastore_id                = data.vsphere_datastore.datastore[count.index].id
+  num_cpus                    = var.vsphere_control_planes[0].numCPUs
+  num_cores_per_socket        = var.vsphere_control_planes[0].numCoresPerSocket
+  memory                      = var.vsphere_control_planes[0].memoryMiB
+  guest_id                    = data.vsphere_virtual_machine.template[count.index].guest_id
+  folder                      = trimprefix(var.vsphere_control_planes[0].workspace.folder, "/${var.vsphere_control_planes[0].workspace.datacenter}/vm")
+  enable_disk_uuid            = "true"
+  annotation                  = local.description
+  wait_for_guest_net_timeout  = "0"
+  wait_for_guest_net_routable = "false"
+  tags                        = var.tags
+  firmware                    = "efi"
+
+  network_interface {
+    network_id = var.vsphere_control_planes[0].network.devices[0].networkName
+  }
+
+  disk {
+    label = "disk0"
+    size  = var.vsphere_control_planes[0].diskGiB
+
+    eagerly_scrub    = data.vsphere_virtual_machine.template[count.index].disks.0.eagerly_scrub
+    thin_provisioned = data.vsphere_virtual_machine.template[count.index].disks.0.thin_provisioned
+  }
+
+  clone {
+    template_uuid = data.vsphere_virtual_machine.template[count.index].uuid
+  }
+
+  extra_config = merge(
+    {
+      "guestinfo.ignition.config.data"          = base64encode(var.ignition_bootstrap)
+      "guestinfo.ignition.config.data.encoding" = "base64"
+      "guestinfo.hostname"                      = "${var.cluster_id}-bootstrap"
+      "guestinfo.domain"                        = "${var.cluster_domain}"
+      "stealclock.enable"                       = "TRUE"
+    },
+    length(var.vsphere_bootstrap_network_kargs) > 0 ?
+    {
+      "guestinfo.afterburn.initrd.network-kargs" = "${var.vsphere_bootstrap_network_kargs}"
+    } : {}
+  )
+
+  // Potential issues on destroy if disk type changes
+  // underneath terraform.
+  lifecycle {
+    ignore_changes = [
+      disk[0],
+    ]
+  }
+}

data/data/vsphere/bootstrap/outputs.tf

@@ -0,0 +1,7 @@
+output "bootstrap_ip" {
+  value = vsphere_virtual_machine.vm_bootstrap[0].default_ip_address
+}
+
+output "bootstrap_moid" {
+  value = vsphere_virtual_machine.vm_bootstrap[0].moid
+}

data/data/vsphere/bootstrap/variables.tf

@@ -0,0 +1,18 @@
+variable "bootstrap_moid" {
+  type    = string
+  default = ""
+}
+
+variable "control_plane_ips" {
+  type    = list(string)
+  default = []
+}
+
+variable "control_plane_moids" {
+  type    = list(string)
+  default = []
+}
+
+variable "tags" {
+  type = list(any)
+}

data/data/vsphere/master/main.tf

@@ -0,0 +1,82 @@
+locals {
+  description = "Created By OpenShift Installer"
+  vcenter_key = keys(var.vsphere_vcenters)[0]
+}
+
+provider "vsphere" {
+  user                 = var.vsphere_vcenters[local.vcenter_key].user
+  password             = var.vsphere_vcenters[local.vcenter_key].password
+  vsphere_server       = var.vsphere_vcenters[local.vcenter_key].server
+  allow_unverified_ssl = false
+}
+
+data "vsphere_datacenter" "datacenter" {
+  count = var.master_count
+  name  = var.vsphere_control_planes[count.index].workspace.datacenter
+}
+
+data "vsphere_resource_pool" "resource_pool" {
+  count = var.master_count
+  name  = var.vsphere_control_planes[count.index].workspace.resourcePool
+}
+
+data "vsphere_datastore" "datastore" {
+  count         = var.master_count
+  name          = var.vsphere_control_planes[count.index].workspace.datastore
+  datacenter_id = data.vsphere_datacenter.datacenter[count.index].id
+}
+
+data "vsphere_virtual_machine" "template" {
+  count         = var.master_count
+  name          = var.vsphere_control_planes[count.index].template
+  datacenter_id = data.vsphere_datacenter.datacenter[count.index].id
+}
+
+resource "vsphere_virtual_machine" "vm_master" {
+  count = var.master_count
+
+  name                 = "${var.cluster_id}-master-${count.index}"
+  resource_pool_id     = data.vsphere_resource_pool.resource_pool[count.index].id
+  datastore_id         = data.vsphere_datastore.datastore[count.index].id
+  num_cpus             = var.vsphere_control_planes[0].numCPUs
+  num_cores_per_socket = var.vsphere_control_planes[0].numCoresPerSocket
+  memory               = var.vsphere_control_planes[0].memoryMiB
+  folder               = trimprefix(var.vsphere_control_planes[count.index].workspace.folder, "/${var.vsphere_control_planes[count.index].workspace.datacenter}/vm")
+
+  guest_id = data.vsphere_virtual_machine.template[count.index].guest_id
+
+  enable_disk_uuid            = "true"
+  annotation                  = local.description
+  wait_for_guest_net_timeout  = "0"
+  wait_for_guest_net_routable = "false"
+  tags                        = var.tags
+  firmware                    = "efi"
+
+  network_interface {
+    network_id = var.vsphere_control_planes[count.index].network.devices[0].networkName
+  }
+
+  disk {
+    label            = "disk0"
+    size             = var.vsphere_control_planes[0].diskGiB
+    eagerly_scrub    = data.vsphere_virtual_machine.template[count.index].disks.0.eagerly_scrub
+    thin_provisioned = data.vsphere_virtual_machine.template[count.index].disks.0.thin_provisioned
+  }
+
+  clone {
+    template_uuid = data.vsphere_virtual_machine.template[count.index].uuid
+  }
+
+  extra_config = merge(
+    {
+      "guestinfo.ignition.config.data"          = base64encode(var.ignition_master)
+      "guestinfo.ignition.config.data.encoding" = "base64"
+      "guestinfo.hostname"                      = "${var.cluster_id}-master-${count.index}"
+      "stealclock.enable"                       = "TRUE"
+    },
+    length(var.vsphere_control_plane_network_kargs) > 0 ?
+    {
+      "guestinfo.afterburn.initrd.network-kargs" = element(var.vsphere_control_plane_network_kargs, count.index)
+    } : {}
+  )
+}

data/data/vsphere/master/outputs.tf

@@ -0,0 +1,7 @@
+output "control_plane_ips" {
+  value = [for k, v in vsphere_virtual_machine.vm_master : v.default_ip_address]
+}
+
+output "control_plane_moids" {
+  value = [for k, v in vsphere_virtual_machine.vm_master : v.moid]
+}

data/data/vsphere/master/variables.tf

@@ -0,0 +1,8 @@
+variable "bootstrap_moid" {
+  type    = string
+  default = ""
+}
+
+variable "tags" {
+  type = list(any)
+}

data/data/vsphere/pre-bootstrap/main.tf

@@ -0,0 +1,104 @@
+locals {
+  description = "Created By OpenShift Installer"
+  vcenter_key = keys(var.vsphere_vcenters)[0]
+}
+
+provider "vsphere" {
+  user                 = var.vsphere_vcenters[local.vcenter_key].user
+  password             = var.vsphere_vcenters[local.vcenter_key].password
+  vsphere_server       = var.vsphere_vcenters[local.vcenter_key].server
+  allow_unverified_ssl = false
+}
+
+provider "vsphereprivate" {
+  user                 = var.vsphere_vcenters[local.vcenter_key].user
+  password             = var.vsphere_vcenters[local.vcenter_key].password
+  vsphere_server       = var.vsphere_vcenters[local.vcenter_key].server
+  allow_unverified_ssl = false
+}
+
+data "vsphere_datacenter" "datacenter" {
+  for_each = var.vsphere_failure_domain_map
+  name     = var.vsphere_failure_domain_map[each.key].topology.datacenter
+}
+
+data "vsphere_compute_cluster" "cluster" {
+  for_each      = var.vsphere_failure_domain_map
+  name          = var.vsphere_failure_domain_map[each.key].topology.computeCluster
+  datacenter_id = data.vsphere_datacenter.datacenter[each.key].id
+}
+
+data "vsphere_resource_pool" "resource_pool" {
+  for_each = var.vsphere_failure_domain_map
+  name     = var.vsphere_failure_domain_map[each.key].topology.resourcePool
+}
+
+data "vsphere_datastore" "datastore" {
+  for_each      = var.vsphere_failure_domain_map
+  name          = var.vsphere_failure_domain_map[each.key].topology.datastore
+  datacenter_id = data.vsphere_datacenter.datacenter[each.key].id
+}
+
+// Why is there two datacenters?
+// The vm folder object is defined at the datacenter
+// level. Each failure domain has a datacenter folder pair/
+// We need to get only the unique datacenter-folder pair
+// and create those folders. See vsphere.go
+// createDatacenterFolderMap
+
+data "vsphere_datacenter" "folder_datacenter" {
+  for_each = var.vsphere_folders
+  name     = each.value.vsphere_datacenter
+}
+
+resource "vsphere_folder" "folder" {
+  for_each = var.vsphere_folders
+
+  path          = each.value.name
+  type          = "vm"
+  datacenter_id = data.vsphere_datacenter.folder_datacenter[each.key].id
+  tags          = [vsphere_tag.tag.id]
+}
+
+resource "vsphereprivate_import_ova" "import" {
+  for_each = var.vsphere_import_ova_failure_domain_map
+
+  name = format("%s-rhcos-%s-%s", var.cluster_id, var.vsphere_failure_domain_map[each.key].region, var.vsphere_failure_domain_map[each.key].zone)
+
+  filename      = var.vsphere_ova_filepath
+  cluster       = data.vsphere_compute_cluster.cluster[each.key].name
+  resource_pool = data.vsphere_resource_pool.resource_pool[each.key].name
+  datacenter    = data.vsphere_datacenter.datacenter[each.key].name
+  datastore     = data.vsphere_datastore.datastore[each.key].name
+
+  network   = var.vsphere_networks[each.key]
+  folder    = var.vsphere_failure_domain_map[each.key].topology.folder
+  tag       = vsphere_tag.tag.id
+  disk_type = var.vsphere_disk_type
+
+  // Since the folder resource might not be ran because there could be
+  // user defined folder per failure domain if a folder is created
+  // the import resource is not waiting. Adding
+  // this depends_on so the import happens after creating folder(s).
+  depends_on = [vsphere_folder.folder]
+}
+
+resource "vsphere_tag_category" "category" {
+  name        = "openshift-${var.cluster_id}"
+  description = "Added by openshift-install do not remove"
+  cardinality = "SINGLE"
+
+  associable_types = [
+    "VirtualMachine",
+    "ResourcePool",
+    "Folder",
+    "Datastore",
+    "StoragePod"
+  ]
+}
+
+resource "vsphere_tag" "tag" {
+  name        = var.cluster_id
+  category_id = vsphere_tag_category.category.id
+  description = "Added by openshift-install do not remove"
+}

data/data/vsphere/pre-bootstrap/outputs.tf

@@ -0,0 +1,9 @@
+output "cluster_domain" {
+  value = var.cluster_domain
+}
+output "cluster_id" {
+  value = var.cluster_id
+}
+output "tags" {
+  value = [vsphere_tag.tag.id]
+}

data/data/vsphere/variables-vsphere.tf

@@ -0,0 +1,45 @@
+variable "vsphere_disk_type" {
+  type = string
+}
+
+variable "vsphere_vcenters" {
+  type    = map(any)
+  default = {}
+}
+
+variable "vsphere_networks" {
+  type    = map(any)
+  default = {}
+}
+
+variable "vsphere_folders" {
+  type    = map(any)
+  default = {}
+}
+
+variable "vsphere_control_planes" {
+  type    = list(any)
+  default = []
+}
+
+variable "vsphere_ova_filepath" {
+  type        = string
+  description = "This is the filepath to the ova file that will be imported into vSphere."
+}
+variable "vsphere_import_ova_failure_domain_map" {
+  type    = map(any)
+  default = {}
+}
+variable "vsphere_failure_domain_map" {
+  type    = map(any)
+  default = {}
+}
+
+variable "vsphere_control_plane_network_kargs" {
+  type    = list(string)
+  default = []
+}
+
+variable "vsphere_bootstrap_network_kargs" {
+  type = string
+}