Merge branch 'main' of https://github.com/sassoftware/viya4-iac-azure into pscloud-382

Abhishek Kumar · Abhishek Kumar · commit df2dc6a80d5a · 2026-01-09T10:12:04.000+05:30
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ ARG AZURECLI_VERSION=2.70.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION AS terraform
 FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION
-ARG KUBECTL_VERSION=1.32.6
+ARG KUBECTL_VERSION=1.33.6
 
 WORKDIR /viya4-iac-azure
 
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformA
 
 #### Terraform Requirements:
 - [Terraform](https://www.terraform.io/downloads.html) - v1.10.5
-- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.32.6
+- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.33.6
 - [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.70.0
 
diff --git a/container-structure-test.yaml b/container-structure-test.yaml
@@ -36,7 +36,7 @@ commandTests:
   - name: "kubectl version"
     command: "kubectl"
     args: ["version", "--client"]
-    expectedOutput: ["Client Version: v1.32.6"]
+    expectedOutput: ["Client Version: v1.33.6"]
 
 metadataTest:
   workdir: "/viya4-iac-azure"
diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
@@ -201,7 +201,7 @@ Ubuntu 22.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.32" | 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.33" | 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
@@ -45,7 +45,7 @@ container_registry_sku              = "Standard"
 container_registry_admin_enabled    = false
 
 # AKS config
-kubernetes_version         = "1.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_D4_v5"
 
diff --git a/examples/sample-input-multizone.tfvars b/examples/sample-input-multizone.tfvars
@@ -59,7 +59,7 @@ container_registry_sku              = "Standard"
 container_registry_admin_enabled    = false
 
 # AKS config
-kubernetes_version         = "1.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git 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.32"
+kubernetes_version         = "1.33"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 
diff --git a/modules/azure_aks/variables.tf b/modules/azure_aks/variables.tf
@@ -166,7 +166,7 @@ variable "aks_azure_policy_enabled" {
 variable "kubernetes_version" {
   description = "The AKS cluster K8s version"
   type        = string
-  default     = "1.32"
+  default     = "1.33"
 }
 
 variable "aks_cluster_endpoint_public_access_cidrs" {
diff --git a/test/defaultplan/defaults_test.go b/test/defaultplan/defaults_test.go
@@ -32,7 +32,7 @@ func TestPlanDefaults(t *testing.T) {
 			AttributeJsonPath: "{$.network_profile[0].network_plugin}",
 		},
 		"k8sVersionTest": {
-			Expected:          "1.32",
+			Expected:          "1.33",
 			ResourceMapName:   "module.aks.azurerm_kubernetes_cluster.aks",
 			AttributeJsonPath: "{$.kubernetes_version}",
 		},
diff --git a/test/nondefaultapply/non_default_apply_main_test.go b/test/nondefaultapply/non_default_apply_main_test.go
@@ -12,7 +12,7 @@ import (
 func TestApplyNonDefaultMain(t *testing.T) {
 	// terraform init and apply using a non-default values in the plan
 	overrides := make(map[string]interface{})
-	overrides["kubernetes_version"] = "1.32.0"
+	overrides["kubernetes_version"] = "1.33.0"
 	overrides["create_container_registry"] = true
 	overrides["container_registry_admin_enabled"] = true
 	overrides["container_registry_geo_replica_locs"] = []string{"southeastus5", "southeastus3"}
diff --git a/test/nondefaultplan/azure_policy_test.go b/test/nondefaultplan/azure_policy_test.go
@@ -14,6 +14,7 @@ func TestPlanAzurePolicy(t *testing.T) {
 	t.Parallel()
 
 	variables := helpers.GetDefaultPlanVars(t)
+	variables["prefix"] = "azurepolicy"
 	variables["aks_azure_policy_enabled"] = true
 	variables["aks_network_plugin"] = "azure"
 
@@ -46,6 +47,7 @@ func TestPlanCustomSubnets(t *testing.T) {
 	t.Parallel()
 
 	variables := helpers.GetDefaultPlanVars(t)
+	variables["prefix"] = "customsubnets"
 	variables["aks_network_plugin"] = "azure"
 	variables["subnets"] = map[string]interface{}{
 		"aks": map[string]interface{}{
diff --git a/variables.tf b/variables.tf
@@ -172,7 +172,7 @@ variable "default_nodepool_vm_type" {
 variable "kubernetes_version" {
   description = "The AKS cluster K8s version"
   type        = string
-  default     = "1.32"
+  default     = "1.33"
 }
 
 variable "default_nodepool_max_nodes" {
