From 658abbfd95ae1930812ae2c62e1f8f6405bec3b9 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 Mar 2023 16:25:24 +0000 Subject: [PATCH] tls --- k8s/argocd/templates/ingress.yaml | 16 ++++---- k8s/argocd/values-dev.yaml | 1 - k8s/argocd/values-prod.yaml | 5 ++- k8s/argocd/values.yaml | 6 ++- .../ingress/templates/cluster-issuer.yaml | 18 --------- .../templates/reverse-proxy.yaml | 3 ++ k8s/infra/{ingress => tls-certs}/Chart.yaml | 0 .../tls-certs/templates/cluster-issuer.yaml | 39 +++++++++++++++++++ .../{ingress => tls-certs}/values-dev.yaml | 0 .../{ingress => tls-certs}/values-prod.yaml | 0 k8s/infra/{ingress => tls-certs}/values.yaml | 0 11 files changed, 59 insertions(+), 29 deletions(-) delete mode 100644 k8s/infra/ingress/templates/cluster-issuer.yaml rename k8s/infra/{ingress => tls-certs}/Chart.yaml (100%) create mode 100644 k8s/infra/tls-certs/templates/cluster-issuer.yaml rename k8s/infra/{ingress => tls-certs}/values-dev.yaml (100%) rename k8s/infra/{ingress => tls-certs}/values-prod.yaml (100%) rename k8s/infra/{ingress => tls-certs}/values.yaml (100%) diff --git a/k8s/argocd/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml index 46f12e0..811d4d7 100644 --- a/k8s/argocd/templates/ingress.yaml +++ b/k8s/argocd/templates/ingress.yaml @@ -1,5 +1,5 @@ -{{ if $.Values.global.tlsEnable }} +{{ if $.Values.global.tls.enabled }} --- apiVersion: v1 kind: Secret @@ -18,7 +18,7 @@ metadata: name: argocd-server namespace: argocd annotations: - self/managed: "true" + homelab/ingress-type: "self-managed" {{ if $.Values.global.ingressAnnotations }} {{- range $k, $v := $.Values.global.ingressAnnotations }} {{ $k -}}: "{{- $v -}}" @@ -36,9 +36,9 @@ spec: number: 80 path: / pathType: Prefix - {{ if $.Values.global.tlsEnable }} - tls: - - secretName: "argo-cert" - hosts: - - "argocd.{{ $.Values.global.domain }}" - {{ end }} + # {{ if $.Values.global.tls.enabled }} + # tls: + # - secretName: "argo-cert" + # hosts: + # - "argocd.{{ $.Values.global.domain }}" + # {{ end }} diff --git a/k8s/argocd/values-dev.yaml b/k8s/argocd/values-dev.yaml index f4480f7..57b3765 100644 --- a/k8s/argocd/values-dev.yaml +++ b/k8s/argocd/values-dev.yaml @@ -1,4 +1,3 @@ global: deployment: dev domain: "me.local" - tlsEnable: false diff --git a/k8s/argocd/values-prod.yaml b/k8s/argocd/values-prod.yaml index 469eed2..894236e 100644 --- a/k8s/argocd/values-prod.yaml +++ b/k8s/argocd/values-prod.yaml @@ -3,4 +3,7 @@ global: domain: "home.sosnovsky.ca" ingressAnnotations: cert-manager.io/cluster-issuer: letsencrypt - tlsEnable: true + tls: + enabled: true + issuer: "letsencrypt" + secretName: "tls-home.sosnovsky.ca" diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 7537dd4..c9801cf 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -19,5 +19,9 @@ selfapp: global: email: "ariel@sosnovsky.ca" ingressAnnotations: {} - tlsEnable: false + tls: + enabled: false + issuer: "" + secretName: "" domain: "" + deployment: "" diff --git a/k8s/infra/ingress/templates/cluster-issuer.yaml b/k8s/infra/ingress/templates/cluster-issuer.yaml deleted file mode 100644 index 1314cdd..0000000 --- a/k8s/infra/ingress/templates/cluster-issuer.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{ if .Values.global.tlsEnable }} ---- -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: letsencrypt -spec: - acme: - server: {{ .Values.acmeServer }} - skipTLSVerify: {{ .Values.skipTLSVerify }} - email: {{ .Values.global.email }} - privateKeySecretRef: - name: letsencrypt - solvers: - - http01: - ingress: - class: traefik -{{ end }} \ No newline at end of file diff --git a/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml b/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml index f76f6b8..a84ce92 100644 --- a/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml +++ b/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml @@ -21,11 +21,14 @@ spec: - port: 80 protocol: TCP targetPort: {{ $data.port }} + --- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: "reverse-proxy-{{$prefix}}" + annotations: + homelab/ingress-type: "reverse-proxy" spec: rules: - host: "{{$prefix}}.{{$.Values.global.domain}}" diff --git a/k8s/infra/ingress/Chart.yaml b/k8s/infra/tls-certs/Chart.yaml similarity index 100% rename from k8s/infra/ingress/Chart.yaml rename to k8s/infra/tls-certs/Chart.yaml diff --git a/k8s/infra/tls-certs/templates/cluster-issuer.yaml b/k8s/infra/tls-certs/templates/cluster-issuer.yaml new file mode 100644 index 0000000..8daf851 --- /dev/null +++ b/k8s/infra/tls-certs/templates/cluster-issuer.yaml @@ -0,0 +1,39 @@ +{{ if .Values.global.tls.enabled }} +--- +apiVersion: cert-manager.io/v1 +kind: ClusterIssuer +metadata: + name: {{ .Values.global.tls.issuer }} +spec: + acme: + server: {{ .Values.acmeServer }} + skipTLSVerify: {{ .Values.skipTLSVerify }} + email: {{ .Values.global.email }} + privateKeySecretRef: + name: {{ .Values.global.tls.issuer }} + solvers: + - http01: + ingress: + class: traefik +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: tls-{{ .Values.global.tls.issuer }} +spec: + secretName: {{ .Values.global.tls.secretName }} + issuerRef: + kind: ClusterIssuer + name: {{ .Values.global.tls.issuer }} + commonName: "*.{{ .Values.global.domain }}" + dnsNames: + - "*.{{ .Values.global.domain }}" +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: TLSStore +metadata: + name: tls-{{ .Values.global.tls.issuer }} +spec: + defaultCertificate: + secretName: {{ .Values.global.tls.secretName }} +{{ end }} \ No newline at end of file diff --git a/k8s/infra/ingress/values-dev.yaml b/k8s/infra/tls-certs/values-dev.yaml similarity index 100% rename from k8s/infra/ingress/values-dev.yaml rename to k8s/infra/tls-certs/values-dev.yaml diff --git a/k8s/infra/ingress/values-prod.yaml b/k8s/infra/tls-certs/values-prod.yaml similarity index 100% rename from k8s/infra/ingress/values-prod.yaml rename to k8s/infra/tls-certs/values-prod.yaml diff --git a/k8s/infra/ingress/values.yaml b/k8s/infra/tls-certs/values.yaml similarity index 100% rename from k8s/infra/ingress/values.yaml rename to k8s/infra/tls-certs/values.yaml