From 872e9b82e6661c803aeae8606e497de0f8b0c745 Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Tue, 2 Jan 2024 14:36:13 -0600 Subject: [PATCH] feat: (IAC-1264) Add support for K8s 1.28 --- Dockerfile | 2 +- README.md | 2 +- docs/CONFIG-VARS.md | 2 +- examples/sample-input-byo.tfvars | 2 +- examples/sample-input-connect.tfvars | 2 +- examples/sample-input-ha.tfvars | 2 +- examples/sample-input-minimal.tfvars | 2 +- examples/sample-input-postgres.tfvars | 2 +- examples/sample-input-ppg.tfvars | 2 +- examples/sample-input-singlestore.tfvars | 2 +- examples/sample-input.tfvars | 2 +- modules/azure_aks/variables.tf | 2 +- variables.tf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f92e10c..d3d95acd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG AZURECLI_VERSION=2.54.0 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION -ARG KUBECTL_VERSION=1.26.10 +ARG KUBECTL_VERSION=1.27.7 WORKDIR /viya4-iac-azure diff --git a/README.md b/README.md index ce6592d3..12d576ec 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformA #### Terraform Requirements: - [Terraform](https://www.terraform.io/downloads.html) - v1.6.4 -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.26 +- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.27.7 - [jq](https://stedolan.github.io/jq/) - v1.6 - [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.54.0 diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 696ec959..847e85dd 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -182,7 +182,7 @@ Ubuntu 20.04 LTS is the operating system used on the Jump/NFS servers. Ubuntu cr | :--- | ---: | ---: | ---: | ---: | | partner_id | A GUID that is registered with Microsoft to facilitate partner resource usage attribution | string | "5d27f3ae-e49c-4dea-9aa3-b44e4750cd8c" | Defaults to SAS partner GUID. When you deploy this Terraform configuration, Microsoft can identify the installation of SAS software with the deployed Azure resources. Microsoft can then correlate the resources that are used to support the software. Microsoft collects this information to provide the best experiences with their products and to operate their business. The data is collected and governed by Microsoft's privacy policies, located at https://www.microsoft.com/trustcenter. | | create_static_kubeconfig | Allows the user to create a provider / service account-based kubeconfig file | bool | true | A value of `false` will default to using the cloud provider's mechanism for generating the kubeconfig file. A value of `true` will create a static kubeconfig that uses a `Service Account` and `Cluster Role Binding` to provide credentials. | -| kubernetes_version | The AKS cluster Kubernetes version | string | "1.26" |Use of specific versions is still supported. If you need exact kubernetes version please use format `x.y.z`, where `x` is the major version, `y` is the minor version, and `z` is the patch version | +| kubernetes_version | The AKS cluster Kubernetes version | string | "1.27" |Use of specific versions is still supported. If you need exact kubernetes version please use format `x.y.z`, where `x` is the major version, `y` is the minor version, and `z` is the patch version | | create_jump_vm | Create bastion host | bool | true | | | create_jump_public_ip | Add public IP address to the jump VM | bool | true | | | enable_jump_public_static_ip | Enables `Static` allocation method for the public IP address of Jump Server. Setting false will enable `Dynamic` allocation method. | bool | true | Only used with `create_jump_public_ip=true` | diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars index 39adba66..6744614b 100644 --- a/examples/sample-input-byo.tfvars +++ b/examples/sample-input-byo.tfvars @@ -45,7 +45,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars index a85f1d1c..48799803 100644 --- a/examples/sample-input-connect.tfvars +++ b/examples/sample-input-connect.tfvars @@ -34,7 +34,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars index d5c4050e..561f0bbe 100644 --- a/examples/sample-input-ha.tfvars +++ b/examples/sample-input-ha.tfvars @@ -32,7 +32,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars index 4cc68d2b..a91dfb6d 100644 --- a/examples/sample-input-minimal.tfvars +++ b/examples/sample-input-minimal.tfvars @@ -32,7 +32,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D4_v3" #v3 still has local temp storage diff --git a/examples/sample-input-postgres.tfvars b/examples/sample-input-postgres.tfvars index b8e7c05a..9c4c40b1 100644 --- a/examples/sample-input-postgres.tfvars +++ b/examples/sample-input-postgres.tfvars @@ -86,7 +86,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input-ppg.tfvars b/examples/sample-input-ppg.tfvars index c79a12fa..2df3be14 100644 --- a/examples/sample-input-ppg.tfvars +++ b/examples/sample-input-ppg.tfvars @@ -33,7 +33,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input-singlestore.tfvars b/examples/sample-input-singlestore.tfvars index ec2952de..d6e76fb3 100644 --- a/examples/sample-input-singlestore.tfvars +++ b/examples/sample-input-singlestore.tfvars @@ -34,7 +34,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars index 73e26d9c..0d5f5e4c 100644 --- a/examples/sample-input.tfvars +++ b/examples/sample-input.tfvars @@ -34,7 +34,7 @@ container_registry_sku = "Standard" container_registry_admin_enabled = false # AKS config -kubernetes_version = "1.26" +kubernetes_version = "1.27" default_nodepool_min_nodes = 2 default_nodepool_vm_type = "Standard_D8s_v4" diff --git a/modules/azure_aks/variables.tf b/modules/azure_aks/variables.tf index 92795558..204e858f 100644 --- a/modules/azure_aks/variables.tf +++ b/modules/azure_aks/variables.tf @@ -115,7 +115,7 @@ variable "aks_cluster_max_pods" { variable "kubernetes_version" { description = "The AKS cluster K8s version" type = string - default = "1.26" + default = "1.27" } variable "aks_cluster_endpoint_public_access_cidrs" { diff --git a/variables.tf b/variables.tf index ee188417..e07dc30d 100644 --- a/variables.tf +++ b/variables.tf @@ -121,7 +121,7 @@ variable "default_nodepool_vm_type" { variable "kubernetes_version" { description = "The AKS cluster K8s version" type = string - default = "1.26" + default = "1.27" } variable "default_nodepool_max_nodes" {