Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix velero_storage_settings type #3

Merged
merged 3 commits into from
Mar 11, 2022
Merged

Fix velero_storage_settings type #3

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6904151
Fix velero_storage_settings type
Mar 4, 2022
98a09b4
Make `velero_storage_settings` attributes optional
Shr3ps Mar 11, 2022
ba3ff72
Update CHANGELOG
Shr3ps Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ module "acr" {
| velero\_chart\_repository | URL of the Helm chart repository | `string` | `"https://vmware-tanzu.github.io/helm-charts"` | no |
| velero\_chart\_version | Velero helm chart version to use | `string` | `"2.12.13"` | no |
| velero\_namespace | Kubernetes namespace in which to deploy Velero | `string` | `"system-velero"` | no |
| velero\_storage\_settings | Settings for Storage account and blob container for Velero<pre>map(object({ <br> name = string <br> resource_group_name = string <br> location = string <br> account_tier = string <br> account_replication_type = string <br> tags = map(any) <br> allowed_cidrs = list(string) <br> allowed_subnet_ids = list(string) <br> container_name = string <br>}))</pre> | `map(any)` | `{}` | no |
| velero\_storage\_settings | Settings for Storage account and blob container for Velero | <pre>object({<br> name = optional(string)<br> resource_group_name = optional(string)<br> location = optional(string)<br> account_tier = optional(string)<br> account_replication_type = optional(string)<br> tags = optional(map(any))<br> allowed_cidrs = optional(list(string))<br> allowed_subnet_ids = optional(list(string))<br> container_name = optional(string)<br> })</pre> | `null` | no |
| velero\_values | Settings for Velero helm chart:<pre>map(object({<br> configuration.backupStorageLocation.bucket = string <br> configuration.backupStorageLocation.config.resourceGroup = string <br> configuration.backupStorageLocation.config.storageAccount = string <br> configuration.backupStorageLocation.name = string <br> configuration.provider = string <br> configuration.volumeSnapshotLocation.config.resourceGroup = string <br> configuration.volumeSnapshotLocation.name = string <br> credential.exstingSecret = string <br> credentials.useSecret = string <br> deployRestic = string <br> env.AZURE_CREDENTIALS_FILE = string <br> metrics.enabled = string <br> rbac.create = string <br> schedules.daily.schedule = string <br> schedules.daily.template.includedNamespaces = string <br> schedules.daily.template.snapshotVolumes = string <br> schedules.daily.template.ttl = string <br> serviceAccount.server.create = string <br> snapshotsEnabled = string <br> initContainers[0].name = string <br> initContainers[0].image = string <br> initContainers[0].volumeMounts[0].mountPath = string <br> initContainers[0].volumeMounts[0].name = string <br> image.repository = string <br> image.tag = string <br> image.pullPolicy = string <br><br>}))</pre> | `map(string)` | `{}` | no |
| vnet\_id | Vnet id that Aks MSI should be network contributor in a private cluster | `string` | `null` | no |

Expand Down
31 changes: 13 additions & 18 deletions tools/velero/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,19 @@ variable "velero_chart_repository" {
}

variable "velero_storage_settings" {
description = <<EOVS
Settings for Storage account and blob container for Velero

map(object({
name = string
resource_group_name = string
location = string
account_tier = string
account_replication_type = string
tags = map(any)
allowed_cidrs = list(string)
allowed_subnet_ids = list(string)
container_name = string
}))

EOVS
type = map(any)
default = {}
description = "Settings for Storage account and blob container for Velero"
default = null
type = object({
name = optional(string)
resource_group_name = optional(string)
location = optional(string)
account_tier = optional(string)
account_replication_type = optional(string)
tags = optional(map(any))
allowed_cidrs = optional(list(string))
allowed_subnet_ids = optional(list(string))
container_name = optional(string)
})
}

variable "velero_values" {
Expand Down
2 changes: 2 additions & 0 deletions tools/velero/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
terraform {
required_version = "> 0.13.0"
experiments = [module_variable_optional_attrs]

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down
31 changes: 13 additions & 18 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,24 +402,19 @@ variable "enable_velero" {
}

variable "velero_storage_settings" {
description = <<EOVS
Settings for Storage account and blob container for Velero
```
map(object({
name = string
resource_group_name = string
location = string
account_tier = string
account_replication_type = string
tags = map(any)
allowed_cidrs = list(string)
allowed_subnet_ids = list(string)
container_name = string
}))
```
EOVS
type = map(any)
default = {}
description = "Settings for Storage account and blob container for Velero"
default = null
type = object({
name = optional(string)
resource_group_name = optional(string)
location = optional(string)
account_tier = optional(string)
account_replication_type = optional(string)
tags = optional(map(any))
allowed_cidrs = optional(list(string))
allowed_subnet_ids = optional(list(string))
container_name = optional(string)
})
}

variable "velero_values" {
Expand Down
2 changes: 2 additions & 0 deletions versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
terraform {
required_version = ">= 0.13.0"
experiments = [module_variable_optional_attrs]

required_providers {
azurerm = {
source = "hashicorp/azurerm"
Expand Down