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

Merge pull request #15275 from felixfriedrich/fix-ipv6-issue-15245 

Fix IPv6 Terraform code generation
This commit is contained in:
Kubernetes Prow Robot 2023-04-12 23:40:36 -07:00 committed by GitHub
parent 7a9277c33f c5847054db
commit 102f0e6f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.additionalobjects-example-com.cidr_block
vpc_id = aws_vpc.additionalobjects-example-com.id
vpc_ipv6_cidr_block = aws_vpc.additionalobjects-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -19,7 +19,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "apiserver_autoscaling_group_ids" {
@ -103,7 +103,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -25,7 +25,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -133,7 +133,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.bastionuserdata-example-com.cidr_block
vpc_id = aws_vpc.bastionuserdata-example-com.id
vpc_ipv6_cidr_block = aws_vpc.bastionuserdata-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.cas-priority-expander-custom-example-com.cidr_block
vpc_id = aws_vpc.cas-priority-expander-custom-example-com.id
vpc_ipv6_cidr_block = aws_vpc.cas-priority-expander-custom-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.cas-priority-expander-example-com.cidr_block
vpc_id = aws_vpc.cas-priority-expander-example-com.id
vpc_ipv6_cidr_block = aws_vpc.cas-priority-expander-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -18,7 +18,7 @@ locals {
vpc_cidr_block = aws_vpc.complex-example-com.cidr_block
vpc_id = aws_vpc.complex-example-com.id
vpc_ipv6_cidr_block = aws_vpc.complex-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -98,7 +98,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.compress-example-com.cidr_block
vpc_id = aws_vpc.compress-example-com.id
vpc_ipv6_cidr_block = aws_vpc.compress-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.containerd-example-com.cidr_block
vpc_id = aws_vpc.containerd-example-com.id
vpc_ipv6_cidr_block = aws_vpc.containerd-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.containerd-example-com.cidr_block
vpc_id = aws_vpc.containerd-example-com.id
vpc_ipv6_cidr_block = aws_vpc.containerd-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.prefix_123-example-com.cidr_block
vpc_id = aws_vpc.prefix_123-example-com.id
vpc_ipv6_cidr_block = aws_vpc.prefix_123-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

4
tests/integration/update_cluster/docker-custom/kubernetes.tf
View File

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.docker-example-com.cidr_block
vpc_id = aws_vpc.docker-example-com.id
vpc_ipv6_cidr_block = aws_vpc.docker-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -13,7 +13,7 @@ locals {
vpc_cidr_block = aws_vpc.existing-iam-example-com.cidr_block
vpc_id = aws_vpc.existing-iam-example-com.id
vpc_ipv6_cidr_block = aws_vpc.existing-iam-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -73,7 +73,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -17,7 +17,7 @@ locals {
vpc_cidr_block = aws_vpc.existingsg-example-com.cidr_block
vpc_id = aws_vpc.existingsg-example-com.id
vpc_ipv6_cidr_block = aws_vpc.existingsg-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -93,7 +93,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -23,7 +23,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -123,7 +123,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.externallb-example-com.cidr_block
vpc_id = aws_vpc.externallb-example-com.id
vpc_ipv6_cidr_block = aws_vpc.externallb-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.externalpolicies-example-com.cidr_block
vpc_id = aws_vpc.externalpolicies-example-com.id
vpc_ipv6_cidr_block = aws_vpc.externalpolicies-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -17,7 +17,7 @@ locals {
vpc_cidr_block = aws_vpc.ha-example-com.cidr_block
vpc_id = aws_vpc.ha-example-com.id
vpc_ipv6_cidr_block = aws_vpc.ha-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -93,7 +93,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -23,7 +23,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -123,7 +123,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -25,7 +25,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -133,7 +133,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -8,7 +8,7 @@ locals {
vpc_cidr_block = aws_vpc.lifecyclephases-example-com.cidr_block
vpc_id = aws_vpc.lifecyclephases-example-com.id
vpc_ipv6_cidr_block = aws_vpc.lifecyclephases-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -48,7 +48,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -29,7 +29,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -153,7 +153,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -29,7 +29,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -153,7 +153,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -29,7 +29,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -153,7 +153,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -29,7 +29,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -153,7 +153,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -29,7 +29,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -153,7 +153,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

4
tests/integration/update_cluster/minimal-1.23/kubernetes.tf
View File

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-etcd-example-com.cidr_block
vpc_id = aws_vpc.minimal-etcd-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-etcd-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -22,7 +22,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-ipv6-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -118,7 +118,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -22,7 +22,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-ipv6-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -118,7 +118,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -22,7 +22,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-ipv6-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -118,7 +118,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -22,7 +22,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-ipv6-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -118,7 +118,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.this-is-truly-a-really-really-long-cluster-name-minimal-example-com.cidr_block
vpc_id = aws_vpc.this-is-truly-a-really-really-long-cluster-name-minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.this-is-truly-a-really-really-long-cluster-name-minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-warmpool-example-com.cidr_block
vpc_id = aws_vpc.minimal-warmpool-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-warmpool-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-k8s-local.cidr_block
vpc_id = aws_vpc.minimal-k8s-local.id
vpc_ipv6_cidr_block = aws_vpc.minimal-k8s-local.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-k8s-local.cidr_block
vpc_id = aws_vpc.minimal-k8s-local.id
vpc_ipv6_cidr_block = aws_vpc.minimal-k8s-local.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -17,7 +17,7 @@ locals {
vpc_cidr_block = aws_vpc.mixedinstances-example-com.cidr_block
vpc_id = aws_vpc.mixedinstances-example-com.id
vpc_ipv6_cidr_block = aws_vpc.mixedinstances-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -93,7 +93,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -17,7 +17,7 @@ locals {
vpc_cidr_block = aws_vpc.mixedinstances-example-com.cidr_block
vpc_id = aws_vpc.mixedinstances-example-com.id
vpc_ipv6_cidr_block = aws_vpc.mixedinstances-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -93,7 +93,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -25,7 +25,7 @@ locals {
vpc_cidr_block = aws_vpc.nthimdsprocessor-longclustername-example-com.cidr_block
vpc_id = aws_vpc.nthimdsprocessor-longclustername-example-com.id
vpc_ipv6_cidr_block = aws_vpc.nthimdsprocessor-longclustername-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -133,7 +133,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.nthimdsprocessor-longclustername-example-com.cidr_block
vpc_id = aws_vpc.nthimdsprocessor-longclustername-example-com.id
vpc_ipv6_cidr_block = aws_vpc.nthimdsprocessor-longclustername-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = data.aws_vpc.private-shared-ip-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.private-shared-ip-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -20,7 +20,7 @@ locals {
vpc_cidr_block = data.aws_vpc.private-shared-subnet-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.private-shared-subnet-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -108,7 +108,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatecalico-example-com.cidr_block
vpc_id = aws_vpc.privatecalico-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatecalico-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatecanal-example-com.cidr_block
vpc_id = aws_vpc.privatecanal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatecanal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatecilium-example-com.cidr_block
vpc_id = aws_vpc.privatecilium-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatecilium-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatecilium-example-com.cidr_block
vpc_id = aws_vpc.privatecilium-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatecilium-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatecilium-example-com.cidr_block
vpc_id = aws_vpc.privatecilium-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatecilium-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privateciliumadvanced-example-com.cidr_block
vpc_id = aws_vpc.privateciliumadvanced-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privateciliumadvanced-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privatedns1-example-com.cidr_block
vpc_id = aws_vpc.privatedns1-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatedns1-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = data.aws_vpc.privatedns2-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.privatedns2-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privateflannel-example-com.cidr_block
vpc_id = aws_vpc.privateflannel-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privateflannel-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -24,7 +24,7 @@ locals {
vpc_cidr_block = aws_vpc.privatekopeio-example-com.cidr_block
vpc_id = aws_vpc.privatekopeio-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privatekopeio-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -128,7 +128,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = aws_vpc.privateweave-example-com.cidr_block
vpc_id = aws_vpc.privateweave-example-com.id
vpc_ipv6_cidr_block = aws_vpc.privateweave-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -23,7 +23,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -123,7 +123,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = data.aws_vpc.sharedsubnet-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.sharedsubnet-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -15,7 +15,7 @@ locals {
vpc_cidr_block = data.aws_vpc.sharedvpc-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.sharedvpc-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -83,7 +83,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -22,7 +22,7 @@ locals {
vpc_cidr_block = data.aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.minimal-ipv6-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -118,7 +118,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -21,7 +21,7 @@ locals {
vpc_cidr_block = data.aws_vpc.unmanaged-example-com.cidr_block
vpc_id = "vpc-12345678"
vpc_ipv6_cidr_block = data.aws_vpc.unmanaged-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "bastion_autoscaling_group_ids" {
@ -113,7 +113,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

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

@ -17,7 +17,7 @@ locals {
vpc_cidr_block = aws_vpc.minimal-example-com.cidr_block
vpc_id = aws_vpc.minimal-example-com.id
vpc_ipv6_cidr_block = aws_vpc.minimal-example-com.ipv6_cidr_block
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
vpc_ipv6_cidr_length = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
output "cluster_name" {
@ -93,7 +93,7 @@ output "vpc_ipv6_cidr_block" {
}
output "vpc_ipv6_cidr_length" {
value = local.vpc_ipv6_cidr_block == null ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
value = local.vpc_ipv6_cidr_block == "" ? null : tonumber(regex(".*/(\\d+)", local.vpc_ipv6_cidr_block)[0])
}
provider "aws" {

2
upup/pkg/fi/cloudup/awstasks/vpc.go
View File

@ -304,7 +304,7 @@ func (_ *VPC) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *VPC)
cidrPrefixLengthCaptureList,
terraformWriter.LiteralFromIntValue(0),
)
if err := t.AddOutputVariable("vpc_ipv6_cidr_length", terraformWriter.LiteralNullConditionalExpression(
if err := t.AddOutputVariable("vpc_ipv6_cidr_length", terraformWriter.LiteralEmptyStrConditionalExpression(
terraformWriter.LiteralTokens("local", "vpc_ipv6_cidr_block"),
terraformWriter.LiteralFunctionExpression("tonumber", cidrPrefixLengthString),
)); err != nil {

8
upup/pkg/fi/cloudup/terraformWriter/literal.go
View File

@ -140,13 +140,13 @@ func LiteralListExpression(args ...*Literal) *Literal {
}
}
// LiteralNullConditionalExpression constructs a Literal which returns `null`
// if the supplied "nullable" expression is null, otherwise returns "value".
// LiteralEmptyStrConditionalExpression constructs a Literal which returns `null`
// if the supplied "empty" expression is an empty string, otherwise returns "value".
// It is the caller's responsibility to ensure the supplied parameters do not use operators
// with lower precedence than the conditional operator.
func LiteralNullConditionalExpression(nullable, value *Literal) *Literal {
func LiteralEmptyStrConditionalExpression(empty, value *Literal) *Literal {
return &Literal{
String: fmt.Sprintf("%s == null ? null : %s", nullable.String, value.String),
String: fmt.Sprintf("%s == \"\" ? null : %s", empty.String, value.String),
}
}