File tree 9 files changed +88
-36
lines changed
9 files changed +88
-36
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ releases:
33
33
inherit :
34
34
- template : argocd-app
35
35
36
- - name : redbot
36
+ - name : redbot-main
37
37
chart : bjw-s/app-template
38
38
version : 3.7.0
39
39
inherit :
@@ -42,13 +42,32 @@ releases:
42
42
# https://github.com/roboll/helmfile/issues/1329 result
43
43
# This pattern will be shared by all metube deployments for the time being
44
44
labels :
45
- vaultRole : redbot
46
- vaultSubPath : redbot
47
- appName : redbot
45
+ vaultRole : redbot-main
46
+ vaultSubPath : redbot/main
47
+ appName : redbot-main
48
48
values :
49
49
- values/redbot-common.yaml.gotmpl
50
50
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
52
71
inherit :
53
72
- template : argocd-app
54
73
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ controllers:
32
32
TOKEN:
33
33
valueFrom:
34
34
secretKeyRef:
35
- name: redbot -secrets
35
+ name: {{ .Release.Labels.appName }} -secrets
36
36
key: token
37
37
resources:
38
38
limits:
File renamed without changes.
Original file line number Diff line number Diff line change
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 number Diff line number Diff line change
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
+ }
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -44,7 +44,8 @@ home_assistant_prometheus_token = "example_token"
44
44
# Can be generated with pwgen 20 1
45
45
invidious_hmac_key = "example_key"
46
46
#redbot_owner = ""
47
- redbot_token = ""
47
+ redbot_main_token = ""
48
+ redbot_premiers_token = ""
48
49
homepage_jellyfin_apikey = ""
49
50
# Can be generated with pwgen 20 1
50
51
paperless_secret_key = "example_key"
Original file line number Diff line number Diff line change @@ -138,7 +138,11 @@ variable "invidious_hmac_key" {
138
138
# type = string
139
139
# }
140
140
141
- variable "redbot_token" {
141
+ variable "redbot_main_token" {
142
+ type = string
143
+ }
144
+
145
+ variable "redbot_premiers_token" {
142
146
type = string
143
147
}
144
148
You can’t perform that action at this time.
0 commit comments