Skip to content

Commit

Permalink
Pin kubernetes provider to 1.10.0 (#47)
Browse files Browse the repository at this point in the history
* Add node_count variable definition to gke/variables.tf

* Pin kubernetes provider version to 1.10.0

Workaround for
hashicorp/terraform-provider-kubernetes#759

Signed-by: Chris and Victor
  • Loading branch information
viccuad authored Mar 9, 2020
1 parent 111dc8e commit 7c34090
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion aks/k8sresources.tf
Original file line number Diff line number Diff line change
@@ -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)}"
Expand Down
2 changes: 1 addition & 1 deletion eks/modules/services/k8s.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
2 changes: 1 addition & 1 deletion gke/k8sresources.tf
Original file line number Diff line number Diff line change
@@ -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}"
}
Expand Down
4 changes: 4 additions & 0 deletions gke/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down

0 comments on commit 7c34090

Please sign in to comment.