refactor

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
aenix-io · Oct 16, 2024 · 8bf00af · 8bf00af
1 parent f8df224
commit 8bf00af
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/packages/extra/ingress/templates/dashboard.yaml b/packages/extra/ingress/templates/dashboard.yaml
@@ -1,36 +1,36 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} 
-{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }} 
+{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
+{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
 
-{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} 
-{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }} 
+{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
+{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
 
-{{- if .Values.dashboard }} 
-apiVersion: networking.k8s.io/v1 
-kind: Ingress 
-metadata: 
- annotations: 
- cert-manager.io/cluster-issuer: letsencrypt-prod 
+{{- if .Values.dashboard }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ annotations:
+ cert-manager.io/cluster-issuer: letsencrypt-prod
  {{- if eq $issuerType "cloudflare" }} 
- {{- else }} 
- acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }} 
- {{- end }} 
- name: dashboard-{{ .Release.Namespace }} 
- namespace: cozy-dashboard 
-spec: 
- ingressClassName: {{ .Release.Namespace }} 
- rules: 
- - host: dashboard.{{ $host }} 
- http: 
- paths: 
- - backend: 
- service: 
- name: dashboard 
- port: 
- number: 80 
- path: / 
- pathType: Prefix 
- tls: 
- - hosts: 
- - dashboard.{{ $host }} 
- secretName: dashboard-{{ .Release.Namespace }}-tls 
+ {{- else }}
+ acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }}
+ {{- end }}
+ name: dashboard-{{ .Release.Namespace }}
+ namespace: cozy-dashboard
+spec:
+ ingressClassName: {{ .Release.Namespace }}
+ rules:
+ - host: dashboard.{{ $host }}
+ http:
+ paths:
+ - backend:
+ service:
+ name: dashboard
+ port:
+ number: 80
+ path: /
+ pathType: Prefix
+ tls:
+ - hosts:
+ - dashboard.{{ $host }}
+ secretName: dashboard-{{ .Release.Namespace }}-tls
 {{- end }}
diff --git a/packages/extra/monitoring/templates/alerta/alerta.yaml b/packages/extra/monitoring/templates/alerta/alerta.yaml
@@ -1,4 +1,4 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} 
+{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
 {{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
 
 {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
@@ -36,7 +36,7 @@ data:
  'endpoint' : "/api",
  'provider' : "basic"
  })
- .constant('colors', {});  
+ .constant('colors', {}); 
 ---
 apiVersion: v1
 kind: Service

diff --git a/packages/extra/monitoring/templates/grafana/grafana.yaml b/packages/extra/monitoring/templates/grafana/grafana.yaml
@@ -1,4 +1,4 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} 
+{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
 {{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }} 
 
 {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
@@ -94,7 +94,7 @@ spec:
  metadata:
  annotations:
  {{- if ne $issuerType "cloudflare" }}
- acme.cert-manager.io/http01-ingress-class: "{{ $ingress }}" 
+ acme.cert-manager.io/http01-ingress-class: "{{ $ingress }}"
  {{- end }}
  cert-manager.io/cluster-issuer: letsencrypt-prod
  spec: