Merge pull request #426 from sassoftware/staging

10.1.0 - January 16, 2025
sassoftware · Jan 16, 2025 · 00d33fd · 00d33fd
2 parents e81a72e + 4a351f6
commit 00d33fd
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ ARG AZURECLI_VERSION=2.64.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION
-ARG KUBECTL_VERSION=1.29.7
+ARG KUBECTL_VERSION=1.30.6
 
 WORKDIR /viya4-iac-azure
 
@@ -12,12 +12,12 @@ COPY . .
 
 RUN yum -y install git openssh jq which curl \
   && yum clean all && rm -rf /var/cache/yum \
-  && curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \
+  && curl -sLO https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \
   && chmod 755 ./kubectl /viya4-iac-azure/docker-entrypoint.sh \
   && mv ./kubectl /usr/local/bin/kubectl \
-  && chmod g=u -R /etc/passwd /etc/group /viya4-iac-azure \
   && git config --system --add safe.directory /viya4-iac-azure \
-  && terraform init
+  && terraform init \
+  && chmod g=u -R /etc/passwd /etc/group /viya4-iac-azure
 
 ENV TF_VAR_iac_tooling=docker
 ENTRYPOINT ["/viya4-iac-azure/docker-entrypoint.sh"]

diff --git 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.9.6
-- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.29.7
+- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.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.64.0
 

diff --git a/container-structure-test.yaml b/container-structure-test.yaml
@@ -12,6 +12,10 @@ fileExistenceTests:
     path: '/usr/bin/az'
     shouldExist: true
     permissions: '-rwxr-xr-x'
+  - name: 'kubectl'
+    path: '/usr/local/bin/kubectl'
+    shouldExist: true
+    permissions: '-rwxr-xr-x'
 
 commandTests:
   - name: "terraform version"
@@ -22,14 +26,17 @@ commandTests:
     command: "python3"
     args: ["--version"]
     expectedOutput: ["Python 3.*"]
-
   - name: "az-cli version"
     command: "bash"
     args:
       - -c
       - |
         az version -o tsv
     expectedOutput: ["2.64.0\t2.64.0\t1.1.0"]
+  - name: "kubectl version"
+    command: "kubectl"
+    args: ["version", "--client"]
+    expectedOutput: ["Client Version: v1.30.6"]
 
 metadataTest:
   workdir: "/viya4-iac-azure"

diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
@@ -197,7 +197,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.29" |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.30" |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.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 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
@@ -86,7 +86,7 @@ container_registry_sku              = "Standard"
 container_registry_admin_enabled    = false
 
 # AKS config
-kubernetes_version         = "1.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 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.29"
+kubernetes_version         = "1.30"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "Standard_E8s_v5"
 

diff --git a/linting-configs/.tflint.hcl b/linting-configs/.tflint.hcl
@@ -9,7 +9,7 @@
 
 config {
   # Enables module inspection.
-  module = true
+  call_module_type = "all"
 }
 
 plugin "azurerm" {

diff --git a/modules/azure_aks/variables.tf b/modules/azure_aks/variables.tf
@@ -146,7 +146,7 @@ variable "aks_node_disk_encryption_set_id" {
 variable "kubernetes_version" {
   description = "The AKS cluster K8s version"
   type        = string
-  default     = "1.29"
+  default     = "1.30"
 }
 
 variable "aks_cluster_endpoint_public_access_cidrs" {

diff --git a/modules/azurerm_postgresql_flex/main.tf b/modules/azurerm_postgresql_flex/main.tf
@@ -37,7 +37,8 @@ resource "azurerm_postgresql_flexible_server" "flexpsql" {
   tags                         = var.tags
   delegated_subnet_id          = var.delegated_subnet_id
   private_dns_zone_id          = try(azurerm_private_dns_zone.flexpsql[0].id, null)
-
+  public_network_access_enabled = var.connectivity_method == "public" ? true : false
+
   depends_on = [azurerm_private_dns_zone_virtual_network_link.flexpsql]
 
   lifecycle {

diff --git a/variables.tf b/variables.tf
@@ -151,7 +151,7 @@ variable "default_nodepool_vm_type" {
 variable "kubernetes_version" {
   description = "The AKS cluster K8s version"
   type        = string
-  default     = "1.29"
+  default     = "1.30"
 }
 
 variable "default_nodepool_max_nodes" {