diff --git a/Chart.yaml b/Chart.yaml new file mode 100644 index 0000000..d6c6e0b --- /dev/null +++ b/Chart.yaml @@ -0,0 +1,14 @@ +apiVersion: v2 +name: home-server +description: A Helm chart for deploying the home-server application +type: application +version: 0.1.0 +appVersion: "1.0.0" + +dependencies: + - name: subcharts + version: 0.1.0 + repository: "file://charts/subcharts" + - name: dns + version: 0.1.0 + repository: "file://charts/dns" diff --git a/charts/dns/templates/bind-master.yaml b/charts/dns/templates/bind-master.yaml index 4d3328c..3facb5b 100644 --- a/charts/dns/templates/bind-master.yaml +++ b/charts/dns/templates/bind-master.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: bind-master-config + namespace: {{ .Release.Namespace }} data: named.conf: | include "/etc/bind/externaldns-key.conf"; @@ -51,6 +52,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: bind-master + namespace: {{ .Release.Namespace }} spec: selector: matchLabels: @@ -120,6 +122,7 @@ apiVersion: v1 kind: Service metadata: name: bind-master + namespace: {{ .Release.Namespace }} spec: type: ClusterIP selector: diff --git a/charts/dns/templates/bind-slave.yaml b/charts/dns/templates/bind-slave.yaml deleted file mode 100644 index 091e96e..0000000 --- a/charts/dns/templates/bind-slave.yaml +++ /dev/null @@ -1,138 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: bind-slave-config -data: - named.conf: | - include "/etc/bind/externaldns-key.conf"; - - options { - directory "/var/cache/bind"; - - recursion yes; - allow-query { any; }; - - listen-on port 53 { any; }; - listen-on-v6 port 53 { any; }; - - forwarders { - 10.40.0.254; - }; - - dnssec-validation auto; - }; - - zone "." IN { - type hint; - file "/usr/share/dns/root.hints"; - }; - - zone "hxme.net." IN { - type master; - file "/etc/bind/db.hxme.net"; - allow-update { key "externaldns-key"; }; - }; - db.hxme.net: | - $TTL 3600 - @ IN SOA ns1.hxme.net. admin.hxme.net. ( - 1 ; Serial - 7200 ; Refresh - 1800 ; Retry - 1209600 ; Expire - 86400 ) ; Negative Cache TTL - ; - @ IN NS ns1.hxme.net. - ns1 IN A 10.40.0.110 - @ IN A 10.40.0.110 - www IN A 10.40.0.110 ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: bind-slave -spec: - selector: - matchLabels: - app: bind-slave - template: - metadata: - labels: - app: bind-slave - spec: - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - securityContext: - fsGroup: 999 - initContainers: - - name: fetch-root-hints - image: debian:12 - command: - - sh - - -c - - | - apt update && apt -y install curl - curl -sfSL https://www.internic.net/domain/named.cache -o /usr/share/dns/root.hints - volumeMounts: - - mountPath: /usr/share/dns - name: root-hints - containers: - - name: bind-slave - image: internetsystemsconsortium/bind9:9.18 - command: ["named", "-g", "-c", "/etc/bind/named.conf"] - ports: - - containerPort: 53 - protocol: UDP - - containerPort: 53 - protocol: TCP - volumeMounts: - - name: config - mountPath: /etc/bind/named.conf - subPath: named.conf - - name: config - mountPath: /etc/bind/db.hxme.net - subPath: db.hxme.net - - name: dns-secrets - mountPath: /etc/bind/externaldns-key.conf - subPath: externaldns-key.conf - - name: bind-cache - mountPath: /var/cache/bind - - name: bind-rundir - mountPath: /var/run/named - - name: root-hints - mountPath: /usr/share/dns - volumes: - - name: dns-secrets - secret: - secretName: dns-secrets - - name: config - configMap: - name: bind-slave-config - - name: bind-cache - emptyDir: {} - - name: bind-rundir - emptyDir: {} - - name: root-hints - emptyDir: {} - ---- -apiVersion: v1 -kind: Service -metadata: - name: bind-master - namespace: default -spec: - type: LoadBalancer - externalTrafficPolicy: Local - selector: - app: bind-master - ports: - - name: dns-udp - port: 53 - protocol: UDP - targetPort: 53 - - name: dns-tcp - port: 53 - protocol: TCP - targetPort: 53 - diff --git a/charts/dns/templates/externaldns.yaml b/charts/dns/templates/externaldns.yaml index 814af6c..22595c4 100644 --- a/charts/dns/templates/externaldns.yaml +++ b/charts/dns/templates/externaldns.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: external-dns + namespace: {{ .Release.Namespace }} rules: - apiGroups: [""] resources: ["services","endpoints","pods"] @@ -18,6 +19,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: external-dns-viewer + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -30,11 +32,13 @@ apiVersion: v1 kind: ServiceAccount metadata: name: external-dns + namespace: {{ .Release.Namespace }} --- apiVersion: apps/v1 kind: Deployment metadata: name: external-dns + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/charts/subcharts/Chart.lock b/charts/subcharts/Chart.lock new file mode 100644 index 0000000..e6f2224 --- /dev/null +++ b/charts/subcharts/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: mariadb-operator-crds + repository: https://helm.mariadb.com/mariadb-operator + version: 0.38.1 +- name: mariadb-operator + repository: https://helm.mariadb.com/mariadb-operator + version: 0.38.1 +digest: sha256:488ca12800fb05f4a89dd178558f544c44f0d7af11bb07010031e45e38df3a28 +generated: "2025-07-05T14:11:03.425098652Z" diff --git a/charts/subcharts/Chart.yaml b/charts/subcharts/Chart.yaml new file mode 100644 index 0000000..24c4e23 --- /dev/null +++ b/charts/subcharts/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: home-server-subcharts +version: 0.1.0 +dependencies: + - name: mariadb-operator-crds + version: 0.38.1 + repository: https://helm.mariadb.com/mariadb-operator + - name: mariadb-operator + version: 0.38.1 + repository: https://helm.mariadb.com/mariadb-operator diff --git a/charts/subcharts/charts/mariadb-operator-0.38.1.tgz b/charts/subcharts/charts/mariadb-operator-0.38.1.tgz new file mode 100644 index 0000000..828bdc5 Binary files /dev/null and b/charts/subcharts/charts/mariadb-operator-0.38.1.tgz differ diff --git a/charts/subcharts/charts/mariadb-operator-crds-0.38.1.tgz b/charts/subcharts/charts/mariadb-operator-crds-0.38.1.tgz new file mode 100644 index 0000000..d6b829c Binary files /dev/null and b/charts/subcharts/charts/mariadb-operator-crds-0.38.1.tgz differ diff --git a/charts/subcharts/templates/namespace.yaml b/charts/subcharts/templates/namespace.yaml new file mode 100644 index 0000000..1bef2cc --- /dev/null +++ b/charts/subcharts/templates/namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: {{ .Values.mariadbNamespace }} diff --git a/charts/subcharts/values.yaml b/charts/subcharts/values.yaml new file mode 100644 index 0000000..b7386ca --- /dev/null +++ b/charts/subcharts/values.yaml @@ -0,0 +1,9 @@ +mariadbNamespace: mariadb-system-dev + +mariadb-operator: + fullnameOverride: mariadb-operator + namespaceOverride: mariadb-system + metrics: + enabled: true + +mariadb-operator-crds: {} diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 1451599..cf86131 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -5,4 +5,3 @@ resources: - manifests/00-namespaces.yaml - manifests/10-repository.yaml - manifests/20-dev.yaml - - manifests/20-prod.yaml diff --git a/deployments/manifests/00-namespaces.yaml b/deployments/manifests/00-namespaces.yaml index 73496f4..6b84b30 100644 --- a/deployments/manifests/00-namespaces.yaml +++ b/deployments/manifests/00-namespaces.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: - name: home-server + name: home-server-prod --- apiVersion: v1 kind: Namespace diff --git a/deployments/manifests/20-dev.yaml b/deployments/manifests/20-dev.yaml index 0e1ebe5..a904cd0 100644 --- a/deployments/manifests/20-dev.yaml +++ b/deployments/manifests/20-dev.yaml @@ -1,14 +1,17 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease metadata: name: home-server-dev - namespace: flux-system + namespace: home-server-dev spec: interval: 1m - path: ./deployments - prune: true - sourceRef: - kind: GitRepository - name: home-server-dev - targetNamespace: home-server-dev + chart: + spec: + chart: ./ + sourceRef: + kind: GitRepository + name: home-server-dev + namespace: flux-system + values: + mariadbNamespace: mariadb-db-dev diff --git a/deployments/manifests/20-prod.yaml b/deployments/manifests/20-prod.yaml index 1f5d4bd..43225e6 100644 --- a/deployments/manifests/20-prod.yaml +++ b/deployments/manifests/20-prod.yaml @@ -1,14 +1,17 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease metadata: name: home-server-prod - namespace: flux-system + namespace: home-server-prod spec: interval: 1m - path: ./deployments - prune: true - sourceRef: - kind: GitRepository - name: home-server-prod - targetNamespace: home-server + chart: + spec: + chart: ./ + sourceRef: + kind: GitRepository + name: home-server-prod + namespace: flux-system + values: + mariadbNamespace: mariadb-db