Skip to content

Commit 7c4cb41

Browse files
committed
updated namespace condition
1 parent 387b569 commit 7c4cb41

File tree

3 files changed

+31
-12
lines changed

3 files changed

+31
-12
lines changed

README.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,35 @@ This module creates a Redis master and one or more Redis slaves, depending on th
1919
## Usage Example
2020

2121
```hcl
22-
module "aws" {
23-
source = "squareops/redis/kubernetes//modules/resources/aws"
24-
environment = "prod"
25-
name = "redis"
22+
locals {
23+
name = "redis"
24+
region = "eastus"
25+
environment = "prod"
26+
additional_tags = {
27+
Owner = "organization_name"
28+
Expires = "Never"
29+
Department = "Engineering"
30+
}
31+
create_namespace = true
32+
namespace = "redis"
2633
store_password_to_secret_manager = true
2734
custom_credentials_enabled = true
28-
custom_credentials_config = {
35+
custom_credentials_config = {
2936
password = "aajdhgduy3873683dh"
3037
}
3138
}
3239
40+
module "azure" {
41+
source = "squareops/redis/kubernetes//modules/resources/azure"
42+
resource_group_name = "prod-skaf-rg"
43+
resource_group_location = local.region
44+
environment = local.environment
45+
name = local.name
46+
store_password_to_secret_manager = local.store_password_to_secret_manager
47+
custom_credentials_enabled = local.custom_credentials_enabled
48+
custom_credentials_config = local.custom_credentials_config
49+
}
50+
3351
module "redis" {
3452
source = "squareops/redis/kubernetes"
3553
create_namespace = local.create_namespace
@@ -42,18 +60,19 @@ module "redis" {
4260
architecture = "replication"
4361
slave_volume_size = "10Gi"
4462
master_volume_size = "10Gi"
45-
storage_class_name = "gp2"
63+
storage_class_name = "infra-service-sc"
4664
slave_replica_count = 2
4765
store_password_to_secret_manager = local.store_password_to_secret_manager
48-
secret_provider_type = "aws"
66+
secret_provider_type = "azure"
4967
}
5068
grafana_monitoring_enabled = true
5169
custom_credentials_enabled = local.custom_credentials_enabled
5270
custom_credentials_config = local.custom_credentials_config
53-
redis_password = local.custom_credentials_enabled ? "" : module.aws.redis_password
71+
redis_password = local.custom_credentials_enabled ? "" : module.azure.redis_password
5472
}
5573
5674
75+
5776
```
5877
- Refer [AWS examples](https://github.com/squareops/terraform-kubernetes-redis/tree/main/examples/complete/aws) for more details.
5978
- Refer [Azure examples](https://github.com/squareops/terraform-kubernetes-redis/tree/main/examples/complete/azure) for more details.

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resource "helm_release" "redis" {
1212
chart = "redis"
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/values.yaml", {
@@ -24,7 +24,7 @@ resource "helm_release" "redis" {
2424
storage_class_name = var.redis_config.storage_class_name,
2525
redis_exporter_enabled = var.grafana_monitoring_enabled,
2626
redis_master_volume_size = var.redis_config.master_volume_size
27-
service_monitor_namespace = var.create_namespace ? var.namespace : "default"
27+
service_monitor_namespace = var.namespace
2828
}),
2929
var.redis_config.values_yaml
3030
]

output.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ output "redis_endpoints" {
22
description = "Redis endpoints in the Kubernetes cluster."
33
value = {
44
redis_port = "6379",
5-
redis_master_endpoint = var.create_namespace ? "redis-master.${var.namespace}.svc.cluster.local" : "redis-master.default.svc.cluster.local",
6-
redis_slave_endpoint = var.create_namespace ? "redis-replicas.${var.namespace}.svc.cluster.local" : "redis-replicas.default.svc.cluster.local"
5+
redis_master_endpoint = "redis-master.${var.namespace}.svc.cluster.local",
6+
redis_slave_endpoint = "redis-replicas.${var.namespace}.svc.cluster.local"
77
}
88
}
99

0 commit comments

Comments
 (0)