kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16237 from hakman/aws_eip-domain 

aws: Use `domain` instead of `vpc` when rendering `aws_eip`
This commit is contained in:
Kubernetes Prow Robot 2024-01-10 05:21:20 +01:00 committed by GitHub
parent c7ad6e9f22 0d85c83154
commit 51b4804bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
83 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/additionalobjects/kubernetes.tf
View File

@ -980,7 +980,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/apiservernodes/kubernetes.tf
View File

@ -1130,7 +1130,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View File

@ -1130,7 +1130,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-bastionuserdata-example-com" {
} }
resource "aws_eip" "us-test-1a-bastionuserdata-example-com" { resource "aws_eip" "us-test-1a-bastionuserdata-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "bastionuserdata.example.com" "KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "us-test-1a.bastionuserdata.example.com" "Name" = "us-test-1a.bastionuserdata.example.com"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned" "kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-bastionuserdata-example-com" { resource "aws_elb" "api-bastionuserdata-example-com" {
@ -1462,7 +1462,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf
View File

@ -1223,7 +1223,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf
View File

@ -1223,7 +1223,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -1391,7 +1391,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/compress/kubernetes.tf
View File

@ -925,7 +925,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/containerd-custom/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/containerd/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/digit/kubernetes.tf
View File

@ -1029,7 +1029,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/existing_iam/kubernetes.tf
View File

@ -1351,7 +1351,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/existing_sg/kubernetes.tf
View File

@ -1789,7 +1789,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/external_dns/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/external_dns_irsa/kubernetes.tf
View File

@ -1086,7 +1086,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -941,7 +941,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/externalpolicies/kubernetes.tf
View File

@ -1174,7 +1174,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -1423,7 +1423,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/ha_gce/kubernetes.tf
View File

@ -819,7 +819,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/irsa/kubernetes.tf
View File

@ -1072,7 +1072,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/karpenter/kubernetes.tf
View File

@ -1298,7 +1298,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf
View File

@ -56,12 +56,12 @@ provider "aws" {
} }
resource "aws_eip" "us-test-1a-lifecyclephases-example-com" { resource "aws_eip" "us-test-1a-lifecyclephases-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "lifecyclephases.example.com" "KubernetesCluster" = "lifecyclephases.example.com"
"Name" = "us-test-1a.lifecyclephases.example.com" "Name" = "us-test-1a.lifecyclephases.example.com"
"kubernetes.io/cluster/lifecyclephases.example.com" = "owned" "kubernetes.io/cluster/lifecyclephases.example.com" = "owned"
} }
vpc = true
} }
resource "aws_internet_gateway" "lifecyclephases-example-com" { resource "aws_internet_gateway" "lifecyclephases-example-com" {
@ -193,7 +193,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf
View File

@ -1199,7 +1199,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf
View File

@ -1207,7 +1207,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf
View File

@ -1207,7 +1207,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf
View File

@ -1207,7 +1207,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-ccm/kubernetes.tf
View File

@ -1009,7 +1009,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/many-addons-gce/kubernetes.tf
View File

@ -599,7 +599,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/many-addons/kubernetes.tf
View File

@ -994,7 +994,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.24/kubernetes.tf
View File

@ -988,7 +988,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.25/kubernetes.tf
View File

@ -988,7 +988,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.26/kubernetes.tf
View File

@ -980,7 +980,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.27/kubernetes.tf
View File

@ -980,7 +980,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.28/kubernetes.tf
View File

@ -980,7 +980,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-1.29/kubernetes.tf
View File

@ -980,7 +980,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-aws/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-dns-none/kubernetes.tf
View File

@ -1141,7 +1141,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-etcd/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-gp3/kubernetes.tf
View File

@ -933,7 +933,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf
View File

@ -366,21 +366,21 @@ resource "aws_egress_only_internet_gateway" "minimal-ipv6-example-com" {
} }
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" { resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
@ -1389,7 +1389,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf
View File

@ -366,21 +366,21 @@ resource "aws_egress_only_internet_gateway" "minimal-ipv6-example-com" {
} }
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" { resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
@ -1380,7 +1380,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf
View File

@ -366,21 +366,21 @@ resource "aws_egress_only_internet_gateway" "minimal-ipv6-example-com" {
} }
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" { resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
@ -1372,7 +1372,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
tests/integration/update_cluster/minimal-ipv6/kubernetes.tf
View File

@ -366,21 +366,21 @@ resource "aws_egress_only_internet_gateway" "minimal-ipv6-example-com" {
} }
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" { resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
@ -1372,7 +1372,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-longclustername/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal-warmpool/kubernetes.tf
View File

@ -957,7 +957,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal_gce/kubernetes.tf
View File

