diff --git a/charts/apps/argoapps/templates/compose-apps.yaml b/charts/apps/argoapps/templates/compose-apps.yaml index 5628a65..6baae60 100644 --- a/charts/apps/argoapps/templates/compose-apps.yaml +++ b/charts/apps/argoapps/templates/compose-apps.yaml @@ -11,8 +11,8 @@ spec: project: main source: path: 'charts/compose-app' - repoURL: {{ $.Values.gitops.repo }} - targetRevision: {{ $.Values.gitops.revision }} + repoURL: {{ $.Values.composeApp.gitops.repo }} + targetRevision: {{ $.Values.composeApp.gitops.revision }} helm: values: |- global: diff --git a/charts/apps/argoapps/values.yaml b/charts/apps/argoapps/values.yaml index 2675d81..6b3d8ca 100644 --- a/charts/apps/argoapps/values.yaml +++ b/charts/apps/argoapps/values.yaml @@ -4,6 +4,8 @@ global: nfs: storageClassName: "" storageProvider: "" -gitops: - repo: ssh://gitea@minipc1.lab.internal/ari/homelab.git - revision: main \ No newline at end of file + +composeApp: + gitops: + repo: git@github.com:asosnovsky/helm-charts.git + revision: main \ No newline at end of file diff --git a/charts/compose-app/Chart.yaml b/charts/compose-app/Chart.yaml deleted file mode 100644 index eee6df3..0000000 --- a/charts/compose-app/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: immich -description: An apps service for homelab -type: application -version: 0.1.0 -dependencies: [] diff --git a/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl b/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl deleted file mode 100644 index 5f4ff90..0000000 --- a/charts/compose-app/templates/_helpers/ingress.domain.tls.tpl +++ /dev/null @@ -1,43 +0,0 @@ -{{ 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 deleted file mode 100644 index 8e1e987..0000000 --- a/charts/compose-app/templates/_helpers/ingress.domain.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{{- 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 deleted file mode 100644 index cb7ce25..0000000 --- a/charts/compose-app/templates/_helpers/ingress.tailscale.tpl +++ /dev/null @@ -1,37 +0,0 @@ -{{ 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 deleted file mode 100644 index a054029..0000000 --- a/charts/compose-app/templates/_helpers/ingress.tpl +++ /dev/null @@ -1,122 +0,0 @@ -{{- 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/deploy.yaml b/charts/compose-app/templates/deploy.yaml deleted file mode 100644 index e0d8bb2..0000000 --- a/charts/compose-app/templates/deploy.yaml +++ /dev/null @@ -1,93 +0,0 @@ -{{ range $name, $data := .Values.services }} ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: {{ $name }} - namespace: {{ $.Release.Namespace | quote }} - annotations: - {{- if $data.labels }} - {{ range $i, $val := $data.labels }} - {{- $parts := splitList "=" $val -}} - "{{ index $parts 0 }}": "{{ index $parts 1 }}" - {{ end }} - {{- end }} -spec: - replicas: {{ $data.replicas | default 1 }} - selector: - matchLabels: - app: {{ $name }} - template: - metadata: - labels: - app: {{ $name }} - spec: - {{ if $data.volumes -}} - volumes: - {{ range $volname, $_ := $data.volumes }} - - name: "{{ $volname }}" - persistentVolumeClaim: - claimName: "{{ $volname }}" - {{- end }} - {{- end }} - - containers: - - name: {{ $name }} - image: {{ $data.image | quote }} - ports: - {{ range $p := $data.ports }} - - containerPort: {{ $p.port }} - protocol: {{ $p.protocol | default "TCP" | quote }} - {{ end }} - {{ if $data.volumes }} - volumeMounts: - {{ range $volname, $mountPath := $data.volumes }} - - name: {{ $volname | quote }} - mountPath: {{ $mountPath | quote }} - {{ end }} - {{ end }} - {{ if $data.envFrom}} - envFrom: - {{ $data.envFrom | toYaml | nindent 26 }} - {{ end }} - {{ if $data.environment }} - env: - {{ range $key, $value := $data.environment }} - - name: {{ $key | quote }} - value: {{ $value | quote }} - {{ end }} - {{ end }} - {{ if $data.command }} - command: - {{ $data.command | toYaml | nindent 26 }} - {{ end }} - {{ if $data.args }} - args: - {{ range $cmd := $data.args }} - - {{ $cmd | quote }} - {{ end }} - {{ end }} - ---- -kind: Service -apiVersion: v1 -metadata: - name: {{ $name }} - namespace: {{ $.Release.Namespace | quote }} - annotations: - {{- if $data.serviceAnnotations }} - {{ $data.serviceAnnotations | toYaml | nindent 4 }} - {{- end }} -spec: - selector: - app: {{ $name }} - type: {{ $data.serviceType | default "ClusterIP" | quote }} - ports: - {{ range $port := $data.ports }} - - name: {{ $port.name | default "http" | quote }} - port: {{ $port.port }} - protocol: {{ $port.protocol | default "TCP" | quote }} - targetPort: {{ $port.port }} - {{ end }} - -{{ end }} \ No newline at end of file diff --git a/charts/compose-app/templates/ingress.yaml b/charts/compose-app/templates/ingress.yaml deleted file mode 100644 index 591be8b..0000000 --- a/charts/compose-app/templates/ingress.yaml +++ /dev/null @@ -1,3 +0,0 @@ -{{ if .Values.ingress.enabled }} -{{ include "homelab.ingress" (merge .Values.ingress (dict "global" $.Values.global "namespace" $.Release.Namespace)) }} -{{ end }} \ No newline at end of file diff --git a/charts/compose-app/templates/secrets/es.yaml b/charts/compose-app/templates/secrets/es.yaml deleted file mode 100644 index a6e56e8..0000000 --- a/charts/compose-app/templates/secrets/es.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ range $name, $data := .Values.externalSecrets.secrets }} ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: "{{ $name }}" - namespace: {{ $.Release.Namespace | quote }} -spec: -{{ $data | toYaml | nindent 2 }} -{{ end }} \ No newline at end of file diff --git a/charts/compose-app/templates/secrets/generators.yaml b/charts/compose-app/templates/secrets/generators.yaml deleted file mode 100644 index 5d16540..0000000 --- a/charts/compose-app/templates/secrets/generators.yaml +++ /dev/null @@ -1,11 +0,0 @@ - -{{ range $name, $data := .Values.externalSecrets.generators }} ---- -apiVersion: generators.external-secrets.io/v1alpha1 -kind: Password -metadata: - name: {{ $name | quote }} - namespace: {{ $.Release.Namespace | quote }} -spec: - {{ $data | toYaml | nindent 2 }} -{{ end }} diff --git a/charts/compose-app/templates/secrets/secrets.yaml b/charts/compose-app/templates/secrets/secrets.yaml deleted file mode 100644 index 7379514..0000000 --- a/charts/compose-app/templates/secrets/secrets.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{ range $name, $data := .Values.secrets }} ---- -kind: Secret -apiVersion: v1 -metadata: - name: {{ $name | quote }} - namespace: {{ $.Release.Namespace | quote }} -stringData: -{{- range $s := $data }} - {{ $s.name | quote }}: {{ $s.value | quote }} - {{ range $a := $s.aliases -}} - {{ $a | quote }}: {{ $s.value | quote }} - {{- end -}} -{{- end -}} -{{ end }} diff --git a/charts/compose-app/templates/volumes.yaml b/charts/compose-app/templates/volumes.yaml deleted file mode 100644 index 53257ee..0000000 --- a/charts/compose-app/templates/volumes.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{{ range $name, $data := .Values.volumes}} - -{{ $data := $data | default (dict) }} -{{- $volType := ($data.type | default "") -}} - -{{ if (eq $volType "nfs") }} - -{{- $vname := printf "%s-nfs-%s" $.Release.Namespace ($name | sha256sum | substr 0 23) -}} - ---- -kind: PersistentVolume -apiVersion: v1 -metadata: - name: "{{ $vname }}" - namespace: {{ $.Release.Namespace | quote }} -spec: - capacity: - storage: 1Mi - accessModes: - - "ReadWriteMany" - nfs: - server: {{ $data.server | quote }} - path: {{ $data.path | quote }} - mountOptions: - - nfsvers=4.2 - ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ $name }} - namespace: {{ $.Release.Namespace | quote }} -spec: - accessModes: - - ReadWriteMany - storageClassName: "" - resources: - requests: - storage: 1Mi - volumeName: {{ $vname | quote }} - -{{ else }} ---- -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ $name }} - namespace: {{ $.Release.Namespace | quote }} -spec: - accessModes: - - {{ $data.accessMode | default "ReadWriteOnce" | quote }} - resources: - requests: - storage: {{ $data.size | default "1Gi" | quote }} - {{- if $volType }} - storageClassName: {{ $volType | quote }} - {{- end }} -{{ end }} -{{ end }} \ No newline at end of file diff --git a/charts/compose-app/values.yaml b/charts/compose-app/values.yaml deleted file mode 100644 index 5fc9c5e..0000000 --- a/charts/compose-app/values.yaml +++ /dev/null @@ -1,27 +0,0 @@ -global: - dns: - internalPrefix: k3s.local - primary: - domain: "bob.cat" - root: "" - secondary: - domain: "tod.cat" - root: "gr" - tls: - acmeServer: "http://acme" - enabled: true - issuer: "issue" - skipTLSVerify: true - useWildCard: true -services: [] - -volumes: {} - -secrets: {} - -externalSecrets: - generators: {} - secrets: {} - -ingress: {} -