Commit 3f7bce69 authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'issue_5' into 'master'

Added a Secret group called config-storage with the specific key names

See merge request osdu/platform/deployment-and-operations/infra-azure-provisioning!15
parents b18c0f98 30e5e6f7
...@@ -72,19 +72,18 @@ spec: ...@@ -72,19 +72,18 @@ spec:
key: storage-account key: storage-account
- objectName: airflow-storage-key - objectName: airflow-storage-key
key: storage-key key: storage-key
- objectName: airflow-storage-connection
key: storage-connection
- objectName: airflow-remote-log-connection - objectName: airflow-remote-log-connection
key: remote-log-connection key: remote-log-connection
- objectName: airflow-admin-password - objectName: airflow-admin-password
key: admin-password key: admin-password
- objectName: airflow-fernet-key - objectName: airflow-fernet-key
key: fernet-key key: fernet-key
- secretName: fileshare - objectName: airflow-storage
type: Opaque key: azurestorageaccountname
data: - objectName: airflow-storage-key
- objectName: azurestorageaccountname key: azurestorageaccountkey
key: storage-account
- objectName: azurestorageaccountkey
key: storage-key
- secretName: elastic - secretName: elastic
type: Opaque type: Opaque
data: data:
...@@ -192,9 +191,3 @@ spec: ...@@ -192,9 +191,3 @@ spec:
- | - |
objectName: redis-password objectName: redis-password
objectType: secret objectType: secret
- |
objectName: azurestorageaccountname
objectType: secret
- |
objectName: azurestorageaccountkey
objectType: secret
\ No newline at end of file
...@@ -53,7 +53,7 @@ resource "azurerm_key_vault_secret" "storage_key" { ...@@ -53,7 +53,7 @@ resource "azurerm_key_vault_secret" "storage_key" {
resource "azurerm_key_vault_secret" "storage_connection" { resource "azurerm_key_vault_secret" "storage_connection" {
name = local.storage_connection_name name = local.storage_connection_name
value = format("DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s;EndpointSuffix=core.windows.net", local.storage_account_name, module.storage_account.primary_access_key) value = format("DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s;EndpointSuffix=core.windows.net", module.storage_account.name, module.storage_account.primary_access_key)
key_vault_id = data.terraform_remote_state.central_resources.outputs.keyvault_id key_vault_id = data.terraform_remote_state.central_resources.outputs.keyvault_id
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment