diff --git a/airflow/helm/values.tmpl.yaml b/airflow/helm/values.tmpl.yaml index f8366be..e2b7dfa 100644 --- a/airflow/helm/values.tmpl.yaml +++ b/airflow/helm/values.tmpl.yaml @@ -134,4 +134,4 @@ extraEnv: | - name: AIRFLOW__WEBSERVER__NAVBAR_COLOR value: "${webserver_navbar_color}" - name: AIRFLOW__WEBSERVER__INSTANCE_NAME - value: "${webserver_instance_name}" + value: "Deployment: ${webserver_instance_name}, ${service_area} Version: ${service_area_version}" diff --git a/terraform-unity/README.md b/terraform-unity/README.md index 21ab7bd..8558227 100644 --- a/terraform-unity/README.md +++ b/terraform-unity/README.md @@ -178,11 +178,11 @@ No resources. | [airflow\_webserver\_password](#input\_airflow\_webserver\_password) | The password for the Airflow webserver and UI. | `string` | n/a | yes | | [counter](#input\_counter) | Identifier used to uniquely distinguish resources. This is used in the naming convention of the resource. If left empty, a random hexadecimal value will be generated and used instead. | `string` | `""` | no | | [deployment\_name](#input\_deployment\_name) | The name of the deployment. | `string` | n/a | yes | -| [docker\_images](#input\_docker\_images) | Docker images for the associated services. |
object({
airflow = object({
name = string
tag = string
}),
ogc_processes_api = object({
name = string
tag = string
})
})
|
{
"airflow": {
"name": "ghcr.io/unity-sds/unity-sps/sps-airflow",
"tag": "develop"
},
"ogc_processes_api": {
"name": "ghcr.io/unity-sds/unity-sps-ogc-processes-api/unity-sps-ogc-processes-api",
"tag": "develop"
}
}
| no | +| [docker\_images](#input\_docker\_images) | Docker images for the associated services. |
object({
airflow = object({
name = string
tag = string
}),
ogc_processes_api = object({
name = string
tag = string
})
})
|
{
"airflow": {
"name": "ghcr.io/unity-sds/unity-sps/sps-airflow",
"tag": "2.0.0"
},
"ogc_processes_api": {
"name": "ghcr.io/unity-sds/unity-sps-ogc-processes-api/unity-sps-ogc-processes-api",
"tag": "2.0.0"
}
}
| no | | [helm\_charts](#input\_helm\_charts) | Helm charts for the associated services. |
map(object({
repository = string
chart = string
version = string
}))
|
{
"airflow": {
"chart": "airflow",
"repository": "https://airflow.apache.org",
"version": "1.11.0"
},
"keda": {
"chart": "keda",
"repository": "https://kedacore.github.io/charts",
"version": "v2.13.1"
}
}
| no | | [kubeconfig\_filepath](#input\_kubeconfig\_filepath) | The path to the kubeconfig file for the Kubernetes cluster. | `string` | n/a | yes | | [project](#input\_project) | The project or mission deploying Unity SPS. | `string` | `"unity"` | no | -| [release](#input\_release) | The software release version. | `string` | n/a | yes | +| [release](#input\_release) | The software release version. | `string` | `"2.0.0"` | no | | [service\_area](#input\_service\_area) | The service area owner of the resources being deployed. | `string` | `"sps"` | no | | [venue](#input\_venue) | The MCP venue in which the resources will be deployed. | `string` | n/a | yes | diff --git a/terraform-unity/modules/terraform-eks-cluster/.terraform.lock.hcl b/terraform-unity/modules/terraform-eks-cluster/.terraform.lock.hcl index 9f18546..f6927f9 100644 --- a/terraform-unity/modules/terraform-eks-cluster/.terraform.lock.hcl +++ b/terraform-unity/modules/terraform-eks-cluster/.terraform.lock.hcl @@ -45,20 +45,20 @@ provider "registry.terraform.io/hashicorp/cloudinit" { } provider "registry.terraform.io/hashicorp/helm" { - version = "2.12.1" + version = "2.13.0" hashes = [ - "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", - "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", - "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", - "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", - "zh:4fd06af3091a382b3f0d8f0a60880f59640d2b6d9d6a31f9a873c6f1bde1ec50", - "zh:6816976b1830f5629ae279569175e88b497abbbac30ee809948a1f923c67a80d", - "zh:7d82c4150cdbf48cfeec867be94c7b9bd7682474d4df0ebb7e24e148f964844f", - "zh:83f062049eea2513118a4c6054fb06c8600bac96196f25aed2cc21898ec86e93", - "zh:a79eec0cf4c08fca79e44033ec6e470f25ff23c3e2c7f9bc707ed7771c1072c0", - "zh:b2b2d904b2821a6e579910320605bc478bbef063579a23fbfdd6fcb5871b81f8", - "zh:e91177ca06a15487fc570cb81ecef6359aa399459ea2aa7c4f7367ba86f6fcad", - "zh:e976bcb82996fc4968f8382bbcb6673efb1f586bf92074058a232028d97825b1", + "h1:jGANeRsj81e6I6LYTV7s+7bOfeb6wtVssAOnbu+ZUWg=", + "zh:016e42bea1c9145b0856bfcf1e5faf657e40e9a94e4d80bee9e0b8742eb9f5fd", + "zh:0a325cfcb62d4c611a9a7854d2ca26ee8cbd27a1cae40f607c0966e36a858358", + "zh:2e22929aa1cc59c02e1cb8af8cee25063a706cdfc15d3aff242c8bf76cd12ea3", + "zh:35d989aa6f43d6401077c190c3262c6df434290c5bec978079ae69eb33f3929e", + "zh:4cc42ee66af3fa965424c19904e5ac52326d4a31df066d565d591d0e46e64c2d", + "zh:69a429be3f7183f53ec1928a44ed7ad0606a0247a7ce34e2c5a8e9d8906dbcbd", + "zh:88155234e7a4d45cc91ebcb2d633fdfc2daad4e85e5b1990c864dab0432afa0e", + "zh:b13055e38617be147e82eec8b20c579e9c202da9ead8c976a54ed08bde6b06f7", + "zh:bc6f8f1f84afcc66c5b248ffa34580d8f7e7552628eb6ad044765513159db8e4", + "zh:d91899fe77e7223d91d2cfed2cacde1afe8b528771402ec4d494b81457421bb1", + "zh:ef5ca86c48a786a0cc481f4cfb1c9f2e3b8eccb640c106c6a1f253f97f5e9c55", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terraform-unity/modules/terraform-eks-cluster/README.md b/terraform-unity/modules/terraform-eks-cluster/README.md index 0805c10..001d555 100644 --- a/terraform-unity/modules/terraform-eks-cluster/README.md +++ b/terraform-unity/modules/terraform-eks-cluster/README.md @@ -21,7 +21,7 @@ | Name | Source | Version | |------|--------|---------| -| [unity-eks](#module\_unity-eks) | git@github.com:unity-sds/unity-cs-infra.git//terraform-unity-eks_module | u-sps-24.1-beta.01 | +| [unity-eks](#module\_unity-eks) | git@github.com:unity-sds/unity-cs-infra.git//terraform-unity-eks_module | unity-sps-2.0.0 | ## Resources diff --git a/terraform-unity/modules/terraform-eks-cluster/main.tf b/terraform-unity/modules/terraform-eks-cluster/main.tf index ba82e35..d372757 100644 --- a/terraform-unity/modules/terraform-eks-cluster/main.tf +++ b/terraform-unity/modules/terraform-eks-cluster/main.tf @@ -3,7 +3,7 @@ resource "random_id" "counter" { } module "unity-eks" { - source = "git@github.com:unity-sds/unity-cs-infra.git//terraform-unity-eks_module?ref=u-sps-24.1-beta.01" + source = "git@github.com:unity-sds/unity-cs-infra.git//terraform-unity-eks_module?ref=unity-sps-2.0.0" deployment_name = local.cluster_name nodegroups = var.nodegroups diff --git a/terraform-unity/modules/terraform-unity-sps-airflow/main.tf b/terraform-unity/modules/terraform-unity-sps-airflow/main.tf index 4ca8f85..35fb96e 100644 --- a/terraform-unity/modules/terraform-unity-sps-airflow/main.tf +++ b/terraform-unity/modules/terraform-unity-sps-airflow/main.tf @@ -400,6 +400,8 @@ resource "helm_release" "airflow" { workers_pvc_name = kubernetes_persistent_volume_claim.efs_pvc.metadata[0].name webserver_instance_name = format(local.resource_name_prefix, "airflow") webserver_navbar_color = local.airflow_webserver_navbar_color + service_area = upper(var.service_area) + service_area_version = var.release }) ] set_sensitive { diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf index f84d4f9..ac8984e 100644 --- a/terraform-unity/variables.tf +++ b/terraform-unity/variables.tf @@ -33,6 +33,7 @@ variable "counter" { variable "release" { description = "The software release version." type = string + default = "2.0.0" } variable "kubeconfig_filepath" { @@ -81,11 +82,11 @@ variable "docker_images" { default = { airflow = { name = "ghcr.io/unity-sds/unity-sps/sps-airflow" - tag = "develop" + tag = "2.0.0" }, ogc_processes_api = { name = "ghcr.io/unity-sds/unity-sps-ogc-processes-api/unity-sps-ogc-processes-api" - tag = "develop" + tag = "2.0.0" } } }