diff --git a/dmz/internalproxy/templates/endpoints.yaml b/dmz/internalproxy/templates/endpoints.yaml index 8380a2c..428120a 100644 --- a/dmz/internalproxy/templates/endpoints.yaml +++ b/dmz/internalproxy/templates/endpoints.yaml @@ -9,6 +9,7 @@ subsets: - port: 443 --- + apiVersion: v1 kind: Service metadata: @@ -20,6 +21,7 @@ spec: targetPort: 443 --- + apiVersion: v1 kind: Endpoints metadata: @@ -31,6 +33,7 @@ subsets: - port: 443 --- + apiVersion: v1 kind: Service metadata: @@ -42,6 +45,7 @@ spec: targetPort: 443 --- + apiVersion: v1 kind: Service metadata: @@ -63,9 +67,6 @@ spec: - name: forgejo port: 3000 protocol: TCP - - name: kuma - port: 3001 - protocol: TCP targetPort: 3000 - name: freshrss port: 8085 @@ -103,10 +104,6 @@ spec: port: 5000 protocol: TCP targetPort: 5000 - - name: gitlab-registry - port: 5002 - protocol: TCP - targetPort: 5002 - name: root-vault port: 8201 protocol: TCP @@ -119,11 +116,9 @@ spec: port: 81 protocol: TCP targetPort: 81 - - name: gotify - port: 8070 - protocol: TCP --- + apiVersion: v1 kind: Endpoints metadata: @@ -144,9 +139,6 @@ subsets: - name: forgejo port: 3000 protocol: TCP - - name: kuma - port: 3001 - protocol: TCP - name: freshrss port: 8085 protocol: TCP @@ -174,9 +166,6 @@ subsets: - name: registry port: 5000 protocol: TCP - - name: gitlab-registry - port: 5002 - protocol: TCP - name: root-vault port: 8201 protocol: TCP @@ -186,11 +175,9 @@ subsets: - name: smokeping port: 81 protocol: TCP - - name: gotify - port: 8070 - protocol: TCP --- + apiVersion: v1 kind: Endpoints metadata: @@ -210,6 +197,7 @@ subsets: protocol: TCP --- + apiVersion: v1 kind: Service metadata: diff --git a/dmz/internalproxy/templates/gitlab.yaml b/dmz/internalproxy/templates/gitlab.yaml index d64a5aa..2f225c2 100644 --- a/dmz/internalproxy/templates/gitlab.yaml +++ b/dmz/internalproxy/templates/gitlab.yaml @@ -80,46 +80,3 @@ metadata: spec: type: ExternalName externalName: durp.info - ---- -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: gitlab-registry -spec: - entryPoints: - - websecure - routes: - - match: Host(`images.durp.info`) - kind: Rule - services: - - name: unraid - port: 5002 - scheme: http - tls: - secretName: gitlab-images-tls - ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: gitlab-images-tls -spec: - secretName: gitlab-images-tls - issuerRef: - name: letsencrypt-production - kind: ClusterIssuer - commonName: "images.durp.info" - dnsNames: - - "images.durp.info" - ---- -kind: Service -apiVersion: v1 -metadata: - name: gitlab-images-external-dns - annotations: - external-dns.alpha.kubernetes.io/hostname: images.durp.info -spec: - type: ExternalName - externalName: durp.info diff --git a/dmz/internalproxy/templates/gotify.yaml b/dmz/internalproxy/templates/gotify.yaml deleted file mode 100644 index 6619aed..0000000 --- a/dmz/internalproxy/templates/gotify.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: gotify-ingress -spec: - entryPoints: - - websecure - routes: - - match: Host(`gotify.durp.info`) && PathPrefix(`/`) - kind: Rule - services: - - name: unraid - port: 8070 - scheme: http - tls: - secretName: gotify-tls - ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: gotify-tls -spec: - secretName: gotify-tls - issuerRef: - name: letsencrypt-production - kind: ClusterIssuer - commonName: "gotify.durp.info" - dnsNames: - - "gotify.durp.info" - ---- -kind: Service -apiVersion: v1 -metadata: - name: gotify-external-dns - annotations: - external-dns.alpha.kubernetes.io/hostname: gotify.durp.info -spec: - type: ExternalName - externalName: durp.info diff --git a/dmz/internalproxy/templates/kuma.yaml b/dmz/internalproxy/templates/kuma.yaml index 31b040b..2465b67 100644 --- a/dmz/internalproxy/templates/kuma.yaml +++ b/dmz/internalproxy/templates/kuma.yaml @@ -1,41 +1,46 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: kuma-ingress -spec: - entryPoints: - - websecure - routes: - - match: Host(`kuma.durp.info`) && PathPrefix(`/`) - kind: Rule - services: - - name: unraid - port: 3001 - scheme: http - tls: - secretName: kuma-tls - ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: kuma-tls -spec: - secretName: kuma-tls - issuerRef: - name: letsencrypt-production - kind: ClusterIssuer - commonName: "kuma.durp.info" - dnsNames: - - "kuma.durp.info" - ---- -kind: Service -apiVersion: v1 -metadata: - name: kuma-external-dns - annotations: - external-dns.alpha.kubernetes.io/hostname: kuma.durp.info -spec: - type: ExternalName - externalName: durp.info +#apiVersion: traefik.io/v1alpha1 +#kind: IngressRoute +#metadata: +# name: kuma-ingress +#spec: +# entryPoints: +# - websecure +# routes: +# - match: Host(`kuma.durp.info`) && PathPrefix(`/`) +# kind: Rule +# middlewares: +# - name: authentik-proxy-provider +# namespace: traefik +# services: +# - name: master-cluster +# port: 443 +# tls: +# secretName: kuma-tls +# +#--- +# +#apiVersion: cert-manager.io/v1 +#kind: Certificate +#metadata: +# name: kuma-tls +#spec: +# issuerRef: +# name: letsencrypt-production +# kind: ClusterIssuer +# secretName: kuma-tls +# commonName: "kuma.durp.info" +# dnsNames: +# - "kuma.durp.info" +# +#--- +# +#kind: Service +#apiVersion: v1 +#metadata: +# name: kuma-external-dns +# annotations: +# external-dns.alpha.kubernetes.io/hostname: kuma.durp.info +#spec: +# type: ExternalName +# externalName: durp.info +# \ No newline at end of file diff --git a/infra/authentik/values.yaml b/infra/authentik/values.yaml index 7b75190..1cf4c0a 100644 --- a/infra/authentik/values.yaml +++ b/infra/authentik/values.yaml @@ -34,7 +34,7 @@ authentik: enabled: true image: registry: registry.durp.info - repository: bitnamilegacy/postgresql + repository: bitnami/postgresql pullPolicy: Always postgresqlUsername: "authentik" postgresqlDatabase: "authentik" @@ -52,7 +52,7 @@ authentik: enabled: false image: registry: registry.durp.info - repository: bitnamilegacy/redis + repository: bitnami/redis pullPolicy: Always architecture: standalone auth: diff --git a/infra/nfs/Chart.yaml b/infra/nfs/Chart.yaml index 1a9ffb9..d55feef 100644 --- a/infra/nfs/Chart.yaml +++ b/infra/nfs/Chart.yaml @@ -9,4 +9,4 @@ appVersion: "1.16.0" dependencies: - name: csi-driver-nfs repository: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts - version: 4.11.0 + version: 4.13.2