diff --git a/k8s/argocd/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml index c6228ec..a57e47e 100644 --- a/k8s/argocd/templates/ingress.yaml +++ b/k8s/argocd/templates/ingress.yaml @@ -18,11 +18,6 @@ metadata: namespace: argocd annotations: homelab/ingress-type: "self-managed" - # {{ if $.Values.global.ingressAnnotations }} - # {{- range $k, $v := $.Values.global.ingressAnnotations }} - # {{ $k -}}: "{{- $v -}}" - # {{- end }} - # {{ end }} spec: rules: - host: "argocd.{{ .Values.global.domain }}" @@ -35,9 +30,3 @@ spec: number: 80 path: / pathType: Prefix - # {{ if $.Values.global.tls.enabled }} - # tls: - # - secretName: "argo-cert" - # hosts: - # - "argocd.{{ $.Values.global.domain }}" - # {{ end }} diff --git a/k8s/infra/ingresses/templates/services.yaml b/k8s/infra/ingresses/templates/services.yaml new file mode 100644 index 0000000..73c190b --- /dev/null +++ b/k8s/infra/ingresses/templates/services.yaml @@ -0,0 +1,3 @@ +{{ range $svc := .Values.services }} +{{ include "homelab.ingress" (merge $svc (dict "global" $.Values.global)) }} +{{ end }} \ No newline at end of file diff --git a/k8s/infra/ingresses/values.yaml b/k8s/infra/ingresses/values.yaml index 2758a93..bd8345e 100644 --- a/k8s/infra/ingresses/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -1,4 +1,7 @@ reverseProxy: {} +services: + - prefix: "argocd.core" + service: "argocd-server" global: {} acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" skipTLSVerify: "false"