Unverified Commit 74712e5b authored by Malte Lantin's avatar Malte Lantin Committed by GitHub
Browse files

Merge pull request #7 from adfinis-forks/fix/configurable-kubernetes-version

Configurable Kubernetes version in module
Showing with 17 additions and 1 deletion
+17 -1
......@@ -63,6 +63,11 @@ variable "agents_count" {
default = 2
}
variable "kubernetes_version" {
description = "Version of Kubernetes to install"
default = "1.11.3"
}
variable "public_ssh_key" {
description = "A custom ssh key to control access to the AKS cluster"
default = ""
......
......@@ -21,6 +21,7 @@ module "kubernetes" {
admin_public_ssh_key = "${var.public_ssh_key == "" ? module.ssh-key.public_ssh_key : var.public_ssh_key }"
agents_size = "${var.agents_size}"
agents_count = "${var.agents_count}"
kubernetes_version = "${var.kubernetes_version}"
service_principal_client_id = "${var.CLIENT_ID}"
service_principal_client_secret = "${var.CLIENT_SECRET}"
log_analytics_workspace_id = "${module.log_analytics_workspace.id}"
......
......@@ -3,7 +3,7 @@ resource "azurerm_kubernetes_cluster" "main" {
location = "${var.location}"
resource_group_name = "${var.resource_group_name}"
dns_prefix = "${var.prefix}"
kubernetes_version = "1.11.3"
kubernetes_version = "${var.kubernetes_version}"
linux_profile {
admin_username = "${var.admin_username}"
......
......@@ -36,6 +36,11 @@ variable "agents_size" {
description = "The Azure VM Size of the Virtual Machines used in the Agent Pool"
}
variable "kubernetes_version" {
description = "Version of Kubernetes to install"
default = "1.11.3"
}
variable "service_principal_client_id" {
description = "The Client ID of the Service Principal assigned to Kubernetes"
}
......
......@@ -41,6 +41,11 @@ variable "agents_count" {
default = 2
}
variable "kubernetes_version" {
description = "Version of Kubernetes to install"
default = "1.11.3"
}
variable "public_ssh_key" {
description = "A custom ssh key to control access to the AKS cluster"
default = ""
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment