Skip to content

Commit cdaeec0

Browse files
committed
helmfile: services: rename redbot into redbot-main, add redbot-premiers deployment
1 parent 1f4bf88 commit cdaeec0

9 files changed

+88
-36
lines changed

helmfile/services/helmfile.yaml

+24-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ releases:
3333
inherit:
3434
- template: argocd-app
3535

36-
- name: redbot
36+
- name: redbot-main
3737
chart: bjw-s/app-template
3838
version: 3.7.0
3939
inherit:
@@ -42,13 +42,32 @@ releases:
4242
# https://github.com/roboll/helmfile/issues/1329 result
4343
# This pattern will be shared by all metube deployments for the time being
4444
labels:
45-
vaultRole: redbot
46-
vaultSubPath: redbot
47-
appName: redbot
45+
vaultRole: redbot-main
46+
vaultSubPath: redbot/main
47+
appName: redbot-main
4848
values:
4949
- values/redbot-common.yaml.gotmpl
5050

51-
- name: redbot
51+
- name: redbot-main
52+
inherit:
53+
- template: argocd-app
54+
55+
- name: redbot-premiers
56+
chart: bjw-s/app-template
57+
version: 3.7.0
58+
inherit:
59+
- template: default
60+
# Using labels as "release values", in anticipation of
61+
# https://github.com/roboll/helmfile/issues/1329 result
62+
# This pattern will be shared by all metube deployments for the time being
63+
labels:
64+
vaultRole: redbot-premiers
65+
vaultSubPath: redbot/premiers
66+
appName: redbot-premiers
67+
values:
68+
- values/redbot-common.yaml.gotmpl
69+
70+
- name: redbot-premiers
5271
inherit:
5372
- template: argocd-app
5473

helmfile/services/values/redbot-common.yaml.gotmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ controllers:
3232
TOKEN:
3333
valueFrom:
3434
secretKeyRef:
35-
name: redbot-secrets
35+
name: {{ .Release.Labels.appName }}-secrets
3636
key: token
3737
resources:
3838
limits:

helmfile/services/values/redbot-premiers.yaml.gotmpl

Whitespace-only changes.
+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
resource "vault_kubernetes_auth_backend_role" "redbot-main" {
2+
backend = vault_auth_backend.kubernetes_homeserver.path
3+
role_name = "redbot-main"
4+
bound_service_account_namespaces = ["redbot-main"]
5+
token_ttl = 3600
6+
bound_service_account_names = ["redbot"]
7+
token_policies = ["redbot-main"]
8+
}
9+
10+
resource "vault_policy" "redbot-main" {
11+
name = "redbot-main"
12+
13+
policy = <<EOT
14+
path "kvv2/data/services/redbot/main/secrets" {
15+
capabilities = ["read"]
16+
}
17+
EOT
18+
}
19+
20+
resource "vault_generic_secret" "redbot-main-secrets" {
21+
path = "kvv2/services/redbot/main/secrets"
22+
23+
data_json = jsonencode(
24+
{
25+
"token" : var.redbot_main_token
26+
}
27+
)
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
resource "vault_kubernetes_auth_backend_role" "redbot-premiers" {
2+
backend = vault_auth_backend.kubernetes_homeserver.path
3+
role_name = "redbot-premiers"
4+
bound_service_account_namespaces = ["redbot-premiers"]
5+
token_ttl = 3600
6+
bound_service_account_names = ["redbot"]
7+
token_policies = ["redbot-premiers"]
8+
}
9+
10+
resource "vault_policy" "redbot-premiers" {
11+
name = "redbot-premiers"
12+
13+
policy = <<EOT
14+
path "kvv2/data/services/redbot/premiers/secrets" {
15+
capabilities = ["read"]
16+
}
17+
EOT
18+
}
19+
20+
resource "vault_generic_secret" "redbot-premiers-secrets" {
21+
path = "kvv2/services/redbot/premiers/secrets"
22+
23+
data_json = jsonencode(
24+
{
25+
"token" : var.redbot_premiers_token
26+
}
27+
)
28+
}

helmfile/vault-terraform/redbot.tf

-28
This file was deleted.

helmfile/vault-terraform/terraform.tfvars.example

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ home_assistant_prometheus_token = "example_token"
4444
# Can be generated with pwgen 20 1
4545
invidious_hmac_key = "example_key"
4646
#redbot_owner = ""
47-
redbot_token = ""
47+
redbot_main_token = ""
48+
redbot_premiers_token = ""
4849
homepage_jellyfin_apikey = ""
4950
# Can be generated with pwgen 20 1
5051
paperless_secret_key = "example_key"

helmfile/vault-terraform/variables.tf

+5-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,11 @@ variable "invidious_hmac_key" {
138138
# type = string
139139
#}
140140

141-
variable "redbot_token" {
141+
variable "redbot_main_token" {
142+
type = string
143+
}
144+
145+
variable "redbot_premiers_token" {
142146
type = string
143147
}
144148

0 commit comments

Comments
 (0)