[blocky] Update to 0.11 and add query log pvc (#353)

* [blocky] add query log persistence

Signed-off-by: Adam Cook <adam@adamjcook.dev>

* [blocky] bump version to v0.11

Signed-off-by: Adam Cook <adam@adamjcook.dev>
This commit is contained in:
Adam Cook 2020-12-14 12:53:46 -05:00 committed by GitHub
parent 436bcfdd67
commit 788d1056d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 3 deletions

View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: v0.10 appVersion: v0.11
description: DNS proxy as ad-blocker for local network description: DNS proxy as ad-blocker for local network
name: blocky name: blocky
version: 4.0.1 version: 4.1.0
keywords: keywords:
- blocky - blocky
- dbs - dbs

View File

@ -45,6 +45,13 @@ spec:
subPath: {{ $name }} subPath: {{ $name }}
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if .Values.config.queryLog }}
- name: data
mountPath: {{ .Values.config.queryLog.dir }}
{{- if .Values.persistence.subPath }}
subPath: {{ .Values.persistence.subPath }}
{{- end }}
{{- end }}
ports: ports:
- name: api - name: api
containerPort: 4000 containerPort: 4000
@ -89,6 +96,15 @@ spec:
- key: {{ $name }} - key: {{ $name }}
path: {{ $name }} path: {{ $name }}
{{- end }} {{- end }}
{{- if .Values.config.queryLog }}
- name: data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "blocky.fullname" . }}{{- end }}
{{- else }}
emptyDir: {}
{{- end }}
{{- end }}
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View File

@ -0,0 +1,33 @@
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ include "blocky.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "blocky.name" . }}
helm.sh/chart: {{ include "blocky.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.persistence.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.persistence.finalizers }}
finalizers:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
accessModes:
{{- toYaml .Values.persistence.accessModes | nindent 4 }}
{{- if .Values.persistence.storageClassName }}
storageClassName: {{ .Values.persistence.storageClassName }}
{{- end }}
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
{{- with .Values.persistence.selectorLabels }}
selector:
matchLabels:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end -}}

View File

@ -2,7 +2,7 @@ replicaCount: 1
image: image:
repository: spx01/blocky repository: spx01/blocky
tag: v0.10 tag: v0.11
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
nameOverride: "" nameOverride: ""
@ -106,11 +106,33 @@ config:
# url path, optional (default '/metrics') # url path, optional (default '/metrics')
path: /metrics path: /metrics
# optional: write query information (question, answer, client, duration etc) to daily csv file
# queryLog:
# # directory (will be mounted as volume in the pod)
# dir: /logs
# # if true, write one file per client. Writes all queries to single file otherwise
# perClient: true
# # if > 0, deletes log files which are older than ... days
# logRetentionDays: 7
# optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, ... # optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, ...
httpPort: 4000 httpPort: 4000
# optional: Log level (one from debug, info, warn, error). Default: info # optional: Log level (one from debug, info, warn, error). Default: info
logLevel: info logLevel: info
## Add persistence for query logs (if enabled)
persistence:
enabled: false
# storageClassName: default
accessModes:
- ReadWriteOnce
size: 10Gi
# annotations: {}
finalizers:
- kubernetes.io/pvc-protection
# selectorLabels: {}
# subPath: ""
# existingClaim:
# Probes configuration # Probes configuration
probes: probes: