Installer: introduce namespacePrefix, fix certificates, split matrix installation using pre-install hook
diff --git a/charts/pihole/templates/oauth2-client.yaml b/charts/pihole/templates/oauth2-client.yaml
index 3ad56b2..a0b1b11 100644
--- a/charts/pihole/templates/oauth2-client.yaml
+++ b/charts/pihole/templates/oauth2-client.yaml
@@ -11,7 +11,7 @@
scope: "openid email profile"
secretName: {{ .Values.oauth2.secretName }}
redirectUris:
- - https://pihole.p.{{ .Values.domain }}/oauth2/callback
+ - https://{{ .Values.domain }}/oauth2/callback
hydraAdmin:
url: {{ .Values.oauth2.hydraAdmin }}
port: 80
diff --git a/charts/pihole/templates/oauth2-proxy-config.yaml b/charts/pihole/templates/oauth2-proxy-config.yaml
index 69a6448..04c6400 100644
--- a/charts/pihole/templates/oauth2-proxy-config.yaml
+++ b/charts/pihole/templates/oauth2-proxy-config.yaml
@@ -38,7 +38,7 @@
cookie_name = "_oauth2_proxy_pihole"
cookie_secret = "{{ .Values.oauth2.cookieSecret }}"
- cookie_domains = "pihole.p.{{ .Values.domain }}"
+ cookie_domains = "{{ .Values.domain }}"
cookie_expire = "168h"
cookie_refresh = "100h"
cookie_secure = true
diff --git a/charts/pihole/templates/oauth2-proxy.yaml b/charts/pihole/templates/oauth2-proxy.yaml
index b78490d..ddf0e2f 100644
--- a/charts/pihole/templates/oauth2-proxy.yaml
+++ b/charts/pihole/templates/oauth2-proxy.yaml
@@ -19,17 +19,13 @@
metadata:
name: ingress
namespace: {{ .Release.Namespace }}
- # annotations:
- # cert-manager.io/cluster-issuer: "{{ .Values.certificateIssuer }}"
- # acme.cert-manager.io/http01-edit-in-place: "true"
spec:
ingressClassName: {{ .Values.ingressClassName }}
tls:
- hosts:
- - pihole.p.{{ .Values.domain }}
- # secretName: cert-pihole.{{ .Values.domain }}
+ - {{ .Values.domain }}
rules:
- - host: pihole.p.{{ .Values.domain }}
+ - host: {{ .Values.domain }}
http:
paths:
- path: /
diff --git a/charts/pihole/values.yaml b/charts/pihole/values.yaml
index a7ced0b..65d1de4 100644
--- a/charts/pihole/values.yaml
+++ b/charts/pihole/values.yaml
@@ -5,10 +5,9 @@
cookieSecret: ""
secretName: oauth2-secret
configName: oauth2-proxy
-domain: example.com
+domain: pihole.p.example.com
hydraPublic: https://hydra.example.com
profileUrl: https://profile.example.com
-certificateIssuer: public
-ingressClassName: public
+ingressClassName: private