feat(ansible): Add addon support (#836)

template/templates/addons/grafana/app/secret.sops.yaml.j2

@@ -6,4 +6,4 @@ metadata:
   namespace: monitoring
 stringData:
   admin-user: admin
-  admin-password: "{{ bootstrap_grafana_admin_password }}"
+  admin-password: "{{ grafana.password }}"

template/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2

@@ -89,7 +89,7 @@ spec:
     kubeControllerManager:
       enabled: true
       endpoints: &cp
-      {% for item in bootstrap_hosts.master %}
+      {% for item in bootstrap_nodes.master %}
         - {{ item.address }}
       {% endfor %}
       serviceMonitor:

template/templates/addons/weave-gitops/app/secret.sops.yaml.j2

@@ -7,4 +7,4 @@ metadata:
 type: Opaque
 stringData:
   username: admin
-  password: "{{ bootstrap_weave_gitops_admin_password | password_hash('bcrypt', rounds=10) }}"
+  password: "{{ weave_gitops.password | password_hash('bcrypt', rounds=10) }}"

template/templates/ansible/hosts.yaml.j2

@@ -4,15 +4,15 @@ kubernetes:
   children:
     master:
       hosts:
-      {% for item in bootstrap_hosts.master %}
+      {% for item in bootstrap_nodes.master %}
         {{ item.name }}:
           ansible_user: {{ item.username }}
           ansible_host: {{ item.address }}
       {% endfor %}
-    {% if bootstrap_hosts.worker | default([]) | length > 0 %}
+    {% if bootstrap_nodes.worker | default([]) | length > 0 %}
     worker:
       hosts:
-      {% for item in bootstrap_hosts.worker %}
+      {% for item in bootstrap_nodes.worker %}
         {{ item.name }}:
           ansible_user: {{ item.username }}
           ansible_host: {{ item.address }}

template/templates/kubernetes/apps/default/kustomization.yaml.j2

@@ -1,7 +1,9 @@
+#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
-  - ./echo-server/ks.yaml
+  {% if hajimari.enabled | default(false) %}
   - ./hajimari/ks.yaml
+  {% endif %}

template/templates/kubernetes/apps/flux-system/kustomization.yaml.j2

@@ -1,7 +1,10 @@
+#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./addons/ks.yaml
+  {% if weave_gitops.enabled | default(false) %}
   - ./weave-gitops/ks.yaml
+  {% endif %}

template/templates/kubernetes/apps/monitoring/kustomization.yaml.j2

@@ -1,8 +1,15 @@
+#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
+  {% if grafana.enabled | default(false) %}
   - ./grafana/ks.yaml
+  {% endif %}
+  {% if kube_prometheus_stack.enabled | default(false) %}
   - ./kube-prometheus-stack/ks.yaml
+  {% endif %}
+  {% if kubernetes_dashboard.enabled | default(false) %}
   - ./kubernetes-dashboard/ks.yaml
+  {% endif %}

template/templates/kubernetes/apps/networking/echo-server/app/helmrelease.yaml.j2

@@ -4,7 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: echo-server
-  namespace: default
+  namespace: networking
 spec:
   interval: 30m
   chart:

template/templates/kubernetes/apps/networking/echo-server/app/kustomization.yaml.j2

@@ -1,6 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
+namespace: networking
 resources:
   - ./helmrelease.yaml

template/templates/kubernetes/apps/networking/echo-server/ks.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   name: cluster-apps-echo-server
   namespace: flux-system
 spec:
-  path: ./kubernetes/apps/default/echo-server/app
+  path: ./kubernetes/apps/networking/echo-server/app
   prune: true
   sourceRef:
     kind: GitRepository

template/templates/kubernetes/apps/networking/kustomization.yaml.j2

@@ -4,6 +4,7 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./cloudflared/ks.yaml
+  - ./echo-server/ks.yaml
   - ./external-dns/ks.yaml
   - ./ingress-nginx/ks.yaml
   - ./k8s-gateway/ks.yaml