Skip to content

Commit 7cf2fb7

Browse files
author
Andreas Mautsch
committed
secrets
1 parent c6f5ef4 commit 7cf2fb7

File tree

8 files changed

+29
-12
lines changed

8 files changed

+29
-12
lines changed

helm/core/core/application/templates/deployment.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ spec:
4343
name: {{ include "application.fullname" . }}-config
4444
- configMapRef:
4545
name: {{ include "application.fullname" . }}-config-log
46+
{{- range .Values.secrets }}
4647
- secretRef:
47-
name: {{ include "application.fullname" . }}-secret
48-
48+
name: {{ .name }}
49+
{{- end }}
4950
#resources and commands and args
5051
{{ if and (ne .Values.image.arch "-native") (ne .Values.image.arch "-native-arm64v8") }}
5152
{{- with .Values.resourcesAnnotations }}

helm/core/core/application/values.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ initContainers:
5353
oidc:
5454
enabled:
5555

56-
5756
multiTenancy:
58-
tenants: "0,5"
57+
tenants: "0,5"
58+
59+
secrets:
60+
- name: postgresql-secret
61+
- name: kafka-secret
62+
- name: s3-secret
File renamed without changes.

terraform/data/kafka.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "helm_release" "kafka" {
3636
}
3737
set_sensitive {
3838
name = "sasl.client.passwords[0]"
39-
value = kubernetes_secret.kafka_secret.data["password"]
39+
value = kubernetes_secret.kafka_secret["core"].data["password"]
4040
}
4141
set {
4242
name = "networkPolicy.enabled"

terraform/data/postgres.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ resource "helm_release" "postgresql" {
2727
}
2828
set_sensitive {
2929
name = "global.postgresql.auth.username"
30-
value = kubernetes_secret.postgresql_secret.data["username"]
30+
value = kubernetes_secret.postgresql_secret["core"].data["username"]
3131
}
3232
set_sensitive {
3333
name = "global.postgresql.auth.password"
34-
value = kubernetes_secret.postgresql_secret.data["password"]
34+
value = kubernetes_secret.postgresql_secret["core"].data["password"]
3535
}
3636
set {
3737
name = "primary.networkPolicy.enabled"

terraform/data/s3-minio.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ resource "helm_release" "s3-minio" {
1313

1414
set {
1515
name = "auth.rootUser"
16-
value = kubernetes_secret.s3_secret.data["username"]
16+
value = kubernetes_secret.s3_secret["core"].data["username"]
1717
}
1818
set_sensitive {
1919
name = "auth.rootPassword"
20-
value = kubernetes_secret.s3_secret.data["password"]
20+
value = kubernetes_secret.s3_secret["core"].data["password"]
2121
}
2222
set {
2323
name = "readinessProbe.initialDelaySeconds"

terraform/data/secrets.tf

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@ resource "random_password" "oidc_session_secret" {
1313
special = false
1414
}
1515

16+
variable "namespaces" {
17+
type = list(string)
18+
default = ["data", "core", "event", "invoice"]
19+
}
20+
1621
resource "kubernetes_secret" "postgresql_secret" {
22+
for_each = toset(var.namespaces)
23+
1724
metadata {
1825
name = "postgresql-secret"
19-
namespace = "data"
26+
namespace = each.key
2027
}
2128

2229
data = {
@@ -30,10 +37,13 @@ resource "kubernetes_secret" "postgresql_secret" {
3037
type = "Opaque"
3138
}
3239

40+
3341
resource "kubernetes_secret" "s3_secret" {
42+
for_each = toset(var.namespaces)
43+
3444
metadata {
3545
name = "s3-secret"
36-
namespace = "data"
46+
namespace = each.key
3747
}
3848

3949
data = {
@@ -48,9 +58,11 @@ resource "kubernetes_secret" "s3_secret" {
4858
}
4959

5060
resource "kubernetes_secret" "kafka_secret" {
61+
for_each = toset(var.namespaces)
62+
5163
metadata {
5264
name = "kafka-secret"
53-
namespace = "data"
65+
namespace = each.key
5466
}
5567

5668
data = {

0 commit comments

Comments
 (0)