Skip to content

Commit f36b374

Browse files
authored
MRG: Merge pull request #2 from octue/add-maintainer-names-default
Add `maintainer_service_account_names` variable default
2 parents 218fbeb + 29c2d71 commit f36b374

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

README.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
A Terraform module for deploying the core storage and IAM resources for an Octue Twined services network to google cloud.
33

44

5-
# Resources
5+
# Infrastructure
66
These resources are automatically deployed:
77
- An artifact registry repository for storing Octue Twined service revision docker images
88
- A BigQuery table acting as an event store for Twined service events
@@ -22,8 +22,8 @@ These resources are automatically deployed:
2222
> [!TIP]
2323
> Deploy this module in a separate Terraform configuration (directory/workspace) to the [terraform-octue-twined-cluster](https://github.com/octue/terraform-octue-twined-cluster)
2424
> module. This allows the option to spin down the Kubernetes cluster provided by the other module while keeping the core
25-
> resources that contain all data produced by your Twined services. Spinning the cluster down entirely can save on
26-
> running costs in periods of extended non-use while keeping all data available.
25+
> resources that contain all data produced by your Twined services available. Spinning the cluster down entirely can
26+
> save on running costs in periods of extended non-use while keeping all data available.
2727
2828
Add the below blocks to your Terraform configuration and run:
2929
```shell
@@ -36,7 +36,7 @@ terraform apply
3636
```
3737
and approve the run.
3838

39-
## Minimal configuration
39+
## Example configuration
4040

4141
```terraform
4242
# main.tf
@@ -60,11 +60,10 @@ provider "google" {
6060
6161
6262
module "octue_twined_core" {
63-
source = "git::github.com/octue/terraform-octue-twined-core.git?ref=0.1.0"
63+
source = "git::github.com/octue/terraform-octue-twined-core.git?ref=0.1.1"
6464
google_cloud_project_id = var.google_cloud_project_id
6565
google_cloud_region = var.google_cloud_region
6666
github_account = var.github_account
67-
maintainer_service_account_names = var.maintainer_service_account_names
6867
}
6968
```
7069

@@ -85,11 +84,6 @@ variable "github_account" {
8584
type = string
8685
default = "<your-github-account>"
8786
}
88-
89-
variable "maintainer_service_account_names" {
90-
type = set(string)
91-
default = ["person1", "person2"]
92-
}
9387
```
9488

9589
## Dependencies
@@ -127,13 +121,13 @@ terraform destroy
127121

128122
# Input reference
129123

130-
| Name | Type | Required | Default |
131-
|-------------------------------------|---------------|----------|-----------|
132-
| `google_cloud_project_id` | `string` | Yes | N/A |
133-
| `google_cloud_region` | `string` | Yes | N/A |
134-
| `github_account` | `string` | Yes | N/A |
135-
| `maintainer_service_account_names` | `set(string)` | Yes | N/A |
136-
| `deletion_protection` | `bool` | No | `true` |
124+
| Name | Type | Required | Default |
125+
|-------------------------------------|---------------|----------|---------------|
126+
| `google_cloud_project_id` | `string` | Yes | N/A |
127+
| `google_cloud_region` | `string` | Yes | N/A |
128+
| `github_account` | `string` | Yes | N/A |
129+
| `maintainer_service_account_names` | `set(string)` | No | `["default"]` |
130+
| `deletion_protection` | `bool` | No | `true` |
137131

138132
See [`variables.tf`](/variables.tf) for descriptions.
139133

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.1.1

variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ variable "github_account" {
1818

1919
variable "maintainer_service_account_names" {
2020
type = set(string)
21+
default = ["default"]
2122
description = "The names of each maintainer IAM service account that should be created. They'll automatically be prefixed with 'maintainer-'."
2223
}
2324

0 commit comments

Comments
 (0)