charts: pihole fix oauth2 secret values escaping
diff --git a/charts/pihole/templates/oauth2-client-secret.yaml b/charts/pihole/templates/oauth2-client-secret.yaml
deleted file mode 100644
index 75cbaf9..0000000
--- a/charts/pihole/templates/oauth2-client-secret.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# apiVersion: v1
-# kind: Secret
-# type: Opaque
-# metadata:
-# name: {{ .Values.oauth2.secretName }}
-# namespace: {{ .Release.Namespace }}
-# data:
-# client_id: {{ .Values.oauth2.clientId | b64enc }}
-# client_secret: {{ .Values.oauth2.clientSecret | b64enc }}
diff --git a/charts/pihole/templates/oauth2-client.yaml b/charts/pihole/templates/oauth2-client.yaml
index 1814ade..f178ea0 100644
--- a/charts/pihole/templates/oauth2-client.yaml
+++ b/charts/pihole/templates/oauth2-client.yaml
@@ -1,7 +1,7 @@
apiVersion: hydra.ory.sh/v1alpha1
kind: OAuth2Client
metadata:
- name: {{ .Values.oauth2.clientId }}
+ name: oauth2-client
namespace: {{ .Release.Namespace }}
spec:
grantTypes:
diff --git a/charts/pihole/templates/oauth2-proxy-config.yaml b/charts/pihole/templates/oauth2-proxy-config.yaml
index 6afa5fd..2141bce 100644
--- a/charts/pihole/templates/oauth2-proxy-config.yaml
+++ b/charts/pihole/templates/oauth2-proxy-config.yaml
@@ -1,8 +1,8 @@
apiVersion: dodo.cloud.dodo.cloud/v1
kind: ResourceRenderer
metadata:
- name: resourcerenderer-sample
- namespace: test
+ name: config-renderer
+ namespace: {{ .Release.Namespace }}
spec:
secretName: {{ .Values.oauth2.secretName }}
resourceTemplate: |
@@ -38,8 +38,8 @@
pass_host_header = true
## The OAuth Client ID, Secret
- client_id = "{{ .Values.oauth2.clientId }}"
- client_secret = "{{ .Values.oauth2.clientSecret }}"
+ client_id = "{{`{{ .client_id }}`}}"
+ client_secret = "{{`{{ .client_secret }}`}}"
## Pass OAuth Access token to upstream via "X-Forwarded-Access-Token"
pass_access_token = false
diff --git a/charts/pihole/values.yaml b/charts/pihole/values.yaml
index bea1a7e..070be1e 100644
--- a/charts/pihole/values.yaml
+++ b/charts/pihole/values.yaml
@@ -1,8 +1,6 @@
pihole: {}
oauth2:
- clientId: {{ .client_id }}
- clientSecret: {{ .client_secret }}
- cookieSecret: ""
+ cookieSecret: "1234123443214321"
secretName: oauth2-secret
configName: oauth2-proxy
domain: pihole.p.example.com