@ -575,7 +575,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
View File

@ -669,7 +669,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf
View File

@ -638,7 +638,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf
View File

@ -638,7 +638,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf
View File

@ -575,7 +575,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
View File

@ -628,7 +628,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
View File

@ -588,7 +588,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
google = { google = {
"source" = "hashicorp/google" "source" = "hashicorp/google"

2
tests/integration/update_cluster/minimal_gossip/kubernetes.tf
View File

@ -937,7 +937,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf
View File

@ -1058,7 +1058,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/minimal_hetzner/kubernetes.tf
View File

@ -311,7 +311,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
hcloud = { hcloud = {
"source" = "hetznercloud/hcloud" "source" = "hetznercloud/hcloud"

2
tests/integration/update_cluster/minimal_scaleway/kubernetes.tf
View File

@ -275,7 +275,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
scaleway = { scaleway = {
"source" = "scaleway/scaleway" "source" = "scaleway/scaleway"

2
tests/integration/update_cluster/mixed_instances/kubernetes.tf
View File

@ -1441,7 +1441,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf
View File

@ -1441,7 +1441,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf
View File

@ -983,7 +983,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/nth-imds-processor/kubernetes.tf
View File

@ -834,7 +834,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/nvidia/kubernetes.tf
View File

@ -953,7 +953,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/private-shared-ip/kubernetes.tf
View File

@ -1412,7 +1412,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -1319,7 +1319,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecalico-example-com" {
} }
resource "aws_eip" "us-test-1a-privatecalico-example-com" { resource "aws_eip" "us-test-1a-privatecalico-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatecalico.example.com" "KubernetesCluster" = "privatecalico.example.com"
"Name" = "us-test-1a.privatecalico.example.com" "Name" = "us-test-1a.privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned" "kubernetes.io/cluster/privatecalico.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatecalico-example-com" { resource "aws_elb" "api-privatecalico-example-com" {
@ -1510,7 +1510,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecanal-example-com" {
} }
resource "aws_eip" "us-test-1a-privatecanal-example-com" { resource "aws_eip" "us-test-1a-privatecanal-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatecanal.example.com" "KubernetesCluster" = "privatecanal.example.com"
"Name" = "us-test-1a.privatecanal.example.com" "Name" = "us-test-1a.privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned" "kubernetes.io/cluster/privatecanal.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatecanal-example-com" { resource "aws_elb" "api-privatecanal-example-com" {
@ -1469,7 +1469,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatecilium-eni/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
} }
resource "aws_eip" "us-test-1a-privatecilium-example-com" { resource "aws_eip" "us-test-1a-privatecilium-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatecilium.example.com" "KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com" "Name" = "us-test-1a.privatecilium.example.com"
"kubernetes.io/cluster/privatecilium.example.com" = "owned" "kubernetes.io/cluster/privatecilium.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatecilium-example-com" { resource "aws_elb" "api-privatecilium-example-com" {
@ -1461,7 +1461,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatecilium/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
} }
resource "aws_eip" "us-test-1a-privatecilium-example-com" { resource "aws_eip" "us-test-1a-privatecilium-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatecilium.example.com" "KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com" "Name" = "us-test-1a.privatecilium.example.com"
"kubernetes.io/cluster/privatecilium.example.com" = "owned" "kubernetes.io/cluster/privatecilium.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatecilium-example-com" { resource "aws_elb" "api-privatecilium-example-com" {
@ -1461,7 +1461,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatecilium2/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecilium-example-com" {
} }
resource "aws_eip" "us-test-1a-privatecilium-example-com" { resource "aws_eip" "us-test-1a-privatecilium-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatecilium.example.com" "KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com" "Name" = "us-test-1a.privatecilium.example.com"
"kubernetes.io/cluster/privatecilium.example.com" = "owned" "kubernetes.io/cluster/privatecilium.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatecilium-example-com" { resource "aws_elb" "api-privatecilium-example-com" {
@ -1477,7 +1477,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf
View File

@ -423,12 +423,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateciliumadvanced-example-co
} }
resource "aws_eip" "us-test-1a-privateciliumadvanced-example-com" { resource "aws_eip" "us-test-1a-privateciliumadvanced-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privateciliumadvanced.example.com" "KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "us-test-1a.privateciliumadvanced.example.com" "Name" = "us-test-1a.privateciliumadvanced.example.com"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privateciliumadvanced-example-com" { resource "aws_elb" "api-privateciliumadvanced-example-com" {
@ -1494,7 +1494,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -448,6 +448,7 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns1-example-com" {
} }
resource "aws_eip" "us-test-1a-privatedns1-example-com" { resource "aws_eip" "us-test-1a-privatedns1-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatedns1.example.com" "KubernetesCluster" = "privatedns1.example.com"
"Name" = "us-test-1a.privatedns1.example.com" "Name" = "us-test-1a.privatedns1.example.com"
@ -455,7 +456,6 @@ resource "aws_eip" "us-test-1a-privatedns1-example-com" {
"foo/bar" = "fib+baz" "foo/bar" = "fib+baz"
"kubernetes.io/cluster/privatedns1.example.com" = "owned" "kubernetes.io/cluster/privatedns1.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatedns1-example-com" { resource "aws_elb" "api-privatedns1-example-com" {
@ -1568,7 +1568,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns2-example-com" {
} }
resource "aws_eip" "us-test-1a-privatedns2-example-com" { resource "aws_eip" "us-test-1a-privatedns2-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privatedns2.example.com" "KubernetesCluster" = "privatedns2.example.com"
"Name" = "us-test-1a.privatedns2.example.com" "Name" = "us-test-1a.privatedns2.example.com"
"kubernetes.io/cluster/privatedns2.example.com" = "owned" "kubernetes.io/cluster/privatedns2.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privatedns2-example-com" { resource "aws_elb" "api-privatedns2-example-com" {
@ -1421,7 +1421,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

4
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -406,12 +406,12 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateflannel-example-com" {
} }
resource "aws_eip" "us-test-1a-privateflannel-example-com" { resource "aws_eip" "us-test-1a-privateflannel-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "privateflannel.example.com" "KubernetesCluster" = "privateflannel.example.com"
"Name" = "us-test-1a.privateflannel.example.com" "Name" = "us-test-1a.privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned" "kubernetes.io/cluster/privateflannel.example.com" = "owned"
} }
vpc = true
} }
resource "aws_elb" "api-privateflannel-example-com" { resource "aws_elb" "api-privateflannel-example-com" {
@ -1469,7 +1469,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -1534,7 +1534,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf
View File

@ -1094,7 +1094,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/shared_subnet/kubernetes.tf
View File

@ -862,7 +862,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -905,7 +905,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf
View File

@ -357,21 +357,21 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-ipv6-example-com" {
} }
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" { resource "aws_eip" "us-test-1b-minimal-ipv6-example-com" {
domain = "vpc"
tags = { tags = {
"KubernetesCluster" = "minimal-ipv6.example.com" "KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned" "kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
} }
vpc = true
} }
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" { resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
@ -1331,7 +1331,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -1405,7 +1405,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
tests/integration/update_cluster/vfs-said/kubernetes.tf
View File

@ -974,7 +974,7 @@ terraform {
aws = { aws = {
"configuration_aliases" = [aws.files] "configuration_aliases" = [aws.files]
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

6
upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go
View File

@ -251,7 +251,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }
@ -325,7 +325,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }
@ -408,7 +408,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

8
upup/pkg/fi/cloudup/awstasks/elastic_ip.go
View File

@ -271,8 +271,8 @@ func (_ *ElasticIP) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *ElasticIP) e
} }
type terraformElasticIP struct { type terraformElasticIP struct {
VPC *bool `cty:"vpc"` Domain *string `cty:"domain"`
Tags map[string]string `cty:"tags"` Tags map[string]string `cty:"tags"`
} }
func (_ *ElasticIP) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ElasticIP) error { func (_ *ElasticIP) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ElasticIP) error {
@ -285,8 +285,8 @@ func (_ *ElasticIP) RenderTerraform(t *terraform.TerraformTarget, a, e, changes
} }
tf := &terraformElasticIP{ tf := &terraformElasticIP{
VPC: aws.Bool(true), Domain: aws.String("vpc"),
Tags: e.Tags, Tags: e.Tags,
} }
return t.RenderResource("aws_eip", *e.Name, tf) return t.RenderResource("aws_eip", *e.Name, tf)

4
upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go
View File

@ -98,7 +98,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }
@ -184,7 +184,7 @@ terraform {
required_providers { required_providers {
aws = { aws = {
"source" = "hashicorp/aws" "source" = "hashicorp/aws"
"version" = ">= 4.0.0" "version" = ">= 5.0.0"
} }
} }
} }

2
upup/pkg/fi/cloudup/terraform/target_hcl2.go
View File

@ -241,7 +241,7 @@ func (t *TerraformTarget) writeTerraform(buf *bytes.Buffer) {
providerVersions := map[string]map[string]string{ providerVersions := map[string]map[string]string{
"aws": { "aws": {
"source": "hashicorp/aws", "source": "hashicorp/aws",
"version": ">= 4.0.0", "version": ">= 5.0.0",
}, },
"google": { "google": {
"source": "hashicorp/google", "source": "hashicorp/google",