Commit f323e5e4 authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Release/0.5.0

parent 7b1009d3
......@@ -27,7 +27,7 @@ Azure environment cost ballpark [estimate](https://tinyurl.com/y4e9s7rf). This i
This document assumes one is running a current version of Ubuntu. Windows users can install the Ubuntu Terminal from the Microsoft Store. The Ubuntu Terminal enables Linux command-line utilities, including bash, ssh, and git that will be useful for the following deployment. _Note: You will need the Windows Subsystem for Linux installed to use the Ubuntu Terminal on Windows_.
Currently the versions in use are [Terraform 0.12.29](https://releases.hashicorp.com/terraform/0.12.29/) and [GO 1.12.14](https://golang.org/dl/).
Currently the versions in use are [Terraform 0.14.3](https://releases.hashicorp.com/terraform/0.14.3/) and [GO 1.12.14](https://golang.org/dl/).
> Note: Terraform and Go are recommended to be installed using a [Terraform Version Manager](https://github.com/tfutils/tfenv) and a [Go Version Manager](https://github.com/stefanmaric/g)
......@@ -47,7 +47,7 @@ az account set --subscription <your_subscription>
### Configure and Work with an Azure Devops Project
> [Role Documentation](https://docs.microsoft.com/en-us/azure/devops/organizations/security/about-security-identity?view=azure-devops): Working on ADO Organizations require certain Roles for the user. To perform these activities a user must be able to create an ADO project in an organization and have administrator level access to the Project created.
> [Role Documentation](https://docs.microsoft.com/en-us/azure/devops/organizations/security/about-security-identity?view=azure-devops): Working on ADO Organizations require certain Roles for the user. To perform these activities a user must be able to create an ADO project in an organization and have administrator level access to the Project created.
Configure an Azure Devops Project in your Organization called `osdu-mvp` and set the cli command to use the organization by default.
......@@ -110,7 +110,7 @@ In order for Automated Pipelines to be able to work with this repository the fol
## Provision the Common Resources
> [Role Documentation](https://docs.microsoft.com/en-us/azure/role-based-access-control/rbac-and-directory-admin-roles): Provisioning Common Resources requires owner access to the subscription, however AD Service Principals are created that will required an AD Admin to grant approval consent on the principals created.
> [Role Documentation](https://docs.microsoft.com/en-us/azure/role-based-access-control/rbac-and-directory-admin-roles): Provisioning Common Resources requires owner access to the subscription, however AD Service Principals are created that will required an AD Admin to grant approval consent on the principals created.
The script `common_prepare.sh` script is a _helper_ script designed to help setup some of the common things that are necessary for infrastructure.
......
......@@ -43,7 +43,7 @@ resources:
variables:
- name: 'TF_VERSION'
value: '0.12.29'
value: '0.14.3'
- name: 'GO_VERSION'
value: '1.12.14'
- name: 'TF_ROOT_DIR'
......
......@@ -42,7 +42,7 @@ resources:
variables:
- name: 'TF_VERSION'
value: '0.12.29'
value: '0.14.3'
- name: 'GO_VERSION'
value: '1.12.14'
- name: 'TF_ROOT_DIR'
......
......@@ -43,7 +43,7 @@ resources:
variables:
- name: 'TF_VERSION'
value: '0.12.29'
value: '0.14.3'
- name: 'GO_VERSION'
value: '1.12.14'
- name: 'TF_ROOT_DIR'
......
......@@ -128,7 +128,8 @@ func Clean() error {
}
if !info.IsDir() && (info.Name() == "terraform.tfstate" ||
info.Name() == "terraform.tfplan" ||
info.Name() == "terraform.tfstate.backup") {
info.Name() == "terraform.tfstate.backup" ||
info.Name() == ".terraform.lock.hcl") {
os.Remove(path)
fmt.Printf("Removed \"%v\"\n", path)
}
......
......@@ -64,9 +64,10 @@ func Clean() error {
fmt.Printf("Removed \"%v\"\n", path)
return filepath.SkipDir
}
if !info.IsDir() && (info.Name() == "terraform.tfstate" ||
if !info.IsDir() && (info.Name() == "terraform.tfstate" ||
info.Name() == "terraform.tfplan" ||
info.Name() == "terraform.tfstate.backup") {
info.Name() == "terraform.tfstate.backup" ||
info.Name() == ".terraform.lock.hcl") {
os.Remove(path)
fmt.Printf("Removed \"%v\"\n", path)
}
......
......@@ -37,7 +37,7 @@ resource "random_id" "main" {
resource "azurerm_log_analytics_workspace" "main" {
count = var.log_analytics_id == "" ? 1 : 0
name = lower("${var.name}")
name = lower(var.name)
resource_group_name = data.azurerm_resource_group.main.name
location = data.azurerm_resource_group.main.location
sku = "PerGB2018"
......
......@@ -23,7 +23,8 @@ module "resource_group" {
}
module "network" {
source = "../../network"
source = "../../network"
depends_on = [module.resource_group]
name = format("osdu-module-vnet-%s", module.resource_group.random)
resource_group_name = module.resource_group.name
......@@ -54,7 +55,8 @@ resource "null_resource" "save-key" {
data "azurerm_client_config" "current" {}
module "aks" {
source = "../"
source = "../"
depends_on = [module.resource_group]
name = format("osdu-module-cluster-%s", module.resource_group.random)
resource_group_name = module.resource_group.name
......@@ -70,4 +72,4 @@ module "aks" {
resource_tags = {
osdu = "module"
}
}
\ No newline at end of file
}
......@@ -24,7 +24,7 @@ import (
var name = "cluster-"
var location = "eastus"
var count = 12
var count = 13
var tfOptions = &terraform.Options{
TerraformDir: "./",
......
......@@ -24,7 +24,8 @@ module "resource_group" {
}
module "app-insights" {
source = "../"
source = "../"
depends_on = [module.resource_group]
appinsights_name = "osdu-module-app-insights-${module.resource_group.random}"
service_plan_resource_group_name = module.resource_group.name
......
......@@ -23,7 +23,8 @@ module "resource_group" {
}
module "app_monitoring" {
source = "../"
source = "../"
depends_on = [module.resource_group]
resource_group_name = module.resource_group.name
action_group_name = var.action_group_name
......@@ -38,4 +39,4 @@ module "app_monitoring" {
# metric_alert_criteria_operator = "${var.metric_alert_criteria_operator}"
# metric_alert_criteria_threshold = "${var.metric_alert_criteria_threshold}"
# monitoring_dimension_values = "${var.monitoring_dimension_values}"
}
\ No newline at end of file
}
......@@ -30,7 +30,8 @@ module "resource_group" {
}
module "keyvault" {
source = "../../keyvault"
source = "../../keyvault"
depends_on = [module.resource_group]
keyvault_name = substr("osdu-module-kv-${module.resource_group.random}", 0, 24)
resource_group_name = module.resource_group.name
......@@ -92,7 +93,8 @@ resource "azurerm_key_vault_certificate" "test" {
module "network" {
source = "../../network"
source = "../../network"
depends_on = [module.resource_group]
name = "osdu-module-vnet-${module.resource_group.random}"
resource_group_name = module.resource_group.name
......@@ -109,7 +111,8 @@ module "network" {
}
module "appgateway" {
source = "../"
source = "../"
depends_on = [module.resource_group]
name = "osdu-module-gw-${module.resource_group.random}"
resource_group_name = module.resource_group.name
......@@ -123,4 +126,4 @@ module "appgateway" {
resource_tags = {
osdu = "module"
}
}
\ No newline at end of file
}
......@@ -25,7 +25,7 @@ import (
var name = "cluster-"
var location = "eastus"
var count = 15
var count = 17
var tfOptions = &terraform.Options{
TerraformDir: "./",
......
......@@ -24,7 +24,8 @@ module "resource_group" {
}
module "container-registry" {
source = "../"
source = "../"
depends_on = [module.resource_group]
resource_group_name = module.resource_group.name
container_registry_name = "osdu-module-container-registry-${module.resource_group.random}"
......
......@@ -25,7 +25,7 @@ import (
)
var location = "eastus"
var count = 5
var count = 6
var workspace = "osdu-services-" + strings.ToLower(random.UniqueId())
var tfOptions = &terraform.Options{
......@@ -60,7 +60,7 @@ func TestTemplate(t *testing.T) {
"sku" : "Standard",
"tags" : {
"osdu" : "module"
}
}
}`)
testFixture := infratests.UnitTestFixture{
......
......@@ -11,7 +11,8 @@ module "resource_group" {
module "cosmosdb_autoscale" {
source = "../"
source = "../"
depends_on = [module.resource_group]
name = "osdu-module-db2-${module.resource_group.random}"
resource_group_name = module.resource_group.name
......@@ -44,4 +45,4 @@ module "cosmosdb_autoscale" {
resource_tags = {
source = "terraform",
}
}
\ No newline at end of file
}
......@@ -24,14 +24,17 @@ module "resource_group" {
}
module "keyvault" {
source = "../../keyvault"
source = "../../keyvault"
depends_on = [module.resource_group]
resource_group_name = module.resource_group.name
}
module "keyvault-policy" {
source = "../"
source = "../"
depends_on = [module.resource_group]
vault_id = module.keyvault.keyvault_id
tenant_id = ""
object_ids = []
}
\ No newline at end of file
}
......@@ -25,7 +25,7 @@ import (
var name = "keyvault-"
var location = "eastus"
var count = 5
var count = 6
var tfOptions = &terraform.Options{
TerraformDir: "./",
......
......@@ -24,7 +24,8 @@ module "resource_group" {
}
module "keyvault" {
source = "../../keyvault"
source = "../../keyvault"
depends_on = [module.resource_group]
resource_group_name = module.resource_group.name
}
......@@ -36,4 +37,4 @@ module "keyvault-secret" {
secrets = {
test = "test"
}
}
\ No newline at end of file
}
......@@ -26,7 +26,7 @@ import (
var workspace = "osdu-services-" + strings.ToLower(random.UniqueId())
var location = "eastus"
var count = 7
var count = 8
var tfOptions = &terraform.Options{
TerraformDir: "./",
......
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