diff --git a/kubernetes/apps/adguard-home/adguard-home.yaml b/kubernetes/apps/adguard-home/adguard-home.yaml index 80b0948..28f9662 100644 --- a/kubernetes/apps/adguard-home/adguard-home.yaml +++ b/kubernetes/apps/adguard-home/adguard-home.yaml @@ -2,15 +2,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: adguard-home - namespace: adguard-home + namespace: flux-system spec: interval: 1h targetNamespace: adguard-home - path: ./kubernetes/apps/adguard-home/app + path: ./kubernetes/apps/adguard-home prune: true sourceRef: kind: GitRepository namespace: flux-system - name: flux-system - postBuild: - substituteFrom: [] \ No newline at end of file + name: flux-system \ No newline at end of file diff --git a/kubernetes/apps/adguard-home/app/chart.yaml b/kubernetes/apps/adguard-home/app/chart.yaml deleted file mode 100644 index c31ae0d..0000000 --- a/kubernetes/apps/adguard-home/app/chart.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: v2 -name: adguard-home -description: Free and open source, powerful network-wide ads & trackers blocking DNS server. -home: https://github.com/3dwardch3ng/helm-charts/tree/main/charts/adguard-home -icon: https://raw.githubusercontent.com/3dwardch3ng/helm-charts/main/charts/adguard-home/icon.svg -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 -# renovate datasource=docker depName=adguard/adguardhome - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "v0.107.51" -kubeVersion: ">=1.22.0-0" -keywords: - - adblock - - dns - - privacy -sources: - - https://github.com/AdguardTeam/AdGuardHome diff --git a/kubernetes/apps/adguard-home/app/deployment.yaml b/kubernetes/apps/adguard-home/app/deployment.yaml deleted file mode 100644 index 34d47ca..0000000 --- a/kubernetes/apps/adguard-home/app/deployment.yaml +++ /dev/null @@ -1,76 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: adguard-home - namespace: adguard-home - labels: - app.kubernetes.io/name: adguard-home -spec: - selector: - matchLabels: - app.kubernetes.io/name: adguard-home - template: - metadata: - labels: - app.kubernetes.io/name: adguard-home - spec: - containers: - - name: adguard-home - image: adguard/adguardhome:v0.107.51 - ports: - - protocol: TCP - containerPort: 53 - name: c-dns-tcp - - protocol: UDP - containerPort: 53 - name: c-dns-udp - - protocol: UDP - containerPort: 67 - name: c-dhcp-svr - - protocol: UDP - containerPort: 68 - name: con-dhcp-clt - - protocol: TCP - containerPort: 80 - name: c-main-tcp - - protocol: TCP - containerPort: 443 - name: c-https-tcp - - protocol: UDP - containerPort: 443 - name: c-https-udp - - protocol: TCP - containerPort: 853 - name: c-dns-tls-tcp - - protocol: UDP - containerPort: 853 - name: c-dns-tls-udp - - protocol: TCP - containerPort: 3000 - name: c-http-alt-tcp - - protocol: UDP - containerPort: 3000 - name: c-httpalt-udp - - protocol: TCP - containerPort: 5443 - name: c-dnscrypt-tcp - - protocol: UDP - containerPort: 5443 - name: c-dnscrypt-udp - - protocol: TCP - containerPort: 6060 - name: c-http-pprof - volumeMounts: - - name: adguard-home-data - mountPath: /opt/adguardhome/work - - name: adguard-home-config - mountPath: /opt/adguardhome/config - volumes: - - name: adguard-home-data - hostPath: - path: /mnt/nfs/AppData/adguardhome/work - type: Directory - - name: adguard-home-config - hostPath: - path: /mnt/nfs/AppData/adguardhome/conf - type: Directory diff --git a/kubernetes/apps/adguard-home/app/release.yaml b/kubernetes/apps/adguard-home/app/release.yaml deleted file mode 100644 index bfd6173..0000000 --- a/kubernetes/apps/adguard-home/app/release.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: adguard-home - namespace: adguard-home -spec: - chart: - metadata: - name: adguard-home - namespace: adguard-home - spec: - chart: adguard-home - version: 0.1.0 - sourceRef: - kind: GitRepository - name: flux-system - namespace: flux-system - interval: 5m - interval: 5m - targetNamespace: adguard-home - dependsOn: - install: - crds: Create - upgrade: - crds: CreateReplace - valuesFrom: - - kind: Secret - name: adguard-home-vars \ No newline at end of file diff --git a/kubernetes/apps/adguard-home/app/service.yaml b/kubernetes/apps/adguard-home/app/service.yaml deleted file mode 100644 index 8f3a8b4..0000000 --- a/kubernetes/apps/adguard-home/app/service.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: adguard-home - namespace: adguard-home - labels: - app.kubernetes.io/name: adguard-home -spec: - selector: - app.kubernetes.io/name: adguard-home - type: ClusterIP - internalTrafficPolicy: Cluster - ports: - - protocol: TCP - port: 53 - targetPort: 53 - name: dns-tcp - - protocol: UDP - port: 53 - targetPort: 53 - name: dns-udp - - protocol: UDP - port: 67 - targetPort: 67 - name: dhcp-server-udp - - protocol: UDP - port: 68 - targetPort: 68 - name: dhcp-client-udp - - protocol: TCP - port: 80 - targetPort: 80 - name: http-main-tcp - - protocol: TCP - port: 443 - targetPort: 443 - name: https-tcp - - protocol: UDP - port: 443 - targetPort: 443 - name: https-udp - - protocol: TCP - port: 853 - targetPort: 853 - name: dns-tls-tcp - - protocol: UDP - port: 853 - targetPort: 853 - name: dns-tls-udp - - protocol: TCP - port: 3000 - targetPort: 3000 - name: https-alt-tcp - - protocol: UDP - port: 3000 - targetPort: 3000 - name: https-alt-udp - - protocol: TCP - port: 5443 - targetPort: 5443 - name: dns-crypt-tcp - - protocol: UDP - port: 5443 - targetPort: 5443 - name: dns-crypt-udp - - protocol: TCP - port: 6060 - targetPort: 6060 - name: https-pprof diff --git a/kubernetes/apps/adguard-home/app/namespace.yaml b/kubernetes/apps/adguard-home/namespace.yaml similarity index 100% rename from kubernetes/apps/adguard-home/app/namespace.yaml rename to kubernetes/apps/adguard-home/namespace.yaml diff --git a/kubernetes/apps/adguard-home/release.yaml b/kubernetes/apps/adguard-home/release.yaml new file mode 100644 index 0000000..4550a10 --- /dev/null +++ b/kubernetes/apps/adguard-home/release.yaml @@ -0,0 +1,53 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: adguard-home + namespace: adguard-home +spec: + releaseName: adguard-home + chart: + spec: + chart: adguard-home + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + remediation: + retries: 3 + values: + service: + main: + ports: + main: + port: 10080 + protocol: http + setup: + enabled: true + ports: + setup: + enabled: true + port: 13000 + targetPort: 3000 + persistence: + config: + enabled: true + hostPath: /mnt/nfs/AppData/adguardhome/conf + type: Directory + work: + enabled: true + hostPath: /mnt/nfs/AppData/adguardhome/work + type: Directory + portal: + open: + enabled: true + container: + volumeMounts: + - name: work + mountPath: /opt/adguardhome/work + readOnly: false + - name: config + mountPath: /opt/adguardhome/conf + readOnly: false + diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml index 21ff023..632de20 100644 --- a/kubernetes/apps/kustomization.yaml +++ b/kubernetes/apps/kustomization.yaml @@ -4,4 +4,5 @@ resources: - ./adguard-home/adguard-home.yaml - ./capacitor/capacitor.yaml - ./cert-manager/cert-manager.yaml + - ./clusterissuer/clusterissuer.yaml - ./podinfo/podinfo.yaml \ No newline at end of file diff --git a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml index b998ebf..3bcf555 100644 --- a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml +++ b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml @@ -4,6 +4,7 @@ metadata: name: prometheus-operator namespace: flux-system spec: + suspend: true interval: 1h targetNamespace: cert-manager path: ./kubernetes/apps/prometheus-operator