Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Plural
platform
terraform-azurerm-aks
Commits
74712e5b
Unverified
Commit
74712e5b
authored
6 years ago
by
Malte Lantin
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #7 from adfinis-forks/fix/configurable-kubernetes-version
Configurable Kubernetes version in module
parents
7e38320c
a695ad1b
master
development
plural
refactor
revert-24-master
wyp-terramodtest-0.8.0
4.9.0
4.8.0
4.7.0
4.6.0
4.5.0
4.4.0
4.3.0
4.2.0
4.1.0
4.0
v3.0
v2.0
v1.0
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
README.md
+5
-0
README.md
main.tf
+1
-0
main.tf
modules/kubernetes-cluster/main.tf
+1
-1
modules/kubernetes-cluster/main.tf
modules/kubernetes-cluster/variables.tf
+5
-0
modules/kubernetes-cluster/variables.tf
variables.tf
+5
-0
variables.tf
with
17 additions
and
1 deletion
+17
-1
README.md
+
5
-
0
View file @
74712e5b
...
...
@@ -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
=
""
...
...
This diff is collapsed.
Click to expand it.
main.tf
+
1
-
0
View file @
74712e5b
...
...
@@ -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
}
"
...
...
This diff is collapsed.
Click to expand it.
modules/kubernetes-cluster/main.tf
+
1
-
1
View file @
74712e5b
...
...
@@ -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
}
"
...
...
This diff is collapsed.
Click to expand it.
modules/kubernetes-cluster/variables.tf
+
5
-
0
View file @
74712e5b
...
...
@@ -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"
}
...
...
This diff is collapsed.
Click to expand it.
variables.tf
+
5
-
0
View file @
74712e5b
...
...
@@ -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
=
""
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help