refactor tags to use separate organization, name, alias fields

- remove part-of composite tag in favor of individual fields
- remove redundant environment and version tags from platform/deployment
- simplify platform tags to empty object
- reorganize druid helm chart labels
- delete synthesizer.mustache

Author: stxkxs

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

@@ -8,16 +8,7 @@ platform:
   environment: {{platform:environment}}
   version: {{platform:version}}
   domain: {{platform:domain}}
-  tags:
-    "{{platform:domain}}:billing": {{platform:organization}}
-    "{{platform:domain}}:managed-by": {{platform:organization}}
-    "{{platform:domain}}:account": {{platform:account}}
-    "{{platform:domain}}:region": {{platform:region}}
-    "{{platform:domain}}:name": {{platform:name}}
-    "{{platform:domain}}:alias": {{platform:alias}}
-    "{{platform:domain}}:environment": {{platform:environment}}
-    "{{platform:domain}}:version": {{platform:version}}
-    "{{platform:domain}}:part-of": {{platform:organization}}.{{platform:account}}.{{platform:name}}.{{platform:alias}}
+  tags: {}
 
 release:
   common:
@@ -37,9 +28,6 @@ release:
       "{{deployment:domain}}:region": {{deployment:region}}
       "{{deployment:domain}}:name": {{deployment:team:name}}
       "{{deployment:domain}}:alias": {{deployment:team:alias}}
