Commit 2ac6026e authored by MANISH KUMAR's avatar MANISH KUMAR
Browse files

Merge branch 'revert-ad49ebab' into 'master'

Revert "Merge branch 'update_aks_version' into 'master'"

See merge request !360
parents ad49ebab 7733d539
Pipeline #47779 passed with stages
in 1 minute and 31 seconds
...@@ -23,7 +23,7 @@ resource_tags = { ...@@ -23,7 +23,7 @@ resource_tags = {
} }
# Kubernetes Settings # Kubernetes Settings
kubernetes_version = "1.19.11" kubernetes_version = "1.18.8"
aks_agent_vm_size = "Standard_E4s_v3" aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5" aks_agent_vm_count = "5"
subnet_aks_prefix = "10.10.2.0/23" subnet_aks_prefix = "10.10.2.0/23"
...@@ -42,7 +42,7 @@ func asMap(t *testing.T, jsonString string) map[string]interface{} { ...@@ -42,7 +42,7 @@ func asMap(t *testing.T, jsonString string) map[string]interface{} {
func TestTemplate(t *testing.T) { func TestTemplate(t *testing.T) {
expectedResult := asMap(t, `{ expectedResult := asMap(t, `{
"kubernetes_version": "1.19.11" "kubernetes_version": "1.17.9"
}`) }`)
testFixture := infratests.UnitTestFixture{ testFixture := infratests.UnitTestFixture{
......
...@@ -59,7 +59,7 @@ variable "max_pods" { ...@@ -59,7 +59,7 @@ variable "max_pods" {
variable "kubernetes_version" { variable "kubernetes_version" {
type = string type = string
default = "1.19.11" default = "1.17.9"
} }
variable "admin_user" { variable "admin_user" {
......
...@@ -34,7 +34,7 @@ resource_tags = { ...@@ -34,7 +34,7 @@ resource_tags = {
} }
# Kubernetes Settings # Kubernetes Settings
kubernetes_version = "1.19.11" kubernetes_version = "1.18.17"
aks_agent_vm_size = "Standard_E4s_v3" aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5" aks_agent_vm_count = "5"
subnet_aks_prefix = "10.10.2.0/23" subnet_aks_prefix = "10.10.2.0/23"
......
...@@ -39,7 +39,7 @@ resource_tags = { ...@@ -39,7 +39,7 @@ resource_tags = {
} }
# Kubernetes Settings # Kubernetes Settings
kubernetes_version = "1.19.11" kubernetes_version = "1.18.17"
aks_agent_vm_size = "Standard_E4s_v3" aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5" aks_agent_vm_count = "5"
aks_agent_vm_disk = 128 aks_agent_vm_disk = 128
......
...@@ -248,7 +248,7 @@ variable "aks_agent_vm_disk" { ...@@ -248,7 +248,7 @@ variable "aks_agent_vm_disk" {
variable "kubernetes_version" { variable "kubernetes_version" {
type = string type = string
default = "1.19.11" default = "1.17.11"
} }
variable "ssh_public_key_file" { variable "ssh_public_key_file" {
......
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