Skip to content

Commit

Permalink
chore: (IAC-1196) Updates resolving tflint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
riragh committed Oct 25, 2023
1 parent 6ae0ba5 commit 1c1ae91
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 32 deletions.
2 changes: 1 addition & 1 deletion docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Ubuntu 20.04 LTS is the operating system used on the Jump/NFS servers. Ubuntu cr
| jump_rwx_filestore_path | File store mount point on jump server | string | "/viya-share" | This location cannot include `/mnt` as its root location. This disk is ephemeral on Ubuntu, which is the operating system being used for the jump/NFS servers. |
| tags | Map of common tags to be placed on all Azure resources created by this script | map | { project_name = "sasviya4", environment = "dev" } | |
| aks_identity | Use UserAssignedIdentity or Service Principal as [AKS identity](https://docs.microsoft.com/en-us/azure/aks/concepts-identity) | string | "uai" | A value of `uai` wil create a Managed Identity based on the permissions of the authenticated user or use [`AKS_UAI_NAME`](#use-existing), if set. A value of `sp` will use values from [`CLIENT_ID`/`CLIENT_SECRET`](#azure-authentication), if set. |
| ssh_public_key | File name of public ssh key for jump and nfs VM | string | "~/.ssh/id_rsa.pub" | Required with `create_jump_vm=true` or `storage_type=standard` |
| ssh_public_key | File name of public ssh key for jump and nfs VM | string | null | Required with `create_jump_vm=true` or `storage_type=standard` |
| cluster_api_mode | Public or private IP for the cluster api | string | "public" | Valid Values: "public", "private" |
| aks_cluster_private_dns_zone_id | Specifies private DNS zone resource ID for AKS private cluster to use | string | "" | For `cluster_api_mode=private` if `aks_cluster_private_dns_zone_id` is not specified then the value `System` is used else it is set to null. For details see [Configure a private DNS zone](https://learn.microsoft.com/en-us/azure/aks/private-clusters?tabs=azure-portal#configure-a-private-dns-zone) |
| aks_cluster_sku_tier | Optimizes api server for cost vs availability | string | "Free" | Valid Values: "Free", "Standard" |
Expand Down
5 changes: 0 additions & 5 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
locals {

# Useful flags
# ssh_public_key = (var.create_jump_vm || var.storage_type == "standard"
# ? file(var.ssh_public_key)
# : null
# )

ssh_public_key = (var.create_jump_vm || var.storage_type == "standard"
? can(file(var.ssh_public_key)) ? file(var.ssh_public_key) : var.ssh_public_key != null ? length(var.ssh_public_key) > 0 ? var.ssh_public_key : null : null
: null
Expand Down
6 changes: 0 additions & 6 deletions modules/azure_aks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ variable "aks_cluster_rg" {
type = string
}

## unused
# variable "aks_cluster_rg_id" {
# description = "The `azurerm_kubernetes_cluster`'s id."
# type = string
# }

variable "aks_cluster_dns_prefix" {
description = "DNS prefix specified when creating the managed cluster."
type = string
Expand Down
13 changes: 0 additions & 13 deletions modules/azurerm_netapp/variables.tf
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# Copyright © 2020-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

#unused
# variable create_netapp {
# description = "Boolean flag to create Azure NetApp Files"
# type = bool
# default = false
# }

variable "prefix" {
description = "A prefix used in the name for all the Azure resources created by this script."
type = string
Expand All @@ -23,12 +16,6 @@ variable "location" {
type = string
}

#unused
# variable "vnet_name" {
# description = "Azure Virtual Network"
# type = string
# }

variable "subnet_id" {
description = "Azure subnet id for Azure NetApp Files"
type = string
Expand Down
7 changes: 0 additions & 7 deletions modules/azurerm_postgresql_flex/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,3 @@ variable "delegated_subnet_id" {
description = "The ID of the virtual network subnet to create the PostgreSQL Flexible Server. The provided subnet should not have any other resource deployed in it and this subnet will be delegated to the PostgreSQL Flexible Server, if not already delegated. Changing this forces a new PostgreSQL Flexible Server to be created."
type = string
}

#unused
# variable "private_dns_zone_id" {
# description = "The ID of the private DNS zone to create the PostgreSQL Flexible Server. Changing this forces a new PostgreSQL Flexible Server to be created."
# type = string
# default = null
# }

0 comments on commit 1c1ae91

Please sign in to comment.