feat: remove nesting

Signed-off-by: kjuulh <contact@kjuulh.io>

templates/clusters/configmap.yaml.jinja2

@@ -7,8 +7,7 @@ metadata:
   namespace: {{ cluster_namespace }}
 data:
   {%- if (vars.cluster_vars.env | items | length) > 0  %}
-  environment:
   {%- for (name, value) in vars.cluster_vars.env  | dictsort   %}
-    {{name  | upper | replace(".", "_") | replace("-", "_") }}: {{value}}
+  {{name  | upper | replace(".", "_") | replace("-", "_") }}: {{value}}
   {%- endfor %}
   {%- endif %}

templates/clusters/service.yaml.jinja2

@@ -1,26 +1,25 @@
+{%- set service_name = vars.cuddle_vars.service -%}
+{%- set cluster_name = vars.cluster_vars.name -%}
+{%- set cluster_namespace = vars.cluster_vars.namespace -%}
+
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    app: {{ vars.cuddle_vars.service  }}
-    cluster: {{ environment }}
-  name: {{ vars.cuddle_vars.service  }}
-  namespace: {{ vars.cluster_vars.namespace }}
+  name: "{{ service_name }}"
+  namespace: {{ cluster_namespace }}
 spec:
-  ports:
-  - name: external-http
-    port: 3000
-    targetPort: 3000
-  - name: internal-http
-    port: 3001
-    targetPort: 3001
-  - name: internal-grpc
-    port: 3002
-    targetPort: 3002
-  - name: external-grpc
-    port: 7900
-    targetPort: 7900
   selector:
-    app: {{ vars.cuddle_vars.service }}
-    cluster: {{ environment }}
+    app: {{ service_name }}
+    cluster: {{ cluster_name }}
   type: LoadBalancer
+  ports:
+    - name: external-http
+      port: 3000
+      targetPort: 3000 
+    - name: internal-http
+      port: 3001
+      targetPort: 3001 
+    - name: internal-grpc
+      port: 3002
+      targetPort: 3002 
+