feat: remove the need for raw jinja blocks (#1158)
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed
1 parent
f9481d6202
commit
e6fbc6e128
92 files changed
+430
-441
No files matched your search
@@ -1,4 +1,4 @@
|
||||
{% if grafana.enabled | default(false) %}
|
||||
<% if grafana.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
@@ -160,7 +160,7 @@ spec:
|
||||
ingress:
|
||||
enabled: true
|
||||
ingressClassName: internal
|
||||
{% if homepage.enabled | default(false) %}
|
||||
<% if homepage.enabled | default(false) %>
|
||||
annotations:
|
||||
gethomepage.dev/enabled: "true"
|
||||
gethomepage.dev/icon: grafana.png
|
||||
@@ -168,9 +168,9 @@ spec:
|
||||
gethomepage.dev/group: Observability
|
||||
gethomepage.dev/widget.type: grafana
|
||||
gethomepage.dev/widget.url: http://grafana.observability
|
||||
gethomepage.dev/widget.username: "{% raw %}{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}{% endraw %}"
|
||||
gethomepage.dev/widget.password: "{% raw %}{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}{% endraw %}"
|
||||
{% endif %}
|
||||
gethomepage.dev/widget.username: "{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}"
|
||||
gethomepage.dev/widget.password: "{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}"
|
||||
<% endif %>
|
||||
hosts:
|
||||
- &host "grafana.${SECRET_DOMAIN}"
|
||||
tls:
|
||||
@@ -181,4 +181,4 @@ spec:
|
||||
storageClassName: openebs-hostpath
|
||||
testFramework:
|
||||
enabled: false
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -1,8 +1,8 @@
|
||||
{% if grafana.enabled | default(false) %}
|
||||
<% if grafana.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./secret.sops.yaml
|
||||
- ./helmrelease.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -1,4 +1,4 @@
|
||||
{% if grafana.enabled | default(false) %}
|
||||
<% if grafana.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
@@ -6,5 +6,5 @@ metadata:
|
||||
name: grafana-admin-secret
|
||||
stringData:
|
||||
admin-user: admin
|
||||
admin-password: "{{ grafana.password }}"
|
||||
{% endif %}
|
||||
admin-password: "<< grafana.password >>"
|
||||
<% endif %>
|
||||
@@ -1,4 +1,4 @@
|
||||
{% if grafana.enabled | default(false) %}
|
||||
<% if grafana.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
@@ -19,4 +19,4 @@ spec:
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 5m
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+18
-18
@@ -1,4 +1,4 @@
|
||||
{% if kube_prometheus_stack.enabled | default(false) %}
|
||||
<% if kube_prometheus_stack.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
@@ -54,7 +54,7 @@ spec:
|
||||
enabled: true
|
||||
serviceMonitor:
|
||||
metricRelabelings:
|
||||
{% if bootstrap_distribution == 'k3s' %}
|
||||
<% if bootstrap_distribution == 'k3s' %>
|
||||
# Remove duplicate labels provided by k3s
|
||||
- action: keep
|
||||
sourceLabels: ["__name__"]
|
||||
@@ -62,7 +62,7 @@ spec:
|
||||
- action: replace
|
||||
sourceLabels: ["node"]
|
||||
targetLabel: instance
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
# Drop high cardinality labels
|
||||
- action: labeldrop
|
||||
regex: (uid)
|
||||
@@ -75,12 +75,12 @@ spec:
|
||||
enabled: true
|
||||
serviceMonitor:
|
||||
metricRelabelings:
|
||||
{% if bootstrap_distribution == 'k3s' %}
|
||||
<% if bootstrap_distribution == 'k3s' %>
|
||||
# Remove duplicate labels provided by k3s
|
||||
- action: keep
|
||||
sourceLabels: ["__name__"]
|
||||
regex: (aggregator_openapi|aggregator_unavailable|apiextensions_openapi|apiserver_admission|apiserver_audit|apiserver_cache|apiserver_cel|apiserver_client|apiserver_crd|apiserver_current|apiserver_envelope|apiserver_flowcontrol|apiserver_init|apiserver_kube|apiserver_longrunning|apiserver_request|apiserver_requested|apiserver_response|apiserver_selfrequest|apiserver_storage|apiserver_terminated|apiserver_tls|apiserver_watch|apiserver_webhooks|authenticated_user|authentication|disabled_metric|etcd_bookmark|etcd_lease|etcd_request|field_validation|get_token|go|grpc_client|hidden_metric|kube_apiserver|kubernetes_build|kubernetes_feature|node_authorizer|pod_security|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scrape_duration|scrape_samples|scrape_series|serviceaccount_legacy|serviceaccount_stale|serviceaccount_valid|watch_cache|workqueue)_(.+)
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
# Drop high cardinality labels
|
||||
- action: drop
|
||||
sourceLabels: ["__name__"]
|
||||
@@ -91,49 +91,49 @@ spec:
|
||||
kubeControllerManager:
|
||||
enabled: true
|
||||
endpoints: &endpoints
|
||||
{% for item in bootstrap_nodes.master %}
|
||||
- {{ item.address }}
|
||||
{% endfor %}
|
||||
{% if bootstrap_distribution == 'k3s' %}
|
||||
<% for item in bootstrap_nodes.master %>
|
||||
- << item.address >>
|
||||
<% endfor %>
|
||||
<% if bootstrap_distribution == 'k3s' %>
|
||||
serviceMonitor:
|
||||
metricRelabelings:
|
||||
# Remove duplicate labels provided by k3s
|
||||
- action: keep
|
||||
sourceLabels: ["__name__"]
|
||||
regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|attachdetach_controller|authenticated_user|authentication|cronjob_controller|disabled_metric|endpoint_slice|ephemeral_volume|garbagecollector_controller|get_token|go|hidden_metric|job_controller|kubernetes_build|kubernetes_feature|leader_election|node_collector|node_ipam|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|pv_collector|registered_metric|replicaset_controller|rest_client|retroactive_storageclass|root_ca|running_managed|scrape_duration|scrape_samples|scrape_series|service_controller|storage_count|storage_operation|ttl_after|volume_operation|workqueue)_(.+)"
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
kubeEtcd:
|
||||
{% if bootstrap_nodes.master | length > 1 %}
|
||||
<% if bootstrap_nodes.master | length > 1 %>
|
||||
enabled: true
|
||||
{% else %}
|
||||
<% else %>
|
||||
enabled: false
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
endpoints: *endpoints
|
||||
kubeScheduler:
|
||||
enabled: true
|
||||
endpoints: *endpoints
|
||||
{% if bootstrap_distribution == 'k3s' %}
|
||||
<% if bootstrap_distribution == 'k3s' %>
|
||||
serviceMonitor:
|
||||
metricRelabelings:
|
||||
# Remove duplicate labels provided by k3s
|
||||
- action: keep
|
||||
sourceLabels: ["__name__"]
|
||||
regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|authenticated_user|authentication|disabled_metric|go|hidden_metric|kubernetes_build|kubernetes_feature|leader_election|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scheduler|scrape_duration|scrape_samples|scrape_series|workqueue)_(.+)"
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
kubeProxy:
|
||||
enabled: false # Disabled due to eBPF
|
||||
prometheus:
|
||||
ingress:
|
||||
enabled: true
|
||||
ingressClassName: internal
|
||||
{% if homepage.enabled | default(false) %}
|
||||
<% if homepage.enabled | default(false) %>
|
||||
annotations:
|
||||
gethomepage.dev/enabled: "true"
|
||||
gethomepage.dev/icon: prometheus.png
|
||||
gethomepage.dev/name: Prometheus
|
||||
gethomepage.dev/group: Observability
|
||||
gethomepage.dev/widget.type: prometheus
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
pathType: Prefix
|
||||
hosts:
|
||||
- "prometheus.${SECRET_DOMAIN}"
|
||||
@@ -164,4 +164,4 @@ spec:
|
||||
multicluster:
|
||||
etcd:
|
||||
enabled: true
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
{% if kube_prometheus_stack.enabled | default(false) %}
|
||||
<% if kube_prometheus_stack.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./helmrelease.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -1,4 +1,4 @@
|
||||
{% if kube_prometheus_stack.enabled | default(false) %}
|
||||
<% if kube_prometheus_stack.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
@@ -19,4 +19,4 @@ spec:
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 5m
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
{% if kubernetes_dashboard.enabled | default(false) %}
|
||||
<% if kubernetes_dashboard.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
@@ -32,13 +32,13 @@ spec:
|
||||
ingress:
|
||||
enabled: true
|
||||
className: internal
|
||||
{% if homepage.enabled | default(false) %}
|
||||
<% if homepage.enabled | default(false) %>
|
||||
annotations:
|
||||
gethomepage.dev/enabled: "true"
|
||||
gethomepage.dev/icon: kubernetes-dashboard.png
|
||||
gethomepage.dev/name: Kubernetes Dashboard
|
||||
gethomepage.dev/group: Observability
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
hosts:
|
||||
- &host "kubernetes.${SECRET_DOMAIN}"
|
||||
tls:
|
||||
@@ -46,4 +46,4 @@ spec:
|
||||
- *host
|
||||
metricsScraper:
|
||||
enabled: true
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
{% if kubernetes_dashboard.enabled | default(false) %}
|
||||
<% if kubernetes_dashboard.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./rbac.yaml
|
||||
- ./helmrelease.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if kubernetes_dashboard.enabled | default(false) %}
|
||||
<% if kubernetes_dashboard.enabled | default(false) %>
|
||||
# For dashboard sign in token:
|
||||
# kubectl -n observability get secret kubernetes-dashboard -o jsonpath='{.data.token}' | base64 -d
|
||||
---
|
||||
@@ -38,4 +38,4 @@ subjects:
|
||||
- kind: ServiceAccount
|
||||
name: kubernetes-dashboard
|
||||
namespace: observability
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -1,4 +1,4 @@
|
||||
{% if kubernetes_dashboard.enabled | default(false) %}
|
||||
<% if kubernetes_dashboard.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
@@ -22,4 +22,4 @@ spec:
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 5m
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -3,12 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./namespace.yaml
|
||||
{% if grafana.enabled | default(false) %}
|
||||
<% if grafana.enabled | default(false) %>
|
||||
- ./grafana/ks.yaml
|
||||
{% endif %}
|
||||
{% if kube_prometheus_stack.enabled | default(false) %}
|
||||
<% endif %>
|
||||
<% if kube_prometheus_stack.enabled | default(false) %>
|
||||
- ./kube-prometheus-stack/ks.yaml
|
||||
{% endif %}
|
||||
{% if kubernetes_dashboard.enabled | default(false) %}
|
||||
<% endif %>
|
||||
<% if kubernetes_dashboard.enabled | default(false) %>
|
||||
- ./kubernetes-dashboard/ks.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
Reference in new issue
Block a user