Skip to content

Commit

Permalink
9.1.0 - March 21, 2024 (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
riragh authored Mar 21, 2024
1 parent 0e86839 commit f12ea54
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 100 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
84 changes: 0 additions & 84 deletions .github/ISSUE_TEMPLATE/issue--bug-report.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bug report
name: Bug Report
description: |
Welcome, Thanks for opening an issue. The more information you provide, the easier it is for us to assess the problem, prioritize, assign, develop, then release a fix. The SAS Viya 4 IaC team.
labels: [bug, new]
Expand All @@ -14,7 +14,7 @@ body:
If you are not running the latest version of Terraform we support, please try upgrading because your issue may have already been fixed.
If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-aws#terraform to help.
If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-azure?tab=readme-ov-file#terraform-requirements to help.
validations:
required: false
- type: textarea
Expand All @@ -23,10 +23,10 @@ body:
label: Terraform Variable File Details
description: |
Paste the relevant parts of your Terraform variables here.
The relevant parts should come from your `terraform.tfvars` file or equivalent and small snippets of the `*.tf` file/files that seem to be causing the error.
security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
For security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
validations:
required: false
- type: textarea
Expand Down Expand Up @@ -75,4 +75,3 @@ body:
options:
- label: I agree to follow this project's Code of Conduct
required: true

44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/issue--feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Feature Request
description: |
Welcome, Thanks for opening a feature request. The more information you provide, the easier it is for us to assess your request, prioritize, assign, develop, and release. The SAS Viya 4 IaC team.
labels: [enhancement, new]
body:
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: |
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
id: solution
attributes:
label: Describe the solution you'd like
description: |
A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
description: |
A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false
- type: checkboxes
id: tf_terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/sassoftware/viya4-iac-azure/blob/main/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG TERRAFORM_VERSION=1.6.6
ARG AZURECLI_VERSION=2.56.0
ARG TERRAFORM_VERSION=1.7.3
ARG AZURECLI_VERSION=2.57.0

FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ This project supports two options for running Terraform scripts:
Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformAzureAuthentication.md) with the *Contributor* role are required.

#### Terraform Requirements:
- [Terraform](https://www.terraform.io/downloads.html) - v1.6.6
- [Terraform](https://www.terraform.io/downloads.html) - v1.7.3
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.27.9
- [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.56.0
- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.57.0

#### Docker Requirements:
- [Docker](https://docs.docker.com/get-docker/)
Expand Down
4 changes: 2 additions & 2 deletions container-structure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ commandTests:
- name: "terraform version"
command: "terraform"
args: ["--version"]
expectedOutput: ["Terraform v1.6.6"]
expectedOutput: ["Terraform v1.7.3"]
- name: "python version"
command: "python3"
args: ["--version"]
Expand All @@ -29,7 +29,7 @@ commandTests:
- -c
- |
az version -o tsv
expectedOutput: ["2.56.0\t2.56.0\t1.1.0"]
expectedOutput: ["2.57.0\t2.57.0\t1.1.0"]

metadataTest:
workdir: "/viya4-iac-azure"
Expand Down
2 changes: 1 addition & 1 deletion locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ locals {
)

nsg = var.nsg_name == null ? azurerm_network_security_group.nsg[0] : data.azurerm_network_security_group.nsg[0]
nsg_rg_name = var.nsg_name == null ? local.aks_rg.name : local.network_rg.name
nsg_rg_name = local.network_rg.name

# Use BYO UAI if given, else create a UAI
aks_uai_id = (var.aks_identity == "uai"
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resource "azurerm_network_security_group" "nsg" {
count = var.nsg_name == null ? 1 : 0
name = "${var.prefix}-nsg"
location = var.location
resource_group_name = local.aks_rg.name
resource_group_name = local.network_rg.name
tags = var.tags
}

Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

terraform {

required_version = ">= 1.6.6"
required_version = ">= 1.7.3"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.86.0"
version = "3.92.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down

0 comments on commit f12ea54

Please sign in to comment.