diff --git a/charts/apps/argoapps/compose-apps/immich.yaml b/charts/apps/argoapps/compose-apps/immich.yaml index 0764aee..4a14c0c 100644 --- a/charts/apps/argoapps/compose-apps/immich.yaml +++ b/charts/apps/argoapps/compose-apps/immich.yaml @@ -108,4 +108,9 @@ externalSecrets: generatorRef: apiVersion: generators.external-secrets.io/v1alpha1 kind: Password - name: "db-password" \ No newline at end of file + name: "db-password" +ingress: + enabled: true + prefix: immich + service: immich-server + port: 2283 \ No newline at end of file diff --git a/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl b/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl new file mode 100644 index 0000000..5f4ff90 --- /dev/null +++ b/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl @@ -0,0 +1,43 @@ +{{ define "homelab.ingress.domain.tls"}} +{{ if (.useWildCard | default .global.dns.tls.useWildCard) }} +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: "tls-{{.prefix}}{{ .domain }}" + namespace: {{ .namespace }} +spec: + refreshInterval: 1h + secretStoreRef: + kind: ClusterSecretStore + name: k8s-ns-certs + target: + name: tls-{{.prefix}}{{ .domain }} + creationPolicy: Owner + deletionPolicy: Delete + data: + - secretKey: tls.crt + remoteRef: + key: cloudflare-wildcard{{ .domain }} + property: tls.crt + - secretKey: tls.key + remoteRef: + key: cloudflare-wildcard{{ .domain }} + property: tls.key +{{ else }} +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "tls-{{.prefix}}{{ .domain }}" + namespace: {{ .namespace }} +spec: + secretName: "tls-{{.prefix}}{{ .domain }}" + issuerRef: + kind: ClusterIssuer + name: "{{ .global.dns.tls.issuer }}" + commonName: "{{.prefix}}{{ .domain }}" + dnsNames: + - "{{.prefix}}{{ .domain }}" +{{ end }} +{{ end }} \ No newline at end of file diff --git a/charts/compose-app/templates/_helpers/ingress.domain.tpl b/charts/compose-app/templates/_helpers/ingress.domain.tpl new file mode 100644 index 0000000..8e1e987 --- /dev/null +++ b/charts/compose-app/templates/_helpers/ingress.domain.tpl @@ -0,0 +1,12 @@ +{{- define "homelab.ingress.domain" -}} + {{- $rootPrefix := empty .leadPrefix | ternary "" (printf "%s." .leadPrefix) -}} + {{- if .useSecondaryDomain -}} +{{$rootPrefix}}{{.global.dns.secondary.root}}.{{.global.dns.secondary.domain}} + {{- else -}} + {{- if .useDirectPrefix -}} +{{$rootPrefix}}{{.global.dns.primary.domain}} + {{- else -}} +{{$rootPrefix}}{{.global.dns.primary.root}}.{{.global.dns.primary.domain}} + {{- end -}} + {{- end -}} +{{- end -}} \ No newline at end of file diff --git a/charts/compose-app/templates/_helpers/ingress.tailscale.tpl b/charts/compose-app/templates/_helpers/ingress.tailscale.tpl new file mode 100644 index 0000000..cb7ce25 --- /dev/null +++ b/charts/compose-app/templates/_helpers/ingress.tailscale.tpl @@ -0,0 +1,37 @@ +{{ define "homelab.ingress.tailscale" }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: tailscale-{{.name}} + namespace: {{ .namespace }} +spec: + ingressClassName: tailscale + tls: + - hosts: + - {{ .name }} + rules: + - http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: tailscale-{{.name}} + port: + number: 80 +--- +apiVersion: v1 +kind: Service +metadata: + name: tailscale-{{.name}} + namespace: {{ .namespace }} +spec: + type: ClusterIP + ports: + - name: main + port: 80 + targetPort: {{.port | default 80}} + selector: + {{ .selector | toYaml | nindent 4 }} +{{ end }} \ No newline at end of file diff --git a/charts/compose-app/templates/_helpers/ingress.tpl b/charts/compose-app/templates/_helpers/ingress.tpl new file mode 100644 index 0000000..a054029 --- /dev/null +++ b/charts/compose-app/templates/_helpers/ingress.tpl @@ -0,0 +1,122 @@ +{{- define "homelab.ingress" }} + +# +# Input: = {{ . | toJson }} +# prefix: str = {{ .prefix }} +# service: str = {{ .service }} +# namespace: str = {{ .namespace }} +# global: map (should be .global) = {{ .global | toJson }} +# port: int = 80 = {{ .port }} +# path: str = "/" = {{ .path }} +# useWildCard: bool = False = {{ .useWildCard }} +# middleware: str = "https-redirect" = {{ .middleware }} +# useSecondaryDomain: bool = False = {{ .useSecondaryDomain }} +# useDirectPrefix: bool = False = {{ .useDirectPrefix }} +# widget: bool = False = {{ .widget | toJson }} +# + + +{{- $splitPrefix := splitList "." .prefix -}} +{{- $prefix := first $splitPrefix -}} +{{- $leadPrefix := join "." (rest $splitPrefix) -}} + +{{- $_ := set . "prefix" $prefix -}} +{{- $_ := set . "leadPrefix" $leadPrefix -}} + +{{- $domain := (include "homelab.ingress.domain" .) -}} + +{{- $_ := set . "domain" $domain -}} + +# .domain = {{ .domain }} +# .prefix = {{ .prefix }} +{{ if .global.dns.tls.enabled }} +{{ include "homelab.ingress.domain.tls" . }} +{{ end }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: "{{.prefix}}{{ $domain }}" + namespace: {{ .namespace }} + annotations: + homelab-ingress/managing-app-namespace: "apps-ingresses" + traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "ingress-https-redirect"}}@kubernetescrd + gethomepage.dev/enabled: "true" + gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' + {{ if .description}} + gethomepage.dev/description: "{{ .description }}" + {{ end }} + gethomepage.dev/group: {{ .group | default "Unassigned" }} + {{ if .icon }} + gethomepage.dev/icon: "{{.icon}}" + {{ else }} + gethomepage.dev/icon: "homepage.png" + {{ end }} + {{ if .widget }} + {{ range $k, $v := .widget }} + gethomepage.dev/widget.{{$k}}: {{ $v | quote }} + {{ end }} + {{ end }} + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} +spec: + rules: + - host: "{{.prefix}}{{ $domain }}" + http: + paths: + - backend: + service: + name: "{{.service}}" + port: + number: {{.port | default 80}} + path: {{ .path | default "/" }} + pathType: Prefix + {{ if .global.dns.tls.enabled }} + tls: + - secretName: "tls-{{.prefix}}{{ $domain }}" + hosts: + - "{{.prefix}}{{ $domain }}" + {{ end }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: "{{.prefix}}.internal" + namespace: {{ .namespace }} + annotations: + homelab-ingress/managing-app-namespace: "apps-ingresses" + gethomepage.dev/enabled: "true" + gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' + {{ if .description}} + gethomepage.dev/description: "{{ .description }}" + {{ end }} + gethomepage.dev/group: Internal({{ .group | default "Unassigned" }}) + {{ if .icon }} + gethomepage.dev/icon: "{{.icon}}" + {{ else }} + gethomepage.dev/icon: "homepage.png" + {{ end }} + {{ if .widget }} + {{- range $k, $v := .widget }} + gethomepage.dev/widget.{{$k}}: {{ $v | quote }} + {{- end }} + {{ end }} + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} +spec: + rules: + - host: "{{.prefix}}.{{ .global.dns.internalPrefix }}" + http: + paths: + - backend: + service: + name: "{{.service}}" + port: + number: {{.port | default 80}} + path: {{ .path | default "/" }} + pathType: Prefix +{{- end -}} \ No newline at end of file diff --git a/charts/compose-app/templates/ingress.yaml b/charts/compose-app/templates/ingress.yaml new file mode 100644 index 0000000..cd93fca --- /dev/null +++ b/charts/compose-app/templates/ingress.yaml @@ -0,0 +1,4 @@ +{{ if .Values.ingress.enabled }} +{{ $_ := set .Values.ingress "namespace" $.Release.Namespace }} +{{ include "homelab.ingress" .Values.ingress }} +{{ end }} \ No newline at end of file diff --git a/charts/compose-app/values-example.yaml b/charts/compose-app/values-example.yaml deleted file mode 100644 index 86e82cf..0000000 --- a/charts/compose-app/values-example.yaml +++ /dev/null @@ -1,97 +0,0 @@ -services: - immich-server: - image: ghcr.io/immich-app/immich-server:release - volumes: - upload: /usr/src/app/upload - envFrom: - - secretRef: - name: immich-shared - ports: - - port: '2283' - restart: always - - immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:release - volumes: - model-cache: /cache - envFrom: - - secretRef: - name: immich-shared - restart: always - - redis: - image: docker.io/valkey/valkey:8-bookworm@sha256:42cba146593a5ea9a622002c1b7cba5da7be248650cbb64ecb9c6c33d29794b1 - healthcheck: - test: redis-cli ping || exit 1 - restart: always - - database: - image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52 - environment: - POSTGRES_INITDB_ARGS: '--data-checksums' - volumes: - db-data: /var/lib/postgresql/data - healthcheck: - test: >- - pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1; - interval: 5m - start_interval: 30s - start_period: 5m - command: >- - postgres -c shared_preload_libraries=vectors.so -c 'search_path="$$user", public, vectors' -c logging_collector=on -c max_wal_size=2GB -c shared_buffers=512MB -c wal_compression=on - restart: always - -volumes: - model-cache: - db-data: - type: nfs-provider - size: 200Mi - upload: - type: nfs-provider - family_storage: - type: nfs - server: tnas1.lab.internal - path: /mnt/EightTerra/FamilyStorage - -secrets: - immich-shared: - - name: DB_USERNAME - aliases: - - POSTGRES_USER - value: immich - - name: DB_DATABASE_NAME - aliases: - - POSTGRES_DB - value: immich - - name: DB_HOSTNAME - value: database - - name: REDIS_HOSTNAME - value: redis - -externalSecrets: - generators: - db-password: - length: 16 - digits: 5 - symbols: 5 - symbolCharacters: "-_$@" - noUpper: false - allowRepeat: true - secrets: - db-password: - refreshPolicy: "CreatedOnce" - target: - name: immich-shared - creationPolicy: Merge - deletionPolicy: Merge - template: - engineVersion: v2 - data: - POSTGRES_PASSWORD: "{{`{{.password}}`}}" - DB_PASSWORD: "{{`{{.password}}`}}" - dataFrom: - - sourceRef: - generatorRef: - apiVersion: generators.external-secrets.io/v1alpha1 - kind: Password - name: "db-password" \ No newline at end of file diff --git a/charts/compose-app/values.yaml b/charts/compose-app/values.yaml index c6e253b..2bbacad 100644 --- a/charts/compose-app/values.yaml +++ b/charts/compose-app/values.yaml @@ -6,4 +6,6 @@ secrets: {} externalSecrets: generators: {} - secrets: {} \ No newline at end of file + secrets: {} + +ingress: {} \ No newline at end of file