Skip to content

Commit 021156d

Browse files
stxkxsstxkxs
committed
update context variables from host/hosted to platform/deployment, fix conf.mustache structure
1 parent aa7d441 commit 021156d

File tree

9 files changed

+79
-80
lines changed

9 files changed

+79
-80
lines changed

‎src/main/resources/production/v1/conf.mustache‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
platform:
2-
common:
3-
id: {{platform:id}}
4-
organization: {{platform:organization}}
5-
account: {{platform:account}}
6-
region: {{platform:region}}
7-
name: {{platform:name}}
8-
alias: {{platform:alias}}
9-
environment: {{platform:environment}}
10-
version: {{platform:version}}
11-
domain: {{platform:domain}}
12-
tags:
13-
"{{platform:domain}}:billing": {{platform:organization}}
14-
"{{platform:domain}}:managed-by": {{platform:organization}}
15-
"{{platform:domain}}:account": {{platform:account}}
16-
"{{platform:domain}}:region": {{platform:region}}
17-
"{{platform:domain}}:name": {{platform:name}}
18-
"{{platform:domain}}:alias": {{platform:alias}}
19-
"{{platform:domain}}:environment": {{platform:environment}}
20-
"{{platform:domain}}:version": {{platform:version}}
21-
"{{platform:domain}}:part-of": {{platform:organization}}.{{platform:account}}.{{platform:name}}.{{platform:alias}}
2+
id: {{platform:id}}
3+
organization: {{platform:organization}}
4+
account: {{platform:account}}
5+
region: {{platform:region}}
6+
name: {{platform:name}}
7+
alias: {{platform:alias}}
8+
environment: {{platform:environment}}
9+
version: {{platform:version}}
10+
domain: {{platform:domain}}
11+
tags:
12+
"{{platform:domain}}:billing": {{platform:organization}}
13+
"{{platform:domain}}:managed-by": {{platform:organization}}
14+
"{{platform:domain}}:account": {{platform:account}}
15+
"{{platform:domain}}:region": {{platform:region}}
16+
"{{platform:domain}}:name": {{platform:name}}
17+
"{{platform:domain}}:alias": {{platform:alias}}
18+
"{{platform:domain}}:environment": {{platform:environment}}
19+
"{{platform:domain}}:version": {{platform:version}}
20+
"{{platform:domain}}:part-of": {{platform:organization}}.{{platform:account}}.{{platform:name}}.{{platform:alias}}
2221

