From 74c6ae9398466888449f003d5ae1df743c496e10 Mon Sep 17 00:00:00 2001 From: Aner Zakobar Date: Sat, 7 May 2022 10:36:28 +0300 Subject: [PATCH] Fixed stuff, using nginx, configured, uses good cert --- templates/gitea.yaml | 5 ++--- templates/jackett.yaml | 3 +-- templates/jellyfin.yaml | 3 +-- templates/nefarious.yaml | 4 ++++ templates/nextcloud.yaml | 4 ++-- templates/photoprism.yaml | 14 ++++++-------- templates/phpldapadmin.yaml | 6 ++++-- templates/redirect.yaml | 8 -------- templates/transmission.yaml | 5 ++++- values.yaml | 2 ++ 10 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 templates/redirect.yaml diff --git a/templates/gitea.yaml b/templates/gitea.yaml index 0548561..0ed7574 100644 --- a/templates/gitea.yaml +++ b/templates/gitea.yaml @@ -79,13 +79,12 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: gitea-ingress - annotations: - kubernetes.io/ingress.allow-http: "false" - traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-redirect@kubernetescrd spec: + ingressClassName: {{ .Values.homey.ingress_class }} tls: - hosts: - git.{{ .Values.homey.url }} + secretName: {{ .Values.homey.certname }} rules: - host: git.{{ .Values.homey.url }} http: diff --git a/templates/jackett.yaml b/templates/jackett.yaml index 4a3ddfe..b28c805 100644 --- a/templates/jackett.yaml +++ b/templates/jackett.yaml @@ -46,11 +46,10 @@ kind: Ingress metadata: name: jackett-ingress annotations: - kubernetes.io/ingress.allow-http: "false" ingress.kubernetes.io/auth-type: forward ingress.kubernetes.io/auth-url: http://ldap-auth.{{ .Release.Namespace }}.svc.cluster.local:80 - traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-redirect@kubernetescrd spec: + ingressClassName: {{ .Values.homey.ingress_class }} tls: - hosts: - jackett.{{ .Values.homey.internal_url }} diff --git a/templates/jellyfin.yaml b/templates/jellyfin.yaml index da985b3..c9761af 100644 --- a/templates/jellyfin.yaml +++ b/templates/jellyfin.yaml @@ -86,9 +86,8 @@ kind: Ingress metadata: name: jellyfin-ingress annotations: - kubernetes.io/ingress.allow-http: "false" - traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-redirect@kubernetescrd spec: + ingressClassName: {{ .Values.homey.ingress_class }} tls: - hosts: - jellyfin.{{ .Values.homey.internal_url }} diff --git a/templates/nefarious.yaml b/templates/nefarious.yaml index 4f02421..cc1e4d2 100644 --- a/templates/nefarious.yaml +++ b/templates/nefarious.yaml @@ -133,6 +133,10 @@ metadata: name: nefarious-ingress annotations: spec: + ingressClassName: {{ .Values.homey.ingress_class }} + tls: + - hosts: + - nefarious.{{ .Values.homey.internal_url }} rules: - host: nefarious.{{ .Values.homey.internal_url }} http: diff --git a/templates/nextcloud.yaml b/templates/nextcloud.yaml index 04fcc7b..5ada35a 100644 --- a/templates/nextcloud.yaml +++ b/templates/nextcloud.yaml @@ -136,12 +136,12 @@ kind: Ingress metadata: name: nextcloud-ingress annotations: - kubernetes.io/ingress.allow-http: "false" - traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-redirect@kubernetescrd spec: + ingressClassName: {{ .Values.homey.ingress_class }} tls: - hosts: - nextcloud.{{ .Values.homey.url }} + secretName: {{ .Values.homey.certname }} rules: - host: nextcloud.{{ .Values.homey.url }} http: diff --git a/templates/photoprism.yaml b/templates/photoprism.yaml index 4da9a47..696f72b 100644 --- a/templates/photoprism.yaml +++ b/templates/photoprism.yaml @@ -104,15 +104,13 @@ kind: Ingress metadata: name: photoprism-ingress annotations: - kubernetes.io/ingress.allow-http: "false" - kubernete.io/ingress.classs: traefik - ingress.kubernetes.io/auth-type: forward - ingress.kubernetes.io/auth-url: http://ldap-auth.{{ .Release.Namespace }}.svc.cluster.local:80 - traefik.ingress.kubernetes.io/frontend-entry-points: http - traefik.ingress.kubernetes.io/buffering: | - maxrequestbodybytes: 31457280 - memrequestbodybytes: 62914560 + ingress.kubernetes.io/auth-type: forward + ingress.kubernetes.io/auth-url: http://ldap-auth.{{ .Release.Namespace }}.svc.cluster.local:80 spec: + ingressClassName: {{ .Values.homey.ingress_class }} + tls: + - hosts: + - album.{{ .Values.homey.internal_url }} rules: - host: album.{{ .Values.homey.internal_url }} http: diff --git a/templates/phpldapadmin.yaml b/templates/phpldapadmin.yaml index 5b22947..93bb44a 100644 --- a/templates/phpldapadmin.yaml +++ b/templates/phpldapadmin.yaml @@ -43,9 +43,11 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: phpldapadmin - annotations: - kubernetes.io/ingress.allow-http: "false" spec: + ingressClassName: {{ .Values.homey.ingress_class }} + tls: + - hosts: + - ldapadmin.{{ .Values.homey.internal_url }} rules: - host: ldapadmin.{{ .Values.homey.internal_url }} http: diff --git a/templates/redirect.yaml b/templates/redirect.yaml deleted file mode 100644 index b6b053e..0000000 --- a/templates/redirect.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: redirect -spec: - redirectScheme: - scheme: https - permanent: true diff --git a/templates/transmission.yaml b/templates/transmission.yaml index dfd1ee8..af25bc2 100644 --- a/templates/transmission.yaml +++ b/templates/transmission.yaml @@ -52,10 +52,13 @@ kind: Ingress metadata: name: transmission-ingress annotations: - kubernetes.io/ingress.allow-http: "false" ingress.kubernetes.io/auth-type: forward ingress.kubernetes.io/auth-url: http://ldap-auth.{{ .Release.Namespace }}.svc.cluster.local:80 spec: + ingressClassName: {{ .Values.homey.ingress_class }} + tls: + - hosts: + - torrent.{{ .Values.homey.internal_url }} rules: - host: torrent.{{ .Values.homey.internal_url }} http: diff --git a/values.yaml b/values.yaml index 78eaa13..b6218e8 100644 --- a/values.yaml +++ b/values.yaml @@ -64,4 +64,6 @@ homey: url: zakobar.com internal_url: zakobar.home ip: 192.168.1.2 + certname: zakobarcert + ingress_class: nginx