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.

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

Release/0.5.1 #24

Merged
merged 2 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 0.5.1 (2024-06-03)
--------------------------
Add support for shared VPC in central project (#23)

Version 0.5.0 (2024-01-25)
--------------------------
Update LICENSE to SLULA (#20)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ module "iglu_lb" {
| <a name="input_java_opts"></a> [java\_opts](#input\_java\_opts) | Custom JAVA Options | `string` | `"-XX:InitialRAMPercentage=75 -XX:MaxRAMPercentage=75"` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | The labels to append to this resource | `map(string)` | `{}` | no |
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | The machine type to use | `string` | `"e2-small"` | no |
| <a name="input_network_project_id"></a> [network\_project\_id](#input\_network\_project\_id) | The project ID of the shared VPC in which the stack is being deployed | `string` | `""` | no |
| <a name="input_patches_allowed"></a> [patches\_allowed](#input\_patches\_allowed) | Whether or not patches are allowed for published Iglu Schemas | `bool` | `true` | no |
| <a name="input_ssh_block_project_keys"></a> [ssh\_block\_project\_keys](#input\_ssh\_block\_project\_keys) | Whether to block project wide SSH keys | `bool` | `true` | no |
| <a name="input_ssh_ip_allowlist"></a> [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | <pre>[<br> "0.0.0.0/0"<br>]</pre> | no |
Expand Down
11 changes: 7 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
locals {
module_name = "iglu-server-ce"
module_version = "0.5.0"
module_version = "0.5.1"

app_name = "iglu-server"
app_version = var.app_version
Expand Down Expand Up @@ -58,7 +58,8 @@ resource "google_project_iam_member" "sa_cloud_sql_client" {
# --- CE: Firewall rules

resource "google_compute_firewall" "ingress_ssh" {
name = "${var.name}-ssh-in"
project = (var.network_project_id != "") ? var.network_project_id : var.project_id
name = "${var.name}-ssh-in"

network = var.network
target_tags = [var.name]
Expand All @@ -76,7 +77,8 @@ resource "google_compute_firewall" "ingress_ssh" {
#
# https://cloud.google.com/load-balancing/docs/health-check-concepts#ip-ranges
resource "google_compute_firewall" "ingress" {
name = "${var.name}-traffic-in"
project = (var.network_project_id != "") ? var.network_project_id : var.project_id
name = "${var.name}-traffic-in"

network = var.network
target_tags = [var.name]
Expand All @@ -90,7 +92,8 @@ resource "google_compute_firewall" "ingress" {
}

resource "google_compute_firewall" "egress" {
name = "${var.name}-traffic-out"
project = (var.network_project_id != "") ? var.network_project_id : var.project_id
name = "${var.name}-traffic-out"

network = var.network
target_tags = [var.name]
Expand Down
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ variable "project_id" {
type = string
}

variable "network_project_id" {
description = "The project ID of the shared VPC in which the stack is being deployed"
type = string
default = ""
}

variable "region" {
description = "The name of the region to deploy within"
type = string
Expand Down
Loading