Skip to content

Commit

Permalink
feat!: K8s provider upgrade (#892)
Browse files Browse the repository at this point in the history 
* Update kubernetes provider to ~> 2.0

* Remove interpolation-only expressions to make docker_test_lint happy

Co-authored-by: Bharath KKB <[email protected]>
  • Loading branch information
@pib @bharathkkb
pib and bharathkkb authored May 17, 2021
1 parent 23da103 commit 9172b3e
Show file tree
Hide file tree
Showing 46 changed files with 13 additions and 50 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion autogen/main/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
4 changes: 2 additions & 2 deletions autogen/main/versions.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google-beta" {
Expand All @@ -42,7 +42,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google" {
Expand Down
1 change: 0 additions & 1 deletion examples/deploy_service/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/disable_client_cert/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ data "google_compute_subnetwork" "subnetwork" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ data "google_compute_subnetwork" "subnetwork" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant_public_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ data "google_compute_subnetwork" "subnetwork" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
3 changes: 1 addition & 2 deletions examples/private_zonal_with_networking/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand All @@ -39,7 +38,7 @@ module "gcp-network" {
]

secondary_ranges = {
"${var.subnetwork}" = [
(var.subnetwork) = [
{
range_name = var.ip_range_pods_name
ip_cidr_range = "192.168.0.0/18"
Expand Down
1 change: 0 additions & 1 deletion examples/regional_private_node_pool_oauth_scopes/provider.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/safer_cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion examples/safer_cluster/network.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module "gcp-network" {
]

secondary_ranges = {
"${local.subnet_name}" = [
(local.subnet_name) = [
{
range_name = local.pods_range_name
ip_cidr_range = "192.168.0.0/18"
Expand Down
2 changes: 1 addition & 1 deletion examples/safer_cluster_iap_bastion/network.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module "vpc" {
}
]
secondary_ranges = {
"${var.subnet_name}" = [
(var.subnet_name) = [
{
range_name = var.ip_range_pods_name
ip_cidr_range = "192.168.0.0/18"
Expand Down
1 change: 0 additions & 1 deletion examples/safer_cluster_iap_bastion/provider.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/shared_vpc/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_private_beta/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_with_kubeconfig/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
3 changes: 1 addition & 2 deletions examples/simple_regional_with_networking/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand All @@ -42,7 +41,7 @@ module "gcp-network" {
]

secondary_ranges = {
"${var.subnetwork}" = [
(var.subnetwork) = [
{
range_name = var.ip_range_pods_name
ip_cidr_range = "192.168.0.0/18"
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal_with_acm/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal_with_asm/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal_with_hub/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/stub_domains/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/stub_domains_private/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/stub_domains_upstream_nameservers/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/upstream_nameservers/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/workload_identity/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
1 change: 0 additions & 1 deletion examples/workload_metadata_config/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ provider "google-beta" {
data "google_client_config" "default" {}

provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 0 additions & 2 deletions modules/auth/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ resource "local_file" "kubeconfig" {

```hcl
provider "kubernetes" {
load_config_file = false
cluster_ca_certificate = module.gke_auth.cluster_ca_certificate
host = module.gke_auth.host
token = module.gke_auth.token
Expand Down
1 change: 0 additions & 1 deletion modules/beta-private-cluster-update-variant/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google-beta" {
Expand Down
1 change: 0 additions & 1 deletion modules/beta-private-cluster/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google-beta" {
Expand Down
1 change: 0 additions & 1 deletion modules/beta-public-cluster-update-variant/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster-update-variant/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google-beta" {
Expand Down
1 change: 0 additions & 1 deletion modules/beta-public-cluster/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google-beta" {
Expand Down
1 change: 0 additions & 1 deletion modules/private-cluster-update-variant/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster-update-variant/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google" {
Expand Down
1 change: 0 additions & 1 deletion modules/private-cluster/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
data "google_client_config" "default" {}
provider "kubernetes" {
load_config_file = false
host = "https://${module.gke.endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(module.gke.ca_certificate)
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.10, != 1.11.0"
version = "~> 2.0"
}
}
provider_meta "google" {
Expand Down
Loading

0 comments on commit 9172b3e

Please sign in to comment.