Skip to content

Commit 51e50e5

Browse files
committed
updated namespace condition
1 parent 8853ebb commit 51e50e5

File tree

3 files changed

+39
-14
lines changed

3 files changed

+39
-14
lines changed

README.md

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,32 @@ This module allows you to easily deploy a MySQL database on Kubernetes using Hel
1717
## Usage Example
1818

1919
```hcl
20+
locals {
21+
name = "mysql"
22+
region = "us-east-2"
23+
environment = "prod"
24+
additional_tags = {
25+
Owner = "organization_name"
26+
Expires = "Never"
27+
Department = "Engineering"
28+
}
29+
create_namespace = true
30+
namespace = "mysql"
31+
store_password_to_secret_manager = false
32+
mysqldb_custom_credentials_enabled = true
33+
mysqldb_custom_credentials_config = {
34+
root_user = "root"
35+
root_password = "RJDRIFsYC8ZS1WQuV0ps"
36+
custom_username = "admin"
37+
custom_user_password = "NCPFUKEMd7rrWuvMAa73"
38+
replication_user = "replicator"
39+
replication_password = "nvAHhm1uGQNYWVw6ZyAH"
40+
exporter_user = "mysqld_exporter"
41+
exporter_password = "ZawhvpueAehRdKFlbjaq"
42+
}
43+
custom_user_username = "custom"
44+
}
45+
2046
module "aws" {
2147
source = "squareops/mysql/kubernetes//modules/resources/aws"
2248
cluster_name = "prod-eks"
@@ -39,21 +65,20 @@ module "aws" {
3965
4066
module "mysql" {
4167
source = "squareops/mysql/kubernetes/"
42-
create_namespace = local.create_namespace
43-
namespace = local.namespace
68+
create_namespace = false
69+
namespace = "prod"
4470
mysqldb_config = {
45-
name = local.name
46-
values_yaml = file("./helm/values.yaml")
71+
name = "mysql"
4772
app_version = "8.0.29-debian-11-r9"
48-
environment = local.environment
73+
environment = "prod"
4974
architecture = "replication"
5075
custom_database = "test_db"
5176
storage_class_name = "gp2"
5277
custom_user_username = local.mysqldb_custom_credentials_enabled ? "" : local.custom_user_username
5378
primary_db_volume_size = "10Gi"
5479
secondary_db_volume_size = "10Gi"
5580
secondary_db_replica_count = 2
56-
store_password_to_secret_manager = local.store_password_to_secret_manager
81+
store_password_to_secret_manager = true
5782
}
5883
mysqldb_custom_credentials_enabled = local.mysqldb_custom_credentials_enabled
5984
mysqldb_custom_credentials_config = local.mysqldb_custom_credentials_config

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resource "helm_release" "mysqldb" {
1212
chart = "mysql"
1313
version = var.chart_version
1414
timeout = 600
15-
namespace = var.create_namespace ? var.namespace : "default"
15+
namespace = var.namespace
1616
repository = "https://charts.bitnami.com/bitnami"
1717
values = [
1818
templatefile("${path.module}/helm/values/mysqldb/values.yaml", {
@@ -27,7 +27,7 @@ resource "helm_release" "mysqldb" {
2727
replication_password = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.replication_password : var.mysqldb_replication_user_password,
2828
mysqldb_root_password = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.root_password : var.root_password,
2929
mysqldb_exporter_enabled = var.mysqldb_exporter_enabled,
30-
service_monitor_namespace = var.create_namespace ? var.namespace : "default"
30+
service_monitor_namespace = var.namespace
3131
metrics_exporter_password = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.exporter_password : var.metric_exporter_pasword,
3232
secondary_pod_replica_count = var.mysqldb_config.secondary_db_replica_count
3333
}),
@@ -41,7 +41,7 @@ resource "helm_release" "mysqldb_backup" {
4141
name = "mysqldb-backup"
4242
chart = "${path.module}/modules/backup"
4343
timeout = 600
44-
namespace = var.create_namespace ? var.namespace : "default"
44+
namespace = var.namespace
4545
values = [
4646
templatefile("${path.module}/helm/values/backup/values.yaml", {
4747
bucket_uri = var.mysqldb_backup_config.bucket_uri,
@@ -65,7 +65,7 @@ resource "helm_release" "mysqldb_restore" {
6565
name = "mysqldb-restore"
6666
chart = "${path.module}/modules/restore"
6767
timeout = 600
68-
namespace = var.create_namespace ? var.namespace : "default"
68+
namespace = var.namespace
6969
values = [
7070
templatefile("${path.module}/helm/values/restore/values.yaml", {
7171
bucket_uri = var.mysqldb_restore_config.bucket_uri,

output.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ output "mysqldb_endpoints" {
22
description = "MySQL endpoints in the Kubernetes cluster."
33
value = {
44
mysqlport = "3306",
5-
mysql_primary_endpoint = var.create_namespace ? "mysqldb-primary.${var.namespace}.svc.cluster.local" : "mysqldb-primary.default.svc.cluster.local",
6-
mysql_primary_headless_endpoint = var.create_namespace ? "mysqldb-primary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-primary-headless.default.svc.cluster.local",
7-
mysql_secondary_endpoint = var.create_namespace ? "mysqldb-secondary.${var.namespace}.svc.cluster.local" : "mysqldb-secondary.default.svc.cluster.local",
8-
mysql_secondary_headless_endpoint = var.create_namespace ? "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-secondary-headless.default.svc.cluster.local",
5+
mysql_primary_endpoint = "mysqldb-primary.${var.namespace}.svc.cluster.local",
6+
mysql_primary_headless_endpoint = "mysqldb-primary-headless.${var.namespace}.svc.cluster.local",
7+
mysql_secondary_endpoint = "mysqldb-secondary.${var.namespace}.svc.cluster.local",
8+
mysql_secondary_headless_endpoint = "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local"
99
}
1010
}
1111

0 commit comments

Comments
 (0)