Compare commits

...

4 Commits

Author SHA1 Message Date
Ryan Holt
14573b6a24 initial add for xbackbone (#507) 2021-01-21 15:47:16 -05:00
ᗪєνιη ᗷυнʟ
5d1fa55b9c [ombi] remove mariadb dep (#506)
* ombi: remove mariadb dep

* remove mariadb from values
2021-01-21 15:46:19 -05:00
Marco Kilchhofer
cb1d6b70dc [plex] Add ability to disable and customize probes (#505) 2021-01-21 13:23:16 -05:00
ᗪєνιη ᗷυнʟ
667951e6e6 [blocky] refactor config and bump version (#500)
Co-authored-by: Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs <6213398+bjw-s@users.noreply.github.com>
2021-01-21 12:23:55 -05:00
17 changed files with 265 additions and 114 deletions

View File

@@ -1,11 +1,12 @@
apiVersion: v2
appVersion: v0.11
appVersion: v0.12
description: DNS proxy as ad-blocker for local network
name: blocky
version: 4.1.1
version: 5.0.0
keywords:
- blocky
- dbs
- adblock
- dns
home: https://github.com/k8s-at-home/charts/tree/master/charts/blocky
icon: https://github.com/0xERR0R/blocky/raw/master/docs/blocky.svg?sanitize=true
sources:

View File

@@ -47,6 +47,8 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
helm install --name blocky -f values.yaml k8s-at-home/blocky
```
---
## Upgrading an existing Release to a new major version
A major chart version change (like 2.2.2 -> 3.0.0) indicates that there is an
@@ -72,3 +74,6 @@ kubectl delete svc/blocky
This is the 'easiest' approach, but will incur downtime which can be problematic if you rely on blocky for DNS
### Upgrading from 4.x.x to 5.x.x
Configuration inside `config` is no longer a yaml object, it is now a multiline string

View File

@@ -9,12 +9,5 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
data:
{{- if .Values.config }}
{{ $root := . }}
config.yml: |
{{ tpl (toYaml .Values.config | indent 4) $root }}
{{- end }}
{{- range $name, $value := .Values.extraLists }}
{{ $name }}: |-
{{ $value | indent 4}}
{{- end }}
{{ .Values.config | indent 4 }}

View File

@@ -1,3 +1,4 @@
{{- $blockyConfig := .Values.config | fromYaml }}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -45,9 +46,9 @@ spec:
subPath: {{ $name }}
readOnly: true
{{- end }}
{{- if .Values.config.queryLog }}
{{- if hasKey $blockyConfig "queryLog" }}
- name: data
mountPath: {{ .Values.config.queryLog.dir }}
mountPath: {{ $blockyConfig.queryLog.dir }}
{{- if .Values.persistence.subPath }}
subPath: {{ .Values.persistence.subPath }}
{{- end }}
@@ -96,7 +97,7 @@ spec:
- key: {{ $name }}
path: {{ $name }}
{{- end }}
{{- if .Values.config.queryLog }}
{{- if hasKey $blockyConfig "queryLog" }}
- name: data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:

View File

@@ -1,6 +1,6 @@
image:
repository: spx01/blocky
tag: v0.11
tag: v0.12
pullPolicy: IfNotPresent
nameOverride: ""
@@ -10,29 +10,30 @@ replicas: 1
timeZone: "UTC"
# blocky configuration - will translate to config.yml file inside the pod
config:
# Blocky configuration, for a full list of options see
# https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
config: |
upstream:
# these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query
# format for resolver: net:host:[port][/path]. net could be tcp, udp, tcp-tls or https (DoH). If port is empty, default port will be used (53 for udp and tcp, 853 for tcp-tls, 443 for https (Doh))
# format for resolver: [net:]host:[port][/path]. net could be empty (default, shortcut for tcp+udp), tcp+udp, tcp, udp, tcp-tls or https (DoH). If port is empty, default port will be used (53 for udp and tcp, 853 for tcp-tls, 443 for https (Doh))
externalResolvers:
- udp:8.8.8.8
- udp:8.8.4.4
- udp:1.1.1.1
- tcp-tls:1.0.0.1:853
- https://cloudflare-dns.com/dns-query
- 46.182.19.48
- 80.241.218.68
- tcp-tls:fdns1.dismail.de:853
- https://dns.digitale-gesellschaft.ch/dns-query
# optional: custom IP address for domain name (with all sub-domains)
# example: query "printer.lan" or "my.printer.lan" will return 192.168.178.3
# customDNS:
# mapping:
# printer.lan: 192.168.178.3
customDNS:
mapping:
printer.lan: 192.168.178.3
# optional: definition, which DNS resolver should be used for queries to the domain (with all sub-domains).
# optional: definition, which DNS resolver(s) should be used for queries to the domain (with all sub-domains). Multiple resolvers must be separated by comma
# Example: Query client.fritz.box will ask DNS server 192.168.178.1. This is necessary for local network, to resolve clients by host name
# conditional:
# mapping:
# fritz.box: udp:192.168.178.1
conditional:
mapping:
fritz.box: udp:192.168.178.1
lan.net: udp:192.168.178.1,udp:192.168.178.2
# optional: use black and white lists to block queries (for example ads, trackers, adult pages etc.)
blocking:
@@ -46,77 +47,95 @@ config:
- https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
- https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
special:
- https://hosts-file.net/ad_servers.txt
# definition of whitelist groups. Attention: if the same group has black and whitelists,
# whitelists will be used to disable particular blacklist entries. If a group has only
# whitelist entries -> this means only domains from this list are allowed,
# all other domains will be blocked.
# Also see the extraLists section below to add your own in-line whitelists
# whiteLists:
# ads:
# - whitelist.txt
- https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts
# definition of whitelist groups. Attention: if the same group has black and whitelists, whitelists will be used to disable particular blacklist entries. If a group has only whitelist entries -> this means only domains from this list are allowed, all other domains will be blocked
whiteLists:
ads:
- whitelist.txt
# definition: which groups should be applied for which client
clientGroupsBlock:
# default will be used, if no special definition for a client name exists
default:
- ads
- special
# use client name or ip address
# laptop.fritz.box:
# - ads
# use client name (with wildcard support: * - sequence of any characters, [0-9] - range)
# or single ip address / client subnet as CIDR notation
laptop*:
- ads
192.168.178.1/24:
- special
# which response will be sent, if query is blocked:
# zeroIp: 0.0.0.0 will be returned (default)
# nxDomain: return NXDOMAIN as return code
# blockType: zeroIp
# zeroIp: 0.0.0.0 will be returned (default)
# nxDomain: return NXDOMAIN as return code
# comma separated list of destination IP adresses (for example: 192.100.100.15, 2001:0db8:85a3:08d3:1319:8a2e:0370:7344). Should contain ipv4 and ipv6 to cover all query types. Useful with running web server on this address to display the "blocked" page.
blockType: zeroIp
# optional: automatically list refresh period in minutes. Default: 4h.
# Negative value -> deactivate automatically refresh.
# 0 value -> use default
# refreshPeriod: 1
refreshPeriod: 0
# optional: configuration for caching of DNS responses
# caching:
# # amount in minutes, how long a response must be cached (min value).
# # If <=0, use response's TTL, if >0 use this value, if TTL is smaller
# # Default: 0
# minTime: 40
# # amount in minutes, how long a response must be cached (max value).
# # If <0, do not cache responses
# # If 0, use TTL
# # If > 0, use this value, if TTL is greater
# # Default: 0
# maxTime: -1
caching:
# amount in minutes, how long a response must be cached (min value).
# If <=0, use response's TTL, if >0 use this value, if TTL is smaller
# Default: 0
minTime: 5
# amount in minutes, how long a response must be cached (max value).
# If <0, do not cache responses
# If 0, use TTL
# If > 0, use this value, if TTL is greater
# Default: 0
maxTime: -1
# if true, will preload DNS results for often used queries (names queried more than 5 times in a 2 hour time window)
# this improves the response time for often used queries, but significantly increases external traffic
# default: false
prefetching: true
# optional: configuration of client name resolution
# clientLookup:
# # this DNS resolver will be used to perform reverse DNS lookup (typically local router)
# upstream: udp:192.168.178.1
# # optional: some routers return multiple names for client (host name and user defined name). Define which single name should be used.
# # Example: take second name if present, if not take first name
# singleNameOrder:
# - 2
# - 1
clientLookup:
# optional: this DNS resolver will be used to perform reverse DNS lookup (typically local router)
upstream: udp:192.168.178.1
# optional: some routers return multiple names for client (host name and user defined name). Define which single name should be used.
# Example: take second name if present, if not take first name
singleNameOrder:
- 2
- 1
# optional: custom mapping of client name to IP addresses. Useful if reverse DNS does not work properly or just to have custom client names.
clients:
laptop:
- 192.168.178.29
# optional: configuration for prometheus metrics endpoint
prometheus:
# enabled if true
enable: true
# url path, optional (default '/metrics')
path: /metrics
# prometheus:
# # enabled if true
# enable: true
# # url path, optional (default '/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
# # directory (should be mounted as volume in docker)
# 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: DNS listener port and bind ip address, default 53 (UDP and TCP). Example: 53, :53, 127.0.0.1:53
port: 53
# optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH ...
httpPort: 4000
# optional: HTTPS listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH...
#httpsPort: 443
# mandatory, if https port > 0: path to cert and key file for SSL encryption
#httpsCertFile: server.crt
#httpsKeyFile: server.key
# optional: use this DNS server to resolve blacklist urls and upstream DNS servers (DOH). Useful if no DNS resolver is configured and blocky needs to resolve a host name. Format net:IP:port, net must be udp or tcp
bootstrapDns: tcp:1.1.1.1
# optional: Log level (one from debug, info, warn, error). Default: info
logLevel: info
# optional: Log format (text or json). Default: text
logFormat: text
## Add persistence for query logs (if enabled)
persistence:

View File

@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 4.0.681
description: Want a Movie or TV Show on Plex or Emby? Use Ombi!
name: ombi
version: 6.4.1
version: 7.0.0
keywords:
- ombi
- plex
@@ -22,7 +22,3 @@ dependencies:
- name: common
repository: https://k8s-at-home.com/charts/
version: 2.2.1
- name: mariadb
version: 9.2.0
repository: https://charts.bitnami.com/bitnami
condition: mariadb.enabled

View File

@@ -21,16 +21,3 @@ persistence:
config:
enabled: false
emptyDir: false
# Enabled mariadb
# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
mariadb:
enabled: false
architecture: standalone
auth:
database: ombi
username: ombi
password: ombi
primary:
persistence:
enabled: false

View File

@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 1.20.2.3402
description: Plex Media Server
name: plex
version: 2.2.0
version: 2.3.0
keywords:
- plex
home: https://plex.tv/

View File

@@ -191,25 +191,18 @@ spec:
value: "customCertificateDomain={{.Values.certificate.pkcsMangler.setPlexPreferences.customCertificateDomain}}"
{{- end }}
{{- end }}
{{- if .Values.probes.readiness.enabled }}
readinessProbe:
httpGet:
path: /identity
port: 32400
failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
{{- omit .Values.probes.readiness "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.probes.liveness.enabled }}
livenessProbe:
httpGet:
path: /identity
port: 32400
failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
{{- omit .Values.probes.liveness "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.probes.startup.enabled }}
startupProbe:
httpGet:
path: /identity
port: 32400
initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
failureThreshold: {{ .Values.probes.startup.failureThreshold }}
periodSeconds: {{ .Values.probes.startup.periodSeconds }}
{{- omit .Values.probes.startup "enabled" | toYaml | nindent 12 }}
{{- end }}
volumeMounts:
{{- if .Values.persistence.data.enabled }}
- name: data

View File

@@ -319,12 +319,24 @@ logging:
# Probes configuration
probes:
liveness:
enabled: true
httpGet:
path: /identity
port: 32400
failureThreshold: 5
periodSeconds: 10
readiness:
enabled: true
httpGet:
path: /identity
port: 32400
failureThreshold: 5
periodSeconds: 10
startup:
enabled: true
httpGet:
path: /identity
port: 32400
initialDelaySeconds: 5
failureThreshold: 30
periodSeconds: 10

View File

@@ -0,0 +1,24 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
# OWNERS file for Kubernetes
OWNERS

View File

@@ -0,0 +1,20 @@
apiVersion: v2
appVersion: 3.3.3
description: XBackBone is a simple, self-hosted, lightweight PHP file manager that support the instant sharing tool ShareX and *NIX systems. It supports uploading and displaying images, GIF, video, code, formatted text, and file downloading and uploading. Also have a web UI with multi user management, past uploads history and search support.
name: xbackbone
version: 1.0.0
keywords:
- xbackbone
- xshare
home: https://github.com/k8s-at-home/charts/tree/master/charts/xbackbone
icon: https://github.com/SergiX44/XBackBone/raw/master/.github/xbackbone.png
sources:
- https://github.com/SergiX44/XBackBone
- https://hub.docker.com/r/pe46dro/xbackbone-docker
maintainers:
- name: billimek
email: jeff@billimek.com
dependencies:
- name: common
repository: https://k8s-at-home.com/charts/
version: 2.2.1

8
charts/xbackbone/OWNERS Normal file
View File

@@ -0,0 +1,8 @@
approvers:
- billimek
- onedr0p
- bjw-s
reviewers:
- billimek
- onedr0p
- bjw-s

View File

@@ -0,0 +1,67 @@
# XBackBone
This is a helm chart for [XBackBone](https://github.com/SergiX44/XBackBone).
**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
## TL;DR;
```shell
$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
$ helm install k8s-at-home/xbackbone
```
## Installing the Chart
To install the chart with the release name `my-release`:
```console
helm install --name my-release k8s-at-home/xbackbone
```
## Uninstalling the Chart
To uninstall/delete the `my-release` deployment:
```console
helm delete my-release --purge
```
The command removes all the Kubernetes components associated with the chart and deletes the release.
## Configuration
Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/xbackbone/values.yaml)
file. It has several commented out suggested values.
Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
```console
helm install xbackbone \
--set env.TZ="America/New_York" \
k8s-at-home/xbackbone
```
Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
chart. For example,
```console
helm install xbackbone k8s-at-home/xbackbone --values values.yaml
```
```yaml
image:
tag: ...
```
---
**NOTE**
If you get
```console
Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
```
it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
---
## Upgrading an existing Release to a new major version
A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

View File

@@ -0,0 +1 @@
{{- include "common.notes.defaultNotes" . -}}

View File

@@ -0,0 +1 @@
{{ include "common.all" . }}

View File

@@ -0,0 +1,23 @@
# Default values for XBackbone.
image:
repository: pe46dro/xbackbone-docker
pullPolicy: IfNotPresent
tag: 3.3.3
strategy:
type: Recreate
service:
port:
port: 80
env: {}
# TZ: UTC
# LOG_LEVEL: info
persistence:
config:
enabled: false
emptyDir: false
mountPath: /app/config