Skip to content

Commit

Permalink
feat: (PSKD-815) Default K8s version updated to 1.30, add support for…
Browse files Browse the repository at this point in the history
… 1.31 (#407)

* feat: (PSKD-815) Default K8s version updated to 1.30, add support for 1.31
---------
Signed-off-by: Ritika Patil <Ritika.Patil@sas.com>
  • Loading branch information
riragh authored Nov 13, 2024
1 parent e81a72e commit 328a07e
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -12,7 +12,7 @@ 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 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion container-structure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-byo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-connect.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-ha.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-minimal.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-postgres.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-ppg.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-singlestore.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion modules/azure_aks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down

0 comments on commit 328a07e

Please sign in to comment.