From e8d542a6985671d0249742c4d7b66cafdafea892 Mon Sep 17 00:00:00 2001 From: Valentyna Bukhalova Date: Thu, 2 Nov 2023 14:00:36 +0100 Subject: [PATCH] aks with azure cni: use calico --- .gitignore | 1 + examples/aks/aks_cluster_azure_cni/aks.tf | 4 ++-- examples/aks/aks_cluster_azure_cni/tf.vars.example | 3 --- examples/aks/aks_cluster_azure_cni/variables.tf | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 38d59f5a..dfd06c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ examples/**/.terraform/ examples/**/terraform.d/ examples/**/crash.log examples/**/*.tfstate +examples/**/*.tfstate.lock.info examples/**/*.tfstate.backup examples/**/.terraform.lock.hcl examples/**/*.tfvars diff --git a/examples/aks/aks_cluster_azure_cni/aks.tf b/examples/aks/aks_cluster_azure_cni/aks.tf index 06279c9c..cb787e09 100644 --- a/examples/aks/aks_cluster_azure_cni/aks.tf +++ b/examples/aks/aks_cluster_azure_cni/aks.tf @@ -16,8 +16,8 @@ resource "azurerm_kubernetes_cluster" "this" { } network_profile { - network_plugin = var.cluster_network_provider - network_plugin_mode = var.cluster_network_provider_mode + network_plugin = var.cluster_network_plugin + network_policy = var.cluster_network_policy } identity { diff --git a/examples/aks/aks_cluster_azure_cni/tf.vars.example b/examples/aks/aks_cluster_azure_cni/tf.vars.example index e39babd1..4becba44 100644 --- a/examples/aks/aks_cluster_azure_cni/tf.vars.example +++ b/examples/aks/aks_cluster_azure_cni/tf.vars.example @@ -1,6 +1,3 @@ cluster_name = "" cluster_region = "" castai_api_token = "" - -# Enable for Overlay network provider mode -# cluster_network_provider_mode = "Overlay" diff --git a/examples/aks/aks_cluster_azure_cni/variables.tf b/examples/aks/aks_cluster_azure_cni/variables.tf index e973ce08..8893a954 100644 --- a/examples/aks/aks_cluster_azure_cni/variables.tf +++ b/examples/aks/aks_cluster_azure_cni/variables.tf @@ -15,16 +15,16 @@ variable "cluster_version" { default = "1.23" } -variable "cluster_network_provider" { +variable "cluster_network_plugin" { type = string description = "AKS cluster network provider" default = "azure" } -variable "cluster_network_provider_mode" { +variable "cluster_network_policy" { type = string - description = "AKS cluster network provider mode" - default = "" + description = "AKS cluster network policy" + default = "calico" } # Variables required for connecting EKS cluster to CAST AI