23-
deployment:
22+
release:
2423
common:
2524
id: {{deployment:id}}
2625
organization: {{deployment:organization}}
2726
account: {{deployment:account}}
2827
region: {{deployment:region}}
29-
name: {{deployment:name}}
30-
alias: {{deployment:alias}}
28+
name: {{deployment:team:name}}
29+
alias: {{deployment:team:alias}}
3130
environment: {{deployment:environment}}
3231
version: {{deployment:version}}
3332
domain: {{deployment:domain}}
@@ -36,11 +35,11 @@ deployment:
3635
"{{deployment:domain}}:managed-by": {{deployment:organization}}
3736
"{{deployment:domain}}:account": {{deployment:account}}
3837
"{{deployment:domain}}:region": {{deployment:region}}
39-
"{{deployment:domain}}:name": {{deployment:name}}
40-
"{{deployment:domain}}:alias": {{deployment:alias}}
38+
"{{deployment:domain}}:name": {{deployment:team:name}}
39+
"{{deployment:domain}}:alias": {{deployment:team:alias}}
4140
"{{deployment:domain}}:environment": {{deployment:environment}}
4241
"{{deployment:domain}}:version": {{deployment:version}}
43-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
42+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
4443
{{#deployment:tags}}
4544
"{{key}}": "{{value}}"
4645
{{/deployment:tags}}
@@ -71,7 +70,7 @@ deployment:
7170
"{{deployment:domain}}:type": public
7271
"{{deployment:domain}}:cidrMask": 24
7372
"{{deployment:domain}}:component": {{deployment:id}}-vpc
74-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
73+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
7574
"karpenter.sh/discovery": {{deployment:id}}-vpc
7675
- name: private
7776
cidrMask: 24
@@ -83,15 +82,15 @@ deployment:
8382
"{{deployment:domain}}:type": private_with_egress
8483
"{{deployment:domain}}:cidrMask": 24
8584
"{{deployment:domain}}:component": {{deployment:id}}-vpc
86-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
85+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
8786
"karpenter.sh/discovery": {{deployment:id}}-vpc
8887
tags:
8988
"{{deployment:domain}}:resource-type": vpc
9089
"{{deployment:domain}}:category": network
9190
"{{deployment:domain}}:type": network
9291
"{{deployment:domain}}:cidrMask": 24
9392
"{{deployment:domain}}:component": {{deployment:id}}-vpc
94-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
93+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
9594

9695
eks:
9796
name: {{deployment:id}}-eks
@@ -120,14 +119,14 @@ deployment:
120119
"{{deployment:domain}}/account": {{deployment:account}}
121120
"{{deployment:domain}}/region": {{deployment:region}}
122121
"{{deployment:domain}}/version": {{deployment:version}}
123-
"{{deployment:domain}}/service": {{deployment:name}}
124-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
122+
"{{deployment:domain}}/service": {{deployment:team:name}}
123+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
125124
tags:
126125
"{{deployment:domain}}:resource-type": eks
127126
"{{deployment:domain}}:category": eks
128127
"{{deployment:domain}}:type": analytics
129128
"{{deployment:domain}}:component": {{deployment:id}}-eks
130-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
129+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
131130
"karpenter.sh/discovery": {{deployment:id}}-vpc
132131

133132
druid:

‎src/main/resources/production/v1/druid/setup/access.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ serviceAccount:
77
"{{deployment:domain}}/category": compute.storage
88
"{{deployment:domain}}/type": analytics
99
"{{deployment:domain}}/component": druid-access
10-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
10+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
1111
annotations: { }
1212
role:
1313
name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-sa
@@ -54,4 +54,4 @@ serviceAccount:
5454
"{{deployment:domain}}:category": compute.storage
5555
"{{deployment:domain}}:type": analytics
5656
"{{deployment:domain}}:component": {{deployment:id}}-druid-access
57-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
57+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"

‎src/main/resources/production/v1/druid/setup/ingestion.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kafka:
1111
"{{deployment:domain}}/category": druid
1212
"{{deployment:domain}}/type": ingestion
1313
"{{deployment:domain}}/component": api
14-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
14+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
1515
annotations: { }
1616
role:
1717
name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msk-sa
@@ -31,10 +31,10 @@ kafka:
3131
"{{deployment:domain}}:category": api
3232
"{{deployment:domain}}:type": ingest
3333
"{{deployment:domain}}:component": {{deployment:id}}-api
34-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
34+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
3535
tags:
3636
"{{deployment:domain}}:resource-type": msk
3737
"{{deployment:domain}}:category": compute
3838
"{{deployment:domain}}:type": streaming
3939
"{{deployment:domain}}:component": {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msk
40-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
40+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"

‎src/main/resources/production/v1/druid/setup/storage.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ indexLogs:
2323
"{{deployment:domain}}:category": storage
2424
"{{deployment:domain}}:type": analytics
2525
"{{deployment:domain}}:component": {{deployment:id}}-druid-indexlogs
26-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
26+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
2727

2828
deepStorage:
2929
name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-deepstorage
@@ -50,7 +50,7 @@ deepStorage:
5050
"{{deployment:domain}}:category": storage
5151
"{{deployment:domain}}:type": analytics
5252
"{{deployment:domain}}:component": {{deployment:id}}-druid-deepstorage
53-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
53+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
5454

5555
multiStageQuery:
5656
name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msq
@@ -77,7 +77,7 @@ multiStageQuery:
7777
"{{deployment:domain}}:category": storage
7878
"{{deployment:domain}}:type": analytics
7979
"{{deployment:domain}}:component": {{deployment:id}}-druid-multi-stage-query
80-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
80+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
8181

8282
metadata:
8383
name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-metadata
@@ -121,4 +121,4 @@ metadata:
121121
"{{deployment:domain}}:category": storage
122122
"{{deployment:domain}}:type": metadata
123123
"{{deployment:domain}}:component": {{deployment:id}}-druid-metadata
124-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
124+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"

‎src/main/resources/production/v1/druid/values.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ hostedId: "{{deployment:id}}"
33
account: "{{deployment:account}}"
44
region: "{{deployment:region}}"
55
environment: "{{deployment:environment}}"
6-
name: "{{deployment:name}}"
7-
alias: "{{deployment:alias}}"
6+
name: "{{deployment:team:name}}"
7+
alias: "{{deployment:team:alias}}"
88
version: "{{deployment:version}}"
99
domain: "{{deployment:domain}}"
1010
organization: "{{deployment:organization}}"
@@ -23,8 +23,8 @@ labels:
2323
"{{deployment:domain}}/category": compute.storage
2424
"{{deployment:domain}}/type": analytics
2525
"{{deployment:domain}}/id": "{{deployment:id}}"
26-
"{{deployment:domain}}/name": "{{deployment:name}}"
27-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
26+
"{{deployment:domain}}/name": "{{deployment:team:name}}"
27+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
2828

2929
annotations:
3030
"k8s.grafana.com/scrape": "true"

‎src/main/resources/production/v1/eks/addons.mustache‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ version: v1.20.5-eksbuild.1
1414
"{{deployment:domain}}/category": network
1515
"{{deployment:domain}}/type": operations
1616
"{{deployment:domain}}/component": aws-vpc-cni.aws-node
17-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
17+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
1818
annotations: { }
1919
role:
2020
name: {{deployment:id}}-vpc-cni
@@ -26,7 +26,7 @@ version: v1.20.5-eksbuild.1
2626
"{{deployment:domain}}:category": network
2727
"{{deployment:domain}}:type": operations
2828
"{{deployment:domain}}:component": {{deployment:id}}-aws-vpc-cni.aws-node
29-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
29+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
3030
awsEbsCsi:
3131
name: aws-ebs-csi-driver
3232
version: v1.53.0-eksbuild.1
@@ -41,7 +41,7 @@ version: v1.53.0-eksbuild.1
4141
"{{deployment:domain}}/category": storage
4242
"{{deployment:domain}}/type": operations
4343
"{{deployment:domain}}/component": aws-ebs-cni
44-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
44+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
4545
annotations: { }
4646
role:
4747
name: {{deployment:id}}-aws-ebs-csi-sa
@@ -58,7 +58,7 @@ version: v1.53.0-eksbuild.1
5858
"{{deployment:domain}}:category": storage
5959
"{{deployment:domain}}:type": operations
6060
"{{deployment:domain}}:component": {{deployment:id}}-aws-ebs-cni
61-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
61+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
6262
defaultStorageClass: eks/storage-class.yaml
6363
kms:
6464
alias: {{deployment:id}}-eks-ebs-encryption
@@ -97,7 +97,7 @@ version: v5.0.0-eksbuild.1
9797
"{{deployment:domain}}/category": monitoring
9898
"{{deployment:domain}}/type": operations
9999
"{{deployment:domain}}/component": amazon-cloudwatch-observability
100-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
100+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
101101
annotations: { }
102102
role:
103103
name: {{deployment:id}}-cloudwatch-agent-sa
@@ -110,7 +110,7 @@ version: v5.0.0-eksbuild.1
110110
"{{deployment:domain}}:category": monitoring
111111
"{{deployment:domain}}:type": operations
112112
"{{deployment:domain}}:component": {{deployment:id}}-cloudwatch-agent
113-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
113+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
114114
certManager:
115115
chart:
116116
name: cert-manager
@@ -144,7 +144,7 @@ karpenter:
144144
"{{deployment:domain}}/category": operations
145145
"{{deployment:domain}}/type": autoscale
146146
"{{deployment:domain}}/component": karpenter
147-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
147+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
148148
annotations: { }
149149
role:
150150
name: {{deployment:id}}-karpenter-sa
@@ -169,7 +169,7 @@ karpenter:
169169
"{{deployment:domain}}:category": karpenter
170170
"{{deployment:domain}}:type": operations
171171
"{{deployment:domain}}:component": {{deployment:id}}-eks
172-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
172+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
173173
awsLoadBalancer:
174174
chart:
175175
name: aws-load-balancer-controller
@@ -187,7 +187,7 @@ awsLoadBalancer:
187187
"{{deployment:domain}}/category": ingress
188188
"{{deployment:domain}}/type": operations
189189
"{{deployment:domain}}/component": aws-load-balancer
190-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
190+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
191191
annotations: { }
192192
role:
193193
name: {{deployment:id}}-aws-load-balancer-sa
@@ -201,7 +201,7 @@ awsLoadBalancer:
201201
"{{deployment:domain}}:category": ingress
202202
"{{deployment:domain}}:type": operations
203203
"{{deployment:domain}}:component": {{deployment:id}}-aws-load-balancer
204-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
204+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
205205
alloyOperator:
206206
chart:
207207
name: alloy-operator

‎src/main/resources/production/v1/eks/node-groups.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
"{{deployment:domain}}:category": compute
2323
"{{deployment:domain}}:type": core-node
2424
"{{deployment:domain}}:component": {{deployment:id}}-eks
25-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
25+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
2626
labels:
2727
"{{deployment:domain}}/resource-type": node
2828
"{{deployment:domain}}/category": compute
2929
"{{deployment:domain}}/type": core-node
3030
"{{deployment:domain}}/component": eks
31-
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
31+
"{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
3232
"karpenter.sh/discovery": {{deployment:id}}-vpc
3333
tags:
3434
"{{deployment:domain}}:resource-type": node
3535
"{{deployment:domain}}:category": compute
3636
"{{deployment:domain}}:type": core-node
3737
"{{deployment:domain}}:component": {{deployment:id}}-eks
38-
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:name}}.{{deployment:alias}}"
38+
"{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
3939
"eks.amazonaws.com/nodegroup": {{deployment:id}}-core-node
4040
"karpenter.sh/discovery": {{deployment:id}}-vpc

0 commit comments

Comments
 (0)