[blocky] migrate to common (#701)

* migrate to common

* comment out additional services and podAnnotations

* requested changes

* requested changes

* Update Chart.yaml

Co-authored-by: Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs <me@bjw-s.dev>

charts/stable/blocky/.helmignore

@@ -22,3 +22,5 @@
 .vscode/
 # OWNERS file for Kubernetes
 OWNERS
+# helm-docs templates
+*.gotmpl

charts/stable/blocky/Chart.yaml

@@ -1,16 +1,21 @@
 apiVersion: v2
-appVersion: v0.12
+appVersion: v0.13
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 5.0.2
+version: 6.0.0
+kubeVersion: ">=1.16.0-0"
 keywords:
-  - blocky
+- blocky
-  - adblock
+- adblock
-  - dns
+- dns
 home: https://github.com/k8s-at-home/charts/tree/master/charts/stable/blocky
 icon: https://github.com/0xERR0R/blocky/raw/master/docs/blocky.svg?sanitize=true
 sources:
-  - https://github.com/0xERR0R/blocky
+- https://github.com/0xERR0R/blocky
 maintainers:
-  - name: billimek
+- name: billimek
   email: jeff@billimek.com
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 2.0.1

charts/stable/blocky/README_CHANGELOG.md.gotmpl

@@ -9,7 +9,7 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [5.0.1]
+### [6.0.0]
 
 #### Added
 
@@ -17,12 +17,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 #### Changed
 
-- configuration inside `config` is no longer a yaml object, it is now a multiline string
+- **BREAKING** Migrate Blocky to the common library, a lot of configuration has changed.
-- moved to helm-docs
 
 #### Removed
 
 - N/A
 
-[5.0.1]: #5.0.1
+[6.0.0]: #6.0.0
 {{- end -}}

charts/stable/blocky/templates/NOTES.txt

@@ -1,15 +1 @@
-1. Get the application URL by running these commands:
+{{- include "common.notes.defaultNotes" . -}}
-{{- if contains "NodePort" .Values.serviceUDP.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "blocky.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.serviceUDP.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "blocky.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "blocky.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.serviceUDP.port }}
-{{- else if contains "ClusterIP" .Values.serviceUDP.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "blocky.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}

charts/stable/blocky/templates/_helpers.tpl

@@ -1,41 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "blocky.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "blocky.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified postgresql name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "blocky.postgresql.fullname" -}}
-{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "blocky.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/stable/blocky/templates/common.yaml

@@ -0,0 +1,31 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the configMap to the additionalVolumes */}}
+{{- define "blocky.configmap.volume" -}}
+name: blocky-config
+configMap:
+  name: {{ template "common.names.fullname" . }}-config
+{{- end -}}
+
+{{- $volume := include "blocky.configmap.volume" . | fromYaml -}}
+{{- if $volume -}}
+    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
+    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
+{{- end -}}
+
+{{/* Append the configMap volume to the additionalVolumeMounts */}}
+{{- define "blocky.configmap.volumeMount" -}}
+name: blocky-config
+mountPath: /app/config.yml
+subPath: config.yml
+{{- end -}}
+
+{{- $volumeMount := include "blocky.configmap.volumeMount" . | fromYaml -}}
+{{- if $volumeMount -}}
+    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
+    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
+{{- end -}}
+
+{{/* Render the templates */}}
+{{ include "common.all" . }}

charts/stable/blocky/templates/configmap.yaml

@@ -1,13 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "blocky.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-config
-  namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "blocky.name" . }}
+    {{- include "common.labels" . | nindent 4 }}
-    helm.sh/chart: {{ include "blocky.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
   config.yml: |
 {{ .Values.config | indent 4 }}

charts/stable/blocky/templates/deployment.yaml

@@ -1,120 +0,0 @@
-{{- $blockyConfig := .Values.config | fromYaml }}
-apiVersion: apps/v1
-kind: Deployment
-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 }}
-spec:
-  replicas: {{ .Values.replicas }}
-  revisionHistoryLimit: 3
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "blocky.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "blocky.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      annotations:
-        checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-      {{- with .Values.podAnnotations }}
-        {{ toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            {{- if .Values.timeZone }}
-            - name: TZ
-              value: {{ .Values.timeZone | quote }}
-            {{- end }}
-          volumeMounts:
-            - name: config
-              mountPath: /app/config.yml
-              subPath: config.yml
-              readOnly: true
-            {{- range $name, $value := .Values.extraLists }}
-            - name: config
-              mountPath: /app/{{ $name }}
-              subPath: {{ $name }}
-              readOnly: true
-            {{- end }}
-            {{- if hasKey $blockyConfig "queryLog" }}
-            - name: data
-              mountPath: {{ $blockyConfig.queryLog.dir }}
-              {{- if .Values.persistence.subPath }}
-              subPath: {{ .Values.persistence.subPath }}
-              {{- end }}
-            {{- end }}
-          ports:
-            - name: api
-              containerPort: 4000
-            - name: dns
-              containerPort: 53
-              protocol: TCP
-            - name: dns-udp
-              containerPort: 53
-              protocol: UDP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: api
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: api
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
-          startupProbe:
-            httpGet:
-              path: /
-              port: api
-            initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.startup.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startup.periodSeconds }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      volumes:
-        - name: config
-          projected:
-            defaultMode: 0444
-            sources:
-              - configMap:
-                  name: {{ template "blocky.fullname" . }}
-                  items:
-                    - key: config.yml
-                      path: config.yml
-                  {{- range $name, $value := .Values.extraLists }}
-                    - key: {{ $name }}
-                      path: {{ $name }}
-                  {{- end }}
-        {{- if hasKey $blockyConfig "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 }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}

charts/stable/blocky/templates/persistentvolumeclaim.yaml

@@ -1,33 +0,0 @@
-{{- 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 -}}

charts/stable/blocky/templates/service-tcp.yaml

@@ -1,34 +0,0 @@
-{{- if .Values.serviceTCP.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "blocky.fullname" . }}-tcp
-  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 }}
-{{- if .Values.serviceTCP.annotations }}
-  annotations:
-{{ toYaml .Values.serviceTCP.annotations | indent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.serviceTCP.type }}
-  {{- if .Values.serviceTCP.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.serviceTCP.loadBalancerIP }}
-  {{- end }}
-{{- if .Values.serviceTCP.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.serviceTCP.externalIPs | indent 4 }}
-{{- end }}
-  externalTrafficPolicy: {{ .Values.serviceTCP.externalTrafficPolicy }}
-  ports:
-    - port: 53
-      targetPort: dns
-      protocol: TCP
-      name: dns
-  selector:
-    app.kubernetes.io/name: {{ include "blocky.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-

charts/stable/blocky/templates/service-udp.yaml

@@ -1,33 +0,0 @@
-{{- if .Values.serviceUDP.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "blocky.fullname" . }}-udp
-  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 }}
-{{- if .Values.serviceUDP.annotations }}
-  annotations:
-{{ toYaml .Values.serviceUDP.annotations | indent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.serviceUDP.type }}
-  {{- if .Values.serviceUDP.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.serviceUDP.loadBalancerIP }}
-  {{- end }}
-{{- if .Values.serviceUDP.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.serviceUDP.externalIPs | indent 4 }}
-{{- end }}
-  externalTrafficPolicy: {{ .Values.serviceUDP.externalTrafficPolicy }}
-  ports:
-    - port: 53
-      targetPort: dns-udp
-      protocol: UDP
-      name: dns-udp
-  selector:
-    app.kubernetes.io/name: {{ include "blocky.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}

charts/stable/blocky/templates/service.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: Service
-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 }}
-{{- if .Values.service.annotations }}
-  annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-  - name: api
-    port: 4000
-    targetPort: api
-  selector:
-    app.kubernetes.io/name: {{ include "blocky.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}

charts/stable/blocky/templates/servicemonitor.yaml

@@ -1,23 +1,21 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if .Values.prometheus.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "blocky.fullname" . }}
+  name: {{ template "common.names.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "blocky.name" . }}
+    {{- include "common.labels" . | nindent 4 }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "blocky.chart" . }}
-  {{- with .Values.serviceMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "blocky.name" . }}
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-  - port: api
+  - port: http
-    interval: 30s
+    {{- with .Values.prometheus.serviceMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
     path: /metrics
 {{- end }}

charts/stable/blocky/values.yaml

@@ -1,17 +1,77 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
 image:
   repository: spx01/blocky
-  tag: v0.12
+  tag: v0.13
   pullPolicy: IfNotPresent
 
-nameOverride: ""
+strategy:
-fullnameOverride: ""
+  type: Recreate
 
+env: {}
+  # TZ:
+
+# -- (int) Number of pods to load balance between
 replicas: 1
 
-timeZone: "UTC"
+service:
+  port:
+    port: 4000
+  # additionalServices:
+  # - enabled: true
+  #   nameSuffix: dns-tcp
+  #   type: NodePort
+  #   port:
+  #     port: 53
+  #     name: dns-tcp
+  #     protocol: TCP
+  #     targetPort: 53
+  #   externalTrafficPolicy: Local
+  # - enabled: true
+  #   nameSuffix: dns-udp
+  #   type: NodePort
+  #   port:
+  #     port: 53
+  #     name: dns-udp
+  #     protocol: UDP
+  #     targetPort: 53
+  #   externalTrafficPolicy: Local
 
-# Blocky configuration, for a full list of options see
+persistence:
-# https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
+  logs:
+    enabled: false
+    emptyDir: false
+    mountPath: /logs
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
+
+prometheus:
+  serviceMonitor:
+    enabled: false
+    interval: 30s
+    additionalLabels: {}
+
+# podAnnotations:
+#   prometheus.io/scrape: "true"
+#   prometheus.io/port: "api"
+
+# -- Full list of options https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
+# @default -- see URL to default config
 config: |
   upstream:
     # these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query
@@ -136,94 +196,3 @@ config: |
   logLevel: info
   # optional: Log format (text or json). Default: text
   logFormat: text
-
-## 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:
-  liveness:
-    failureThreshold: 5
-    periodSeconds: 10
-  readiness:
-    failureThreshold: 5
-    periodSeconds: 10
-  startup:
-    initialDelaySeconds: 5
-    failureThreshold: 30
-    periodSeconds: 10
-
-service:
-  type: ClusterIP
-  # externalTrafficPolicy: Local
-  # loadBalancerIP: ""
-    # a fixed LoadBalancer IP
-  annotations: {}
-    # metallb.universe.tf/address-pool: network-services
-    # metallb.universe.tf/allow-shared-ip: blocky-svc
-
-serviceTCP:
-  enabled: false
-  externalIPs: []
-  type: NodePort
-  externalTrafficPolicy: Local
-  loadBalancerIP: ""
-    # a fixed LoadBalancer IP
-  annotations: {}
-    # metallb.universe.tf/address-pool: network-services
-    # metallb.universe.tf/allow-shared-ip: blocky-svc
-
-serviceUDP:
-  enabled: true
-  externalIPs: []
-  type: NodePort
-  externalTrafficPolicy: Local
-  loadBalancerIP: ""
-    # a fixed LoadBalancer IP
-  annotations: {}
-    # metallb.universe.tf/address-pool: network-services
-    # metallb.universe.tf/allow-shared-ip: blocky-svc
-
-serviceMonitor:
-  enabled: false
-  additionalLabels: {}
-
-## Pod Annotations
-podAnnotations:
-  prometheus.io/scrape: "true"
-  prometheus.io/port: "api"
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  memory: 500Mi
-  # requests:
-  #  cpu: 50m
-  #  memory: 275Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-## Add any extra files you want populated to /app here, e.g.:
-#  extraLists:
-#    whitelist.txt: |
-#      analytics.google.com
-#      googleadservices.com
-extraLists: {}