-      "{{deployment:domain}}:environment": {{deployment:environment}}
-      "{{deployment:domain}}:version": {{deployment:version}}
-      "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
       {{#deployment:tags}}
       "{{key}}": "{{value}}"
       {{/deployment:tags}}
@@ -70,7 +58,9 @@ release:
           "{{deployment:domain}}:type": public
           "{{deployment:domain}}:cidrMask": 24
           "{{deployment:domain}}:component": {{deployment:id}}-vpc
-          "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}:organization": "{{deployment:organization}}"
+          "{{deployment:domain}}:name": "{{deployment:team:name}}"
+          "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
           "karpenter.sh/discovery": {{deployment:id}}-vpc
       - name: private
         cidrMask: 24
@@ -82,15 +72,19 @@ release:
           "{{deployment:domain}}:type": private_with_egress
           "{{deployment:domain}}:cidrMask": 24
           "{{deployment:domain}}:component": {{deployment:id}}-vpc
-          "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}:organization": "{{deployment:organization}}"
+          "{{deployment:domain}}:name": "{{deployment:team:name}}"
+          "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
           "karpenter.sh/discovery": {{deployment:id}}-vpc
     tags:
       "{{deployment:domain}}:resource-type": vpc
       "{{deployment:domain}}:category": network
       "{{deployment:domain}}:type": network
       "{{deployment:domain}}:cidrMask": 24
       "{{deployment:domain}}:component": {{deployment:id}}-vpc
-      "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}:organization": "{{deployment:organization}}"
+      "{{deployment:domain}}:name": "{{deployment:team:name}}"
+      "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 
   eks:
     name: {{deployment:id}}-eks
@@ -118,15 +112,16 @@ release:
       "{{deployment:domain}}/managed-by": {{deployment:organization}}
       "{{deployment:domain}}/account": {{deployment:account}}
       "{{deployment:domain}}/region": {{deployment:region}}
-      "{{deployment:domain}}/version": {{deployment:version}}
-      "{{deployment:domain}}/service": {{deployment:team:name}}
-      "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}/name": "{{deployment:team:name}}"
+      "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
     tags:
       "{{deployment:domain}}:resource-type": eks
       "{{deployment:domain}}:category": eks
       "{{deployment:domain}}:type": analytics
       "{{deployment:domain}}:component": {{deployment:id}}-eks
-      "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}:organization": "{{deployment:organization}}"
+      "{{deployment:domain}}:name": "{{deployment:team:name}}"
+      "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
       "karpenter.sh/discovery": {{deployment:id}}-vpc
 
   druid:

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

@@ -7,7 +7,9 @@ serviceAccount:
       "{{deployment:domain}}/category": compute.storage
       "{{deployment:domain}}/type": analytics
       "{{deployment:domain}}/component": druid-access
-      "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}/organization": "{{deployment:organization}}"
+      "{{deployment:domain}}/name": "{{deployment:team:name}}"
+      "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
     annotations: { }
   role:
     name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-sa
@@ -54,4 +56,6 @@ serviceAccount:
       "{{deployment:domain}}:category": compute.storage
       "{{deployment:domain}}:type": analytics
       "{{deployment:domain}}:component": {{deployment:id}}-druid-access
-      "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}:organization": "{{deployment:organization}}"
+      "{{deployment:domain}}:name": "{{deployment:team:name}}"
+      "{{deployment:domain}}:alias": "{{deployment:team:alias}}"

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

@@ -11,7 +11,9 @@ kafka:
             "{{deployment:domain}}/category": druid
             "{{deployment:domain}}/type": ingestion
             "{{deployment:domain}}/component": api
-            "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+            "{{deployment:domain}}/organization": "{{deployment:organization}}"
+            "{{deployment:domain}}/name": "{{deployment:team:name}}"
+            "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
           annotations: { }
         role:
           name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msk-sa
@@ -31,10 +33,14 @@ kafka:
             "{{deployment:domain}}:category": api
             "{{deployment:domain}}:type": ingest
             "{{deployment:domain}}:component": {{deployment:id}}-api
-            "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+            "{{deployment:domain}}:organization": "{{deployment:organization}}"
+            "{{deployment:domain}}:name": "{{deployment:team:name}}"
+            "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
   tags:
     "{{deployment:domain}}:resource-type": msk
     "{{deployment:domain}}:category": compute
     "{{deployment:domain}}:type": streaming
     "{{deployment:domain}}:component": {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msk
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"

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

@@ -23,7 +23,9 @@ indexLogs:
     "{{deployment:domain}}:category": storage
     "{{deployment:domain}}:type": analytics
     "{{deployment:domain}}:component": {{deployment:id}}-druid-indexlogs
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 
 deepStorage:
   name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-deepstorage
@@ -50,7 +52,9 @@ deepStorage:
     "{{deployment:domain}}:category": storage
     "{{deployment:domain}}:type": analytics
     "{{deployment:domain}}:component": {{deployment:id}}-druid-deepstorage
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 
 multiStageQuery:
   name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-msq
@@ -77,7 +81,9 @@ multiStageQuery:
     "{{deployment:domain}}:category": storage
     "{{deployment:domain}}:type": analytics
     "{{deployment:domain}}:component": {{deployment:id}}-druid-multi-stage-query
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 
 metadata:
   name: {{deployment:id}}-{{deployment:eks:druid:release}}-druid-metadata
@@ -121,4 +127,6 @@ metadata:
     "{{deployment:domain}}:category": storage
     "{{deployment:domain}}:type": metadata
     "{{deployment:domain}}:component": {{deployment:id}}-druid-metadata
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"

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

@@ -15,16 +15,15 @@ image:
   pullPolicy: Always
 
 labels:
-  "{{deployment:domain}}/account": "{{deployment:account}}"
-  "{{deployment:domain}}/region": "{{deployment:region}}"
-  "{{deployment:domain}}/billing": "{{deployment:organization}}"
-  "{{deployment:domain}}/version": "{{deployment:version}}"
   "{{deployment:domain}}/resource-type": druid-helm-chart
   "{{deployment:domain}}/category": compute.storage
   "{{deployment:domain}}/type": analytics
-  "{{deployment:domain}}/id": "{{deployment:id}}"
+  "{{deployment:domain}}/billing": "{{deployment:organization}}"
+  "{{deployment:domain}}/account": "{{deployment:account}}"
+  "{{deployment:domain}}/region": "{{deployment:region}}"
+  "{{deployment:domain}}/version": "{{deployment:version}}"
   "{{deployment:domain}}/name": "{{deployment:team:name}}"
-  "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+  "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
 
 annotations:
   "k8s.grafana.com/scrape": "true"

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

@@ -14,7 +14,9 @@ managed:
           "{{deployment:domain}}/category": network
           "{{deployment:domain}}/type": operations
           "{{deployment:domain}}/component": aws-vpc-cni.aws-node
-          "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}/organization": "{{deployment:organization}}"
+          "{{deployment:domain}}/name": "{{deployment:team:name}}"
+          "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
         annotations: { }
       role:
         name: {{deployment:id}}-vpc-cni
@@ -26,7 +28,9 @@ managed:
           "{{deployment:domain}}:category": network
           "{{deployment:domain}}:type": operations
           "{{deployment:domain}}:component": {{deployment:id}}-aws-vpc-cni.aws-node
-          "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}:organization": "{{deployment:organization}}"
+          "{{deployment:domain}}:name": "{{deployment:team:name}}"
+          "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
   awsEbsCsi:
     name: aws-ebs-csi-driver
     version: v1.53.0-eksbuild.1
@@ -41,7 +45,9 @@ managed:
           "{{deployment:domain}}/category": storage
           "{{deployment:domain}}/type": operations
           "{{deployment:domain}}/component": aws-ebs-cni
-          "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}/organization": "{{deployment:organization}}"
+          "{{deployment:domain}}/name": "{{deployment:team:name}}"
+          "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
         annotations: { }
       role:
         name: {{deployment:id}}-aws-ebs-csi-sa
@@ -58,7 +64,9 @@ managed:
           "{{deployment:domain}}:category": storage
           "{{deployment:domain}}:type": operations
           "{{deployment:domain}}:component": {{deployment:id}}-aws-ebs-cni
-          "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}:organization": "{{deployment:organization}}"
+          "{{deployment:domain}}:name": "{{deployment:team:name}}"
+          "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
     defaultStorageClass: eks/storage-class.yaml
     kms:
       alias: {{deployment:id}}-eks-ebs-encryption
@@ -97,7 +105,9 @@ managed:
           "{{deployment:domain}}/category": monitoring
           "{{deployment:domain}}/type": operations
           "{{deployment:domain}}/component": amazon-cloudwatch-observability
-          "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}/organization": "{{deployment:organization}}"
+          "{{deployment:domain}}/name": "{{deployment:team:name}}"
+          "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
         annotations: { }
       role:
         name: {{deployment:id}}-cloudwatch-agent-sa
@@ -110,7 +120,9 @@ managed:
           "{{deployment:domain}}:category": monitoring
           "{{deployment:domain}}:type": operations
           "{{deployment:domain}}:component": {{deployment:id}}-cloudwatch-agent
-          "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+          "{{deployment:domain}}:organization": "{{deployment:organization}}"
+          "{{deployment:domain}}:name": "{{deployment:team:name}}"
+          "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 certManager:
   chart:
     name: cert-manager
@@ -144,7 +156,9 @@ karpenter:
         "{{deployment:domain}}/category": operations
         "{{deployment:domain}}/type": autoscale
         "{{deployment:domain}}/component": karpenter
-        "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+        "{{deployment:domain}}/organization": "{{deployment:organization}}"
+        "{{deployment:domain}}/name": "{{deployment:team:name}}"
+        "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
       annotations: { }
     role:
       name: {{deployment:id}}-karpenter-sa
@@ -169,7 +183,9 @@ karpenter:
         "{{deployment:domain}}:category": karpenter
         "{{deployment:domain}}:type": operations
         "{{deployment:domain}}:component": {{deployment:id}}-eks
-        "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+        "{{deployment:domain}}:organization": "{{deployment:organization}}"
+        "{{deployment:domain}}:name": "{{deployment:team:name}}"
+        "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 awsLoadBalancer:
   chart:
     name: aws-load-balancer-controller
@@ -187,7 +203,9 @@ awsLoadBalancer:
         "{{deployment:domain}}/category": ingress
         "{{deployment:domain}}/type": operations
         "{{deployment:domain}}/component": aws-load-balancer
-        "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+        "{{deployment:domain}}/organization": "{{deployment:organization}}"
+        "{{deployment:domain}}/name": "{{deployment:team:name}}"
+        "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
       annotations: { }
     role:
       name: {{deployment:id}}-aws-load-balancer-sa
@@ -201,7 +219,9 @@ awsLoadBalancer:
         "{{deployment:domain}}:category": ingress
         "{{deployment:domain}}:type": operations
         "{{deployment:domain}}:component": {{deployment:id}}-aws-load-balancer
-        "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+        "{{deployment:domain}}:organization": "{{deployment:organization}}"
+        "{{deployment:domain}}:name": "{{deployment:team:name}}"
+        "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
 alloyOperator:
   chart:
     name: alloy-operator

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

@@ -22,19 +22,25 @@
       "{{deployment:domain}}:category": compute
       "{{deployment:domain}}:type": core-node
       "{{deployment:domain}}:component": {{deployment:id}}-eks
-      "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+      "{{deployment:domain}}:organization": "{{deployment:organization}}"
+      "{{deployment:domain}}:name": "{{deployment:team:name}}"
+      "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
   labels:
     "{{deployment:domain}}/resource-type": node
     "{{deployment:domain}}/category": compute
     "{{deployment:domain}}/type": core-node
     "{{deployment:domain}}/component": eks
-    "{{deployment:domain}}/part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}/organization": "{{deployment:organization}}"
+    "{{deployment:domain}}/name": "{{deployment:team:name}}"
+    "{{deployment:domain}}/alias": "{{deployment:team:alias}}"
     "karpenter.sh/discovery": {{deployment:id}}-vpc
   tags:
     "{{deployment:domain}}:resource-type": node
     "{{deployment:domain}}:category": compute
     "{{deployment:domain}}:type": core-node
     "{{deployment:domain}}:component": {{deployment:id}}-eks
-    "{{deployment:domain}}:part-of": "{{deployment:organization}}.{{deployment:team:name}}.{{deployment:team:alias}}"
+    "{{deployment:domain}}:organization": "{{deployment:organization}}"
+    "{{deployment:domain}}:name": "{{deployment:team:name}}"
+    "{{deployment:domain}}:alias": "{{deployment:team:alias}}"
     "eks.amazonaws.com/nodegroup": {{deployment:id}}-core-node
     "karpenter.sh/discovery": {{deployment:id}}-vpc