From 45987f80a6c5c316560f9c493cb01debc1be7574 Mon Sep 17 00:00:00 2001
From: antonis-snowplow <antonis.kostoudis@snowplowanalytics.com>
Date: Thu, 31 Oct 2024 13:04:49 +0200
Subject: [PATCH] Adds condition to deploy hook job only when we use private
 subnet

---
 CHANGELOG                                             | 4 ++++
 charts/snowplow-iglu-server/Chart.yaml                | 2 +-
 charts/snowplow-iglu-server/README.md                 | 3 ++-
 charts/snowplow-iglu-server/templates/iglu-hooks.yaml | 2 ++
 charts/snowplow-iglu-server/values-aws.yaml.tmpl      | 1 +
 charts/snowplow-iglu-server/values.yaml               | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 61e294b..bdc1d94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 0.1.80 (2024-10-31)
+---------------------------
+charts/snowplow-iglu-server: Adds condition to deploy hook job only when we use private subnet (closes #205)
+
 Version 0.1.79 (2024-10-29)
 ---------------------------
 charts/snowplow-iglu-server: Adds missiing variable to fix bug from previous version (closes #205)
diff --git a/charts/snowplow-iglu-server/Chart.yaml b/charts/snowplow-iglu-server/Chart.yaml
index 9db70b8..03e221b 100644
--- a/charts/snowplow-iglu-server/Chart.yaml
+++ b/charts/snowplow-iglu-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: snowplow-iglu-server
 description: A Helm Chart to deploy the Snowplow Iglu Server project
-version: 0.10.1
+version: 0.10.2
 appVersion: "0.12.0"
 icon: https://raw.githubusercontent.com/snowplow-devops/helm-charts/master/docs/logo/snowplow.png
 home: https://github.com/snowplow-devops/helm-charts
diff --git a/charts/snowplow-iglu-server/README.md b/charts/snowplow-iglu-server/README.md
index ca05b55..25ec248 100644
--- a/charts/snowplow-iglu-server/README.md
+++ b/charts/snowplow-iglu-server/README.md
@@ -122,7 +122,7 @@ When `dev_db` is `true` the hook job `-dev-db-user-setup` will be initiated
 
 ### AWS (EKS) settings
 
-When `dev_db` is `true` the hook job `-create-dev-db` will be initiated
+When `dev_db` and `deploy_rds_into_private_subnet` are both `true` the hook job `-create-dev-db` will be initiated
 
 #### TargetGroup binding
 
@@ -154,6 +154,7 @@ You will need to fill these targeted fields:
 | service.annotations | object | `{}` | Map of annotations to add to the service |
 | service.aws.targetGroupARN | string | `""` | EC2 TargetGroup ARN to bind the service onto |
 | service.aws.dev_db | bool | `false` | Whether we deploy for dev db in AWS |
+| service.aws.deploy_rds_into_private_subnet | bool | `false` | Whether we deploy into private subnets |
 | service.aws.secrets.admin_username | string | `""` | The admin username that will be used for the psql command |
 | service.aws.secrets.admin_password | string | `""` | The admin password that will be used for the psql command |
 | service.config.database.dbname | string | `""` | Postgres database name |
diff --git a/charts/snowplow-iglu-server/templates/iglu-hooks.yaml b/charts/snowplow-iglu-server/templates/iglu-hooks.yaml
index 19b7f74..6f382b7 100644
--- a/charts/snowplow-iglu-server/templates/iglu-hooks.yaml
+++ b/charts/snowplow-iglu-server/templates/iglu-hooks.yaml
@@ -108,6 +108,7 @@ spec:
 {{- end }}
 
 {{- if .Values.service.aws.dev_db }}
+{{- if .Values.service.aws.deploy_rds_into_private_subnet }}
 
 ---
 
@@ -159,3 +160,4 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/snowplow-iglu-server/values-aws.yaml.tmpl b/charts/snowplow-iglu-server/values-aws.yaml.tmpl
index c4ad69c..fc0dda7 100644
--- a/charts/snowplow-iglu-server/values-aws.yaml.tmpl
+++ b/charts/snowplow-iglu-server/values-aws.yaml.tmpl
@@ -32,6 +32,7 @@ service:
 
   aws:
     targetGroupARN: "<target-group-arn>"
+    deploy_rds_into_private_subnet: "<deploy_rds_into_private_subnet>"
     dev_db: "<dev_db>"
     prod_dbname: "<prod_dbname>"
     secrets:
diff --git a/charts/snowplow-iglu-server/values.yaml b/charts/snowplow-iglu-server/values.yaml
index 8859ba7..259ae23 100644
--- a/charts/snowplow-iglu-server/values.yaml
+++ b/charts/snowplow-iglu-server/values.yaml
@@ -97,6 +97,8 @@ service:
     targetGroupARN: ""
     # -- Whether we deploy for dev db
     dev_db: false
+    # -- Whether we deploy into private subnets
+    deploy_rds_into_private_subnet: false
     prod_dbname: ""
     secrets:
       admin_username: ""