pihole
diff --git a/core/installer/app.go b/core/installer/app.go
index e1af152..54c92d7 100644
--- a/core/installer/app.go
+++ b/core/installer/app.go
@@ -156,7 +156,7 @@
tmpls.Lookup("pihole.yaml"),
},
string(schema),
- nil,
+ tmpls.Lookup("pihole.md"),
}
}
diff --git a/core/installer/values-tmpl/pihole.jsonschema b/core/installer/values-tmpl/pihole.jsonschema
index ec6a2c5..942b269 100644
--- a/core/installer/values-tmpl/pihole.jsonschema
+++ b/core/installer/values-tmpl/pihole.jsonschema
@@ -1,15 +1,7 @@
{
"type": "object",
"properties": {
- "Values": {
- "type": "object",
- "properties": {
- "NamespacePrefix": { "type": "string" },
- "Id": { "type": "string" },
- "Domain": { "type": "string" }
- },
- "additionalProperties": false
- }
+ "Subdomain": { "type": "string", "default": "pihole" }
},
"additionalProperties": false
}
diff --git a/core/installer/values-tmpl/pihole.md b/core/installer/values-tmpl/pihole.md
new file mode 100644
index 0000000..c8c690d
--- /dev/null
+++ b/core/installer/values-tmpl/pihole.md
@@ -0,0 +1 @@
+Installs pihole at https://{{ .Values.Subdomain }}.{{ .Global.PrivateDomain }}
diff --git a/core/installer/values-tmpl/pihole.yaml b/core/installer/values-tmpl/pihole.yaml
index 6ac7d39..2e38278 100644
--- a/core/installer/values-tmpl/pihole.yaml
+++ b/core/installer/values-tmpl/pihole.yaml
@@ -2,7 +2,7 @@
kind: HelmRelease
metadata:
name: pihole
- namespace: {{ .Values.NamespacePrefix }}app-pihole
+ namespace: {{ .Global.NamespacePrefix }}app-pihole
spec:
chart:
spec:
@@ -10,13 +10,10 @@
sourceRef:
kind: GitRepository
name: pcloud
- namespace: {{ .Values.Id }}
- dependsOn:
- - name: namespaces
- namespace: {{ .Values.Id }}
+ namespace: {{ .Global.Id }}
interval: 1m0s
values:
- domain: pihole.p.{{ .Values.Domain }}
+ domain: {{ .Values.Subdomain}}.{{ .Global.PrivateDomain }}
pihole:
image:
repository: "pihole/pihole"
@@ -37,7 +34,7 @@
enabled: true
https:
enabled: false
- virtualHost: pihole.p.{{ .Values.Domain }}
+ virtualHost: {{ .Values.Subdomain }}.{{ .Global.PrivateDomain }}
resources:
requests:
cpu: "250m"
@@ -51,7 +48,7 @@
cookieSecret: {{ .Values.PiholeOAuth2CookieSecret }}
secretName: oauth2-secret
configName: oauth2-proxy
- hydraAdmin: http://hydra-admin.{{ .Values.NamespacePrefix}}core-auth.svc.cluster.local
- hydraPublic: https://hydra.{{ .Values.Domain }}/
- profileUrl: https://accounts-ui.{{ .Values.Domain }}
- ingressClassName: {{ .Values.Id }}-ingress-private
+ hydraAdmin: http://hydra-admin.{{ .Global.NamespacePrefix }}core-auth.svc
+ hydraPublic: https://hydra.{{ .Global.Domain }}/
+ profileUrl: https://accounts-ui.{{ .Global.Domain }}
+ ingressClassName: {{ .Global.Id }}-ingress-private