Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

terraform: update aws, azure, google providers to latest #2396

Closed
wants to merge 5 commits into from
Closed

terraform: update aws, azure, google providers to latest #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77c8c38
terraform: bump to 0.12.9 version
abhinavdahiya Sep 24, 2019
9fb68d7
terraform: bump vendor to match Gopkg.toml
abhinavdahiya Sep 24, 2019
ac44ec0
terrafom/plugins: update aws, azurerm, google providers to match 0.12…
abhinavdahiya Sep 24, 2019
9e3a665
terraform/plugins: bump vendor to match Gopkg.toml
abhinavdahiya Sep 24, 2019
365dfda
data/azure: fix resources for 1.36 provider
abhinavdahiya Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 0 additions & 2 deletions data/data/azure/bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ data "azurerm_storage_account_sas" "ignition" {
}

resource "azurerm_storage_container" "ignition" {
resource_group_name = var.resource_group_name
name = "ignition"
storage_account_name = var.storage_account.name
container_access_type = "private"
Expand All @@ -49,7 +48,6 @@ resource "local_file" "ignition_bootstrap" {
resource "azurerm_storage_blob" "ignition" {
name = "bootstrap.ign"
source = local_file.ignition_bootstrap.filename
resource_group_name = var.resource_group_name
storage_account_name = var.storage_account.name
storage_container_name = azurerm_storage_container.ignition.name
type = "block"
Expand Down
5 changes: 1 addition & 4 deletions data/data/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,16 @@ resource "azurerm_virtual_network" "cluster_vnet" {
# copy over the vhd to cluster resource group and create an image using that
resource "azurerm_storage_container" "vhd" {
name = "vhd"
resource_group_name = azurerm_resource_group.main.name
storage_account_name = azurerm_storage_account.cluster.name
}

resource "azurerm_storage_blob" "rhcos_image" {
name = "rhcos${random_string.storage_suffix.result}.vhd"
resource_group_name = azurerm_resource_group.main.name
storage_account_name = azurerm_storage_account.cluster.name
storage_container_name = azurerm_storage_container.vhd.name
type = "block"
source_uri = var.azure_image_url
metadata = map("source_uri", "var.azure_image_url")
attempts = 2
metadata = map("source_uri", var.azure_image_url)
}

resource "azurerm_image" "cluster" {
Expand Down
Loading