From d1f9760ce68e3d86fa02bd2a4dc22083ca3977b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= Date: Tue, 25 Feb 2020 14:33:54 +0100 Subject: [PATCH 1/2] Add node_count variable definition to gke/variables.tf --- gke/variables.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gke/variables.tf b/gke/variables.tf index 8823917..8179bce 100644 --- a/gke/variables.tf +++ b/gke/variables.tf @@ -13,6 +13,10 @@ variable "node_pool_name" { variable "instance_count" { default = "3" } +variable "node_count" { + default = "3" +} + variable "instance_type" { default = "n1-standard-4" } From 55f01412b1966de32a5a7d8a3b68b52447ab22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= Date: Wed, 26 Feb 2020 16:37:24 +0100 Subject: [PATCH 2/2] Pin kubernetes provider version to 1.10.0 Workaround for terraform-providers/terraform-provider-kubernetes#759 Signed-by: Chris and Victor --- aks/k8sresources.tf | 2 +- eks/modules/services/k8s.tf | 2 +- gke/k8sresources.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aks/k8sresources.tf b/aks/k8sresources.tf index 5e5d5cc..3cbf168 100644 --- a/aks/k8sresources.tf +++ b/aks/k8sresources.tf @@ -1,6 +1,6 @@ provider "kubernetes" { - version = "~> 1.5" load_config_file = false + version = "1.10.0" host = "${azurerm_kubernetes_cluster.k8s.kube_config.0.host}" client_certificate = "${base64decode(azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate)}" client_key = "${base64decode(azurerm_kubernetes_cluster.k8s.kube_config.0.client_key)}" diff --git a/eks/modules/services/k8s.tf b/eks/modules/services/k8s.tf index ab8e44a..20588ff 100644 --- a/eks/modules/services/k8s.tf +++ b/eks/modules/services/k8s.tf @@ -7,9 +7,9 @@ data "aws_eks_cluster_auth" "eks-auth" { } provider "kubernetes" { - version = "~> 1.5" load_config_file = false host = "${data.aws_eks_cluster.eks.endpoint}" + version = "1.10.0" cluster_ca_certificate = "${base64decode(data.aws_eks_cluster.eks.certificate_authority.0.data)}" token = "${data.aws_eks_cluster_auth.eks-auth.token}" } \ No newline at end of file diff --git a/gke/k8sresources.tf b/gke/k8sresources.tf index 6df28a7..02c20ab 100644 --- a/gke/k8sresources.tf +++ b/gke/k8sresources.tf @@ -1,7 +1,7 @@ provider "kubernetes" { - version = "~> 1.5" load_config_file = false host = "https://${google_container_cluster.gke-cluster.endpoint}" + version = "1.10.0" cluster_ca_certificate = "${base64decode(google_container_cluster.gke-cluster.master_auth.0.cluster_ca_certificate)}" token = "${data.google_client_config.current.access_token}" }