Skip to content

Commit cfd2a1a

Browse files
apeabodyapeabody
committed
feat(TPG)!: require TPGv6
1 parent ef6c1ba commit cfd2a1a

File tree

11 files changed

+43
-45
lines changed

11 files changed

+43
-45
lines changed

‎autogen/main/versions.tf.tmpl‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
27+
version = ">= 6.7.0, < 7"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
31+
version = ">= 6.7.0, < 7"
3232
}
3333
kubernetes = {
3434
source = "hashicorp/kubernetes"
@@ -45,14 +45,12 @@ terraform {
4545
{% elif beta_cluster and autopilot_cluster %}
4646
required_providers {
4747
google = {
48-
source = "hashicorp/google"
49-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
50-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
48+
source = "hashicorp/google"
49+
version = ">= 6.4.0, < 7"
5150
}
5251
google-beta = {
53-
source = "hashicorp/google-beta"
54-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
55-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
52+
source = "hashicorp/google-beta"
53+
version = ">= 6.4.0, < 7"
5654
}
5755
kubernetes = {
5856
source = "hashicorp/kubernetes"
@@ -69,9 +67,8 @@ terraform {
6967
{% elif autopilot_cluster %}
7068
required_providers {
7169
google = {
72-
source = "hashicorp/google"
73-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
74-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
70+
source = "hashicorp/google"
71+
version = ">= 6.4.0, < 7"
7572
}
7673
kubernetes = {
7774
source = "hashicorp/kubernetes"
@@ -89,7 +86,7 @@ terraform {
8986
required_providers {
9087
google = {
9188
source = "hashicorp/google"
92-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
89+
version = ">= 6.7.0, < 7"
9390
}
9491
kubernetes = {
9592
source = "hashicorp/kubernetes"

‎docs/upgrading_to_v35.0.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Upgrading to v35.0
2+
The v35.0 release of *kubernetes-engine* is a backwards incompatible release.
3+
4+
### Google Cloud Platform Provider upgrade
5+
The Terraform Kubernetes Engine Module now requires version 6 of the Google Cloud Platform Providers.

‎modules/beta-autopilot-private-cluster/versions.tf‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,14 +20,12 @@ terraform {
2020

2121
required_providers {
2222
google = {
23-
source = "hashicorp/google"
24-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
23+
source = "hashicorp/google"
24+
version = ">= 6.4.0, < 7"
2625
}
2726
google-beta = {
28-
source = "hashicorp/google-beta"
29-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
27+
source = "hashicorp/google-beta"
28+
version = ">= 6.4.0, < 7"
3129
}
3230
kubernetes = {
3331
source = "hashicorp/kubernetes"

‎modules/beta-autopilot-public-cluster/versions.tf‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,14 +20,12 @@ terraform {
2020

2121
required_providers {
2222
google = {
23-
source = "hashicorp/google"
24-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
23+
source = "hashicorp/google"
24+
version = ">= 6.4.0, < 7"
2625
}
2726
google-beta = {
28-
source = "hashicorp/google-beta"
29-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
27+
source = "hashicorp/google-beta"
28+
version = ">= 6.4.0, < 7"
3129
}
3230
kubernetes = {
3331
source = "hashicorp/kubernetes"

‎modules/beta-private-cluster-update-variant/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
28+
version = ">= 6.7.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-private-cluster/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
28+
version = ">= 6.7.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-public-cluster-update-variant/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
28+
version = ">= 6.7.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-public-cluster/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
28+
version = ">= 6.7.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/private-cluster-update-variant/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

‎modules/private-cluster/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022 Google LLC
2+
* Copyright 2022-2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 5.44.2, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0, !=6.4.0, !=6.5.0, !=6.6.0, < 7"
24+
version = ">= 6.7.0, < 7"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

0 commit comments

Comments
 (0)