diff --git a/CHANGES.md b/CHANGES.md index cc1f0562..424d17ff 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,10 @@ Notable changes between versions. * Allow arm64 full-cluster or mixed/hybrid cluster with arm64 workers * Requires `flannel` or `cilium` CNI provider +### DigitalOcean + +* Upgrade DigitalOcean Terraform provider to [v2.x](https://registry.terraform.io/providers/digitalocean/digitalocean/latest/docs) ([#1109](https://github.com/poseidon/typhoon/pull/1109)) + ## v1.23.1 * Kubernetes [v1.23.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#v1231) diff --git a/digital-ocean/fedora-coreos/kubernetes/controllers.tf b/digital-ocean/fedora-coreos/kubernetes/controllers.tf index 95d43bac..204d8aab 100644 --- a/digital-ocean/fedora-coreos/kubernetes/controllers.tf +++ b/digital-ocean/fedora-coreos/kubernetes/controllers.tf @@ -41,7 +41,6 @@ resource "digitalocean_droplet" "controllers" { size = var.controller_type # network - private_networking = true vpc_uuid = digitalocean_vpc.network.id # TODO: Only official DigitalOcean images support IPv6 ipv6 = false diff --git a/digital-ocean/fedora-coreos/kubernetes/versions.tf b/digital-ocean/fedora-coreos/kubernetes/versions.tf index a0ad480c..925b7408 100644 --- a/digital-ocean/fedora-coreos/kubernetes/versions.tf +++ b/digital-ocean/fedora-coreos/kubernetes/versions.tf @@ -13,7 +13,7 @@ terraform { digitalocean = { source = "digitalocean/digitalocean" - version = "~> 1.20" + version = ">= 2.12, < 3.0" } } } diff --git a/digital-ocean/fedora-coreos/kubernetes/workers.tf b/digital-ocean/fedora-coreos/kubernetes/workers.tf index f4db41af..da7d71a0 100644 --- a/digital-ocean/fedora-coreos/kubernetes/workers.tf +++ b/digital-ocean/fedora-coreos/kubernetes/workers.tf @@ -37,7 +37,6 @@ resource "digitalocean_droplet" "workers" { size = var.worker_type # network - private_networking = true vpc_uuid = digitalocean_vpc.network.id # TODO: Only official DigitalOcean images support IPv6 ipv6 = false diff --git a/digital-ocean/flatcar-linux/kubernetes/controllers.tf b/digital-ocean/flatcar-linux/kubernetes/controllers.tf index 484bbfd5..526160c3 100644 --- a/digital-ocean/flatcar-linux/kubernetes/controllers.tf +++ b/digital-ocean/flatcar-linux/kubernetes/controllers.tf @@ -46,7 +46,6 @@ resource "digitalocean_droplet" "controllers" { size = var.controller_type # network - private_networking = true vpc_uuid = digitalocean_vpc.network.id # TODO: Only official DigitalOcean images support IPv6 ipv6 = false diff --git a/digital-ocean/flatcar-linux/kubernetes/versions.tf b/digital-ocean/flatcar-linux/kubernetes/versions.tf index a0ad480c..925b7408 100644 --- a/digital-ocean/flatcar-linux/kubernetes/versions.tf +++ b/digital-ocean/flatcar-linux/kubernetes/versions.tf @@ -13,7 +13,7 @@ terraform { digitalocean = { source = "digitalocean/digitalocean" - version = "~> 1.20" + version = ">= 2.12, < 3.0" } } } diff --git a/digital-ocean/flatcar-linux/kubernetes/workers.tf b/digital-ocean/flatcar-linux/kubernetes/workers.tf index c8989809..e6405b9e 100644 --- a/digital-ocean/flatcar-linux/kubernetes/workers.tf +++ b/digital-ocean/flatcar-linux/kubernetes/workers.tf @@ -35,7 +35,6 @@ resource "digitalocean_droplet" "workers" { size = var.worker_type # network - private_networking = true vpc_uuid = digitalocean_vpc.network.id # only official DigitalOcean images support IPv6 ipv6 = local.is_official_image