diff --git a/.gitignore b/.gitignore index 59cfd67..fd9add6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ ### Helm ### # Chart dependencies **/charts/*.tgz +charts/**/*.tgz # Chart packages dist/*.tgz + +.direnv diff --git a/LICENSE b/LICENSE index 9e9ef0e..b213ad8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Jan-Niklas Weghorn and Manuel Schmidbauer +Copyright (c) 2024 Jan-Niklas Weghorn and Manuel Schmidbauer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2546f99..1bf763a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # charts -Here you can find a collection of oecis charts :) +Here you can find a collection of oecis helm charts :) + +You can see most of them in action at https://gitlab.com/oecis/fountain # Publish charts diff --git a/charts/cert-manager-webhook-njalla/README.md b/charts/cert-manager-webhook-njalla/README.md index b3834bf..c067006 100644 --- a/charts/cert-manager-webhook-njalla/README.md +++ b/charts/cert-manager-webhook-njalla/README.md @@ -24,4 +24,4 @@ Helm chart for the njalla webhook for cert manager | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/gate/Chart.yaml b/charts/gate/Chart.yaml index 273fa5d..7beaddc 100644 --- a/charts/gate/Chart.yaml +++ b/charts/gate/Chart.yaml @@ -1,6 +1,10 @@ apiVersion: v2 name: gate description: High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy with Excellent Multi-Protocol Version Support +home: https://gate.minekube.com/ +sources: + - https://github.com/minekube/gate + - https://gitlab.com/oecis/charts/ type: application -version: 0.1.0 -appVersion: "v0.33.2" +version: 0.1.1 +appVersion: "v0.36.7" diff --git a/charts/gate/README.md b/charts/gate/README.md index 97d0827..d7aa30b 100644 --- a/charts/gate/README.md +++ b/charts/gate/README.md @@ -1,9 +1,16 @@ # gate -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.33.2](https://img.shields.io/badge/AppVersion-v0.33.2-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.36.7](https://img.shields.io/badge/AppVersion-v0.36.7-informational?style=flat-square) High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy with Excellent Multi-Protocol Version Support +**Homepage:** + +## Source Code + +* +* + ## Values | Key | Type | Default | Description | @@ -34,4 +41,4 @@ High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy wi | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/joplin/README.md b/charts/joplin/README.md new file mode 100644 index 0000000..4417a3d --- /dev/null +++ b/charts/joplin/README.md @@ -0,0 +1,61 @@ +# joplin + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.13.1-beta](https://img.shields.io/badge/AppVersion-2.13.1--beta-informational?style=flat-square) + +A Note Taking App + +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://charts.bitnami.com/bitnami | postgresql | 12.x.x | + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"joplin/server"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.className | string | `""` | | +| ingress.enabled | bool | `false` | | +| ingress.hosts[0].host | string | `"chart-example.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| ingress.tls | list | `[]` | | +| joplin.baseUrl | string | `"https://example.com"` | | +| joplin.db.database | string | `"joplin"` | | +| joplin.db.existingSecret | string | `""` | | +| joplin.db.host | string | `""` | | +| joplin.db.password | string | `""` | | +| joplin.db.port | int | `5432` | | +| joplin.db.secretKeys.passwordKey | string | `"password"` | | +| joplin.db.type | string | `"pg"` | | +| joplin.db.user | string | `""` | | +| joplin.extraEnv | list | `[]` | | +| joplin.tz | string | `"Europe/Berlin"` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podSecurityContext | object | `{}` | | +| postgresql.enabled | bool | `true` | | +| replicaCount | int | `1` | | +| resources | object | `{}` | | +| securityContext | object | `{}` | | +| service.port | int | `22300` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/joplin/templates/deployment.yaml b/charts/joplin/templates/deployment.yaml index 9aaf65c..bf3d30a 100644 --- a/charts/joplin/templates/deployment.yaml +++ b/charts/joplin/templates/deployment.yaml @@ -79,7 +79,7 @@ spec: {{- else }} value: {{ .Values.joplin.db.password }} {{- end }} - + {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/joplin/values.yaml b/charts/joplin/values.yaml index 84c7378..657d1e9 100644 --- a/charts/joplin/values.yaml +++ b/charts/joplin/values.yaml @@ -99,6 +99,3 @@ joplin: existingSecret: "" secretKeys: passwordKey: password - - - diff --git a/charts/mirage/Chart.lock b/charts/mirage/Chart.lock deleted file mode 100644 index 147e433..0000000 --- a/charts/mirage/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.1.15 -digest: sha256:0686bdb95219bbd8806328e63f8547c12c8da36e70776407cde1ac324221d631 -generated: "2023-08-27T13:55:27.416126986+02:00" diff --git a/charts/mirage/Chart.yaml b/charts/mirage/Chart.yaml index c217717..c8d8ccc 100644 --- a/charts/mirage/Chart.yaml +++ b/charts/mirage/Chart.yaml @@ -5,10 +5,5 @@ type: application home: https://gitlab.com/oecis/charts/-/tree/main/charts/mirage sources: - https://gitlab.com/oecis/mirage -version: 0.1.0 -appVersion: "0.1.0" -dependencies: - - condition: global.postgresqlEnabled - name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.1.x +version: 0.1.2 +appVersion: "0.1.2" diff --git a/charts/mirage/README.md b/charts/mirage/README.md index 48d3173..4fc7da0 100644 --- a/charts/mirage/README.md +++ b/charts/mirage/README.md @@ -1,6 +1,6 @@ # mirage -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) +![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir @@ -10,12 +10,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir * -## Requirements - -| Repository | Name | Version | -|------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | 12.1.x | - ## Values | Key | Type | Default | Description | @@ -26,7 +20,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | | fullnameOverride | string | `""` | | -| global.postgresqlEnabled | bool | `true` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"registry.oecis.io/oecis/mirage"` | | | image.tag | string | `""` | | @@ -38,17 +31,8 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | ingress.hosts[0].paths[0].path | string | `"/"` | | | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | | ingress.tls | list | `[]` | | -| mirage.autoMigration | bool | `true` | | -| mirage.db.database | string | `""` | | -| mirage.db.existingSecret | string | `""` | | -| mirage.db.host | string | `""` | | -| mirage.db.password | string | `""` | | -| mirage.db.port | int | `5432` | | -| mirage.db.secretKeys.dbPasswordKey | string | `"user-password"` | | -| mirage.db.user | string | `""` | | | mirage.hostBaseUrl | string | `"http://localhost/"` | | | mirage.hydra.internal | string | `"http://hydra"` | | -| mirage.keto.internal | string | `"http://keto"` | | | mirage.kratos.external | string | `"http://kratos"` | | | mirage.kratos.internal | string | `"http://kratos"` | | | mirage.secretName | string | `nil` | | @@ -56,7 +40,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgres | object | `{}` | | | replicaCount | int | `1` | | | resources | object | `{}` | | | securityContext | object | `{}` | | @@ -68,4 +51,4 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/mirage/templates/deployment.yaml b/charts/mirage/templates/deployment.yaml index c95fed4..b026180 100644 --- a/charts/mirage/templates/deployment.yaml +++ b/charts/mirage/templates/deployment.yaml @@ -27,50 +27,6 @@ spec: serviceAccountName: {{ include "mirage.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} - {{- if .Values.mirage.autoMigration }} - initContainers: - - name: {{ .Chart.Name }}-init - command: ["/app/bin/migrate"] - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: MIRAGE_SECRET_KEY_BASE - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.secretName }} - key: secretKeyBase - - name: MIRAGE_HOST_BASE_URL - value: {{ .Values.mirage.hostBaseUrl }} - - name: MIRAGE_EXTERNAL_KRATOS_BASE_URL - value: {{ .Values.mirage.kratos.external }} - - name: MIRAGE_INTERNAL_KRATOS_BASE_URL - value: {{ .Values.mirage.kratos.internal }} - - name: MIRAGE_INTERNAL_HYDRA_BASE_URL - value: {{ .Values.mirage.hydra.internal }} - - name: MIRAGE_INTERNAL_KETO_BASE_URL - value: {{ .Values.mirage.keto.internal }} - - name: MIRAGE_DB_USER - value: {{ .Values.mirage.db.user }} - - name: MIRAGE_DB_PASSWORD - {{- if .Values.mirage.db.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.db.existingSecret }} - key: {{ .Values.mirage.db.secretKeys.dbPasswordKey }} - {{- else }} - value: {{ .Values.config.db.password }} - {{- end }} - - name: MIRAGE_DB_HOST - value: {{ .Values.mirage.db.host }} - - name: MIRAGE_DB_PORT - value: {{ .Values.mirage.db.port | quote }} - - name: MIRAGE_DB_NAME - value: {{ .Values.mirage.db.database | quote }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -90,8 +46,6 @@ spec: path: / port: http env: - - name: MIRAGE_CANARY - value: {{ .Values.mirage.canary }} - name: MIRAGE_SECRET_KEY_BASE valueFrom: secretKeyRef: @@ -105,25 +59,6 @@ spec: value: {{ .Values.mirage.kratos.internal }} - name: MIRAGE_INTERNAL_HYDRA_BASE_URL value: {{ .Values.mirage.hydra.internal }} - - name: MIRAGE_INTERNAL_KETO_BASE_URL - value: {{ .Values.mirage.keto.internal }} - - name: MIRAGE_DB_USER - value: {{ .Values.mirage.db.user }} - - name: MIRAGE_DB_PASSWORD - {{- if .Values.mirage.db.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.db.existingSecret }} - key: {{ .Values.mirage.db.secretKeys.dbPasswordKey }} - {{- else }} - value: {{ .Values.config.db.password }} - {{- end }} - - name: MIRAGE_DB_HOST - value: {{ .Values.mirage.db.host }} - - name: MIRAGE_DB_PORT - value: {{ .Values.mirage.db.port | quote }} - - name: MIRAGE_DB_NAME - value: {{ .Values.mirage.db.database | quote }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/mirage/values.yaml b/charts/mirage/values.yaml index 2e675f2..7382bc8 100644 --- a/charts/mirage/values.yaml +++ b/charts/mirage/values.yaml @@ -81,29 +81,11 @@ tolerations: [] affinity: {} - -global: - postgresqlEnabled: true - -postgres: {} - mirage: secretName: null hostBaseUrl: http://localhost/ - autoMigration: true - db: - host: "" - port: 5432 - user: "" - password: "" - database: "" - existingSecret: "" - secretKeys: - dbPasswordKey: user-password kratos: external: http://kratos internal: http://kratos hydra: internal: http://hydra - keto: - internal: http://keto diff --git a/charts/ntfy/README.md b/charts/ntfy/README.md index eef0366..179eca4 100644 --- a/charts/ntfy/README.md +++ b/charts/ntfy/README.md @@ -48,4 +48,4 @@ Send push notifications to your phone or desktop using PUT/POST | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/ntfy/templates/statefulset.yaml b/charts/ntfy/templates/statefulset.yaml index 8fb208b..f0ef567 100644 --- a/charts/ntfy/templates/statefulset.yaml +++ b/charts/ntfy/templates/statefulset.yaml @@ -81,7 +81,7 @@ spec: - metadata: name: cache spec: - accessModess: ["ReadWriteOnce"] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.ntfy.cache.size }} diff --git a/charts/pairdrop/.helmignore b/charts/pairdrop/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/pairdrop/.helmignore @@ -0,0 +1,23 @@ +# 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 +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/pairdrop/Chart.yaml b/charts/pairdrop/Chart.yaml new file mode 100644 index 0000000..5349f69 --- /dev/null +++ b/charts/pairdrop/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: pairdrop +description: Local file sharing in your browser. Inspired by Apple's AirDrop. Fork of Snapdrop. +type: application +version: 0.1.0 +appVersion: "1.10.8" diff --git a/charts/pairdrop/README.md b/charts/pairdrop/README.md new file mode 100644 index 0000000..7109062 --- /dev/null +++ b/charts/pairdrop/README.md @@ -0,0 +1,47 @@ +# pairdrop + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.8](https://img.shields.io/badge/AppVersion-1.10.8-informational?style=flat-square) + +Local file sharing in your browser. Inspired by Apple's AirDrop. Fork of Snapdrop. + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"lscr.io/linuxserver/pairdrop"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.className | string | `""` | | +| ingress.enabled | bool | `false` | | +| ingress.hosts[0].host | string | `"chart-example.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| ingress.tls | list | `[]` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podLabels | object | `{}` | | +| podSecurityContext | object | `{}` | | +| replicaCount | int | `1` | | +| resources | object | `{}` | | +| securityContext | object | `{}` | | +| service.port | int | `3000` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.automount | bool | `true` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | +| volumeMounts | list | `[]` | | +| volumes | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/pairdrop/templates/NOTES.txt b/charts/pairdrop/templates/NOTES.txt new file mode 100644 index 0000000..082a4a7 --- /dev/null +++ b/charts/pairdrop/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "pairdrop.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.service.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 --namespace {{ .Release.Namespace }} svc -w {{ include "pairdrop.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "pairdrop.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "pairdrop.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/pairdrop/templates/_helpers.tpl b/charts/pairdrop/templates/_helpers.tpl new file mode 100644 index 0000000..77625d1 --- /dev/null +++ b/charts/pairdrop/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "pairdrop.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 "pairdrop.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 chart name and version as used by the chart label. +*/}} +{{- define "pairdrop.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "pairdrop.labels" -}} +helm.sh/chart: {{ include "pairdrop.chart" . }} +{{ include "pairdrop.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "pairdrop.selectorLabels" -}} +app.kubernetes.io/name: {{ include "pairdrop.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "pairdrop.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "pairdrop.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/vikunja/templates/frontend/deployment.yaml b/charts/pairdrop/templates/deployment.yaml similarity index 61% rename from charts/vikunja/templates/frontend/deployment.yaml rename to charts/pairdrop/templates/deployment.yaml index 4820d1f..a6380d6 100644 --- a/charts/vikunja/templates/frontend/deployment.yaml +++ b/charts/pairdrop/templates/deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "vikunja.fullname" . }}-frontend + name: {{ include "pairdrop.fullname" . }} labels: - {{- include "vikunja.labels" . | nindent 4 }} + {{- include "pairdrop.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "vikunja.selectorLabels" . | nindent 6 }} + {{- include "pairdrop.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -18,24 +18,27 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "vikunja.selectorLabels" . | nindent 8 }} + {{- include "pairdrop.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "vikunja.serviceAccountName" . }} + serviceAccountName: {{ include "pairdrop.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }}-frontend + - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.frontend.image.pullPolicy }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http - containerPort: {{ .Values.frontend.service.port }} + containerPort: {{ .Values.service.port }} protocol: TCP livenessProbe: httpGet: @@ -47,10 +50,14 @@ spec: port: http resources: {{- toYaml .Values.resources | nindent 12 }} - {{- if not (empty .Values.backend.extraEnv) }} - env: - {{- toYaml .Values.backend.extraEnv | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/pairdrop/templates/hpa.yaml b/charts/pairdrop/templates/hpa.yaml new file mode 100644 index 0000000..7760c5a --- /dev/null +++ b/charts/pairdrop/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "pairdrop.fullname" . }} + labels: + {{- include "pairdrop.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "pairdrop.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/pairdrop/templates/ingress.yaml b/charts/pairdrop/templates/ingress.yaml new file mode 100644 index 0000000..bff85e0 --- /dev/null +++ b/charts/pairdrop/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "pairdrop.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "pairdrop.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/pairdrop/templates/service.yaml b/charts/pairdrop/templates/service.yaml new file mode 100644 index 0000000..fc9cc9a --- /dev/null +++ b/charts/pairdrop/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "pairdrop.fullname" . }} + labels: + {{- include "pairdrop.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "pairdrop.selectorLabels" . | nindent 4 }} diff --git a/charts/pairdrop/templates/serviceaccount.yaml b/charts/pairdrop/templates/serviceaccount.yaml new file mode 100644 index 0000000..fa2db23 --- /dev/null +++ b/charts/pairdrop/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "pairdrop.serviceAccountName" . }} + labels: + {{- include "pairdrop.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/charts/pairdrop/templates/tests/test-connection.yaml b/charts/pairdrop/templates/tests/test-connection.yaml new file mode 100644 index 0000000..9e4bfe7 --- /dev/null +++ b/charts/pairdrop/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "pairdrop.fullname" . }}-test-connection" + labels: + {{- include "pairdrop.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "pairdrop.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/pairdrop/values.yaml b/charts/pairdrop/values.yaml new file mode 100644 index 0000000..5a6080b --- /dev/null +++ b/charts/pairdrop/values.yaml @@ -0,0 +1,98 @@ +# Default values for pairdrop. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: lscr.io/linuxserver/pairdrop + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 3000 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +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: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/charts/snapdrop/.helmignore b/charts/snapdrop/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/snapdrop/.helmignore @@ -0,0 +1,23 @@ +# 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 +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/snapdrop/Chart.yaml b/charts/snapdrop/Chart.yaml new file mode 100644 index 0000000..311ce67 --- /dev/null +++ b/charts/snapdrop/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: snapdrop +description: A Helm chart for Kubernetes +type: application +version: 0.1.0 +appVersion: "eac78009-ls140" diff --git a/charts/snapdrop/README.md b/charts/snapdrop/README.md new file mode 100644 index 0000000..944593b --- /dev/null +++ b/charts/snapdrop/README.md @@ -0,0 +1,47 @@ +# snapdrop + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: eac78009-ls140](https://img.shields.io/badge/AppVersion-eac78009--ls140-informational?style=flat-square) + +A Helm chart for Kubernetes + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"lscr.io/linuxserver/snapdrop"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.className | string | `""` | | +| ingress.enabled | bool | `false` | | +| ingress.hosts[0].host | string | `"chart-example.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| ingress.tls | list | `[]` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podLabels | object | `{}` | | +| podSecurityContext | object | `{}` | | +| replicaCount | int | `1` | | +| resources | object | `{}` | | +| securityContext | object | `{}` | | +| service.port | int | `80` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.automount | bool | `true` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | +| volumeMounts | list | `[]` | | +| volumes | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/snapdrop/templates/NOTES.txt b/charts/snapdrop/templates/NOTES.txt new file mode 100644 index 0000000..902f4c8 --- /dev/null +++ b/charts/snapdrop/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "snapdrop.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.service.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 --namespace {{ .Release.Namespace }} svc -w {{ include "snapdrop.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "snapdrop.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "snapdrop.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/snapdrop/templates/_helpers.tpl b/charts/snapdrop/templates/_helpers.tpl new file mode 100644 index 0000000..9cdf1b6 --- /dev/null +++ b/charts/snapdrop/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "snapdrop.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 "snapdrop.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 chart name and version as used by the chart label. +*/}} +{{- define "snapdrop.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "snapdrop.labels" -}} +helm.sh/chart: {{ include "snapdrop.chart" . }} +{{ include "snapdrop.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "snapdrop.selectorLabels" -}} +app.kubernetes.io/name: {{ include "snapdrop.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "snapdrop.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "snapdrop.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/snapdrop/templates/deployment.yaml b/charts/snapdrop/templates/deployment.yaml new file mode 100644 index 0000000..38ae83f --- /dev/null +++ b/charts/snapdrop/templates/deployment.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "snapdrop.fullname" . }} + labels: + {{- include "snapdrop.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "snapdrop.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "snapdrop.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "snapdrop.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- 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 }} diff --git a/charts/snapdrop/templates/hpa.yaml b/charts/snapdrop/templates/hpa.yaml new file mode 100644 index 0000000..8efb9b3 --- /dev/null +++ b/charts/snapdrop/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "snapdrop.fullname" . }} + labels: + {{- include "snapdrop.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "snapdrop.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/snapdrop/templates/ingress.yaml b/charts/snapdrop/templates/ingress.yaml new file mode 100644 index 0000000..27231b6 --- /dev/null +++ b/charts/snapdrop/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "snapdrop.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "snapdrop.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/snapdrop/templates/service.yaml b/charts/snapdrop/templates/service.yaml new file mode 100644 index 0000000..df90a09 --- /dev/null +++ b/charts/snapdrop/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "snapdrop.fullname" . }} + labels: + {{- include "snapdrop.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "snapdrop.selectorLabels" . | nindent 4 }} diff --git a/charts/snapdrop/templates/serviceaccount.yaml b/charts/snapdrop/templates/serviceaccount.yaml new file mode 100644 index 0000000..56dbd7f --- /dev/null +++ b/charts/snapdrop/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "snapdrop.serviceAccountName" . }} + labels: + {{- include "snapdrop.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/charts/snapdrop/templates/tests/test-connection.yaml b/charts/snapdrop/templates/tests/test-connection.yaml new file mode 100644 index 0000000..01563d1 --- /dev/null +++ b/charts/snapdrop/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "snapdrop.fullname" . }}-test-connection" + labels: + {{- include "snapdrop.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "snapdrop.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/snapdrop/values.yaml b/charts/snapdrop/values.yaml new file mode 100644 index 0000000..6050edc --- /dev/null +++ b/charts/snapdrop/values.yaml @@ -0,0 +1,98 @@ +# Default values for snapdrop. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: lscr.io/linuxserver/snapdrop + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +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: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/charts/tandoor/Chart.yaml b/charts/tandoor/Chart.yaml index a2103fa..c9fd876 100644 --- a/charts/tandoor/Chart.yaml +++ b/charts/tandoor/Chart.yaml @@ -1,7 +1,10 @@ apiVersion: v2 name: tandoor description: Application for managing recipes, planning meals, building shopping lists and much much more! -home: https://gitlab.com/oecis/charts/-/tree/main/charts/tandoor +home: https://tandoor.dev/ +sources: + - https://github.com/TandoorRecipes/recipes + - https://gitlab.com/oecis/charts/ type: application -version: 0.1.0 -appVersion: "1.16.0" +version: 0.1.6 +appVersion: "1.5.17" diff --git a/charts/tandoor/README.md b/charts/tandoor/README.md index 2355bc9..c7d280d 100644 --- a/charts/tandoor/README.md +++ b/charts/tandoor/README.md @@ -1,10 +1,15 @@ # tandoor -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square) +![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.17](https://img.shields.io/badge/AppVersion-1.5.17-informational?style=flat-square) Application for managing recipes, planning meals, building shopping lists and much much more! -**Homepage:** +**Homepage:** + +## Source Code + +* +* ## Values @@ -15,6 +20,7 @@ Application for managing recipes, planning meals, building shopping lists and mu | autoscaling.maxReplicas | int | `100` | | | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| extraVolumes | list | `[]` | | | fullnameOverride | string | `""` | | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | @@ -22,29 +28,23 @@ Application for managing recipes, planning meals, building shopping lists and mu | ingress.enabled | bool | `false` | | | ingress.hosts[0].host | string | `"tandoor.local"` | | | ingress.tls | list | `[]` | | +| initContainers | list | `[]` | | | nameOverride | string | `""` | | | nginx.image.pullPolicy | string | `"IfNotPresent"` | | | nginx.image.repository | string | `"nginx"` | | | nginx.image.tag | string | `"mainline-alpine"` | | | nginx.resources | object | `{}` | | | nodeSelector | object | `{}` | | -| oauth2InitContainer.config | object | `{}` | | -| oauth2InitContainer.enabled | bool | `false` | | -| oauth2InitContainer.env | list | `[]` | | | persistence.mediafiles.accessMode | string | `"ReadWriteOnce"` | | | persistence.mediafiles.annotations | object | `{}` | | | persistence.mediafiles.name | string | `"tandoor-mediafiles"` | | | persistence.mediafiles.size | string | `"1Gi"` | | -| persistence.staticfiles.accessMode | string | `"ReadWriteOnce"` | | -| persistence.staticfiles.annotations | object | `{}` | | -| persistence.staticfiles.name | string | `"tandoor-staticfiles"` | | -| persistence.staticfiles.size | string | `"1Gi"` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | replicaCount | int | `1` | | | securityContext | object | `{}` | | | service.gunicorn.name | string | `"gunicorn"` | | -| service.gunicorn.port | int | `80` | | +| service.gunicorn.port | int | `8080` | | | service.gunicorn.type | string | `"ClusterIP"` | | | service.nginx.name | string | `"nginx"` | | | service.nginx.port | int | `80` | | @@ -52,21 +52,22 @@ Application for managing recipes, planning meals, building shopping lists and mu | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | -| tandoor.config.encryptionSecret | string | `""` | | -| tandoor.config.existingSecret | string | `""` | | +| tandoor.command | list | `[]` | | +| tandoor.config.encryptionKey.secretKey | string | `"encryption-key"` | | +| tandoor.config.encryptionKey.secretName | string | `""` | | | tandoor.config.postgres.db | string | `"tandoor"` | | | tandoor.config.postgres.host | string | `""` | | -| tandoor.config.postgres.password | string | `""` | | +| tandoor.config.postgres.password.secretKey | string | `"password"` | | +| tandoor.config.postgres.password.secretName | string | `""` | | | tandoor.config.postgres.port | int | `5432` | | | tandoor.config.postgres.user | string | `"tandoor"` | | -| tandoor.config.secretKeys.encryptionSecretKey | string | `"encryption-key"` | | -| tandoor.config.secretKeys.postgresUserPasswordKey | string | `"postgres-user-password"` | | | tandoor.extraEnv | list | `[]` | | +| tandoor.extraVolumeMounts | list | `[]` | | | tandoor.image.pullPolicy | string | `"IfNotPresent"` | | | tandoor.image.repository | string | `"vabene1111/recipes"` | | -| tandoor.image.tag | string | `"latest"` | | +| tandoor.image.tag | string | `""` | | | tandoor.resources | object | `{}` | | | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/tandoor/templates/deployment.yaml b/charts/tandoor/templates/deployment.yaml index b580713..26f2fcf 100644 --- a/charts/tandoor/templates/deployment.yaml +++ b/charts/tandoor/templates/deployment.yaml @@ -36,31 +36,16 @@ spec: claimName: {{ .Values.persistence.mediafiles.existingClaim }} {{- end }} - name: staticfiles - persistentVolumeClaim: - {{- if not .Values.persistence.staticfiles.existingClaim }} - claimName: {{ .Values.persistence.staticfiles.name }} - {{- else }} - claimName: {{ .Values.persistence.staticfiles.existingClaim }} - {{- end }} + emptyDir: {} - name: nginx-config configMap: name: tandoor-nginx-config - {{- if .Values.oauth2InitContainer.enabled }} - - name: env - emptyDir: - medium: Memory + {{- if not (empty .Values.extraVolumes ) }} + {{- toYaml .Values.extraVolumes | nindent 8 }} + {{- end }} + {{- if not (empty .Values.initContainers)}} initContainers: - - name: {{ include "tandoor.fullname" . }}-oidc-env-populator - image: busybox - volumeMounts: - - mountPath: /env - name: env - command: ["/bin/sh"] - args: ["-c", {{ quote (printf "echo 'export SOCIALACCOUNT_PROVIDERS=%q' > /env/oauth2_config" ( .Values.oauth2InitContainer.config | toJson )) }}] - {{- if not (empty .Values.oauth2InitContainer.env) }} - env: - {{- toYaml .Values.oauth2InitContainer.env | nindent 12 }} - {{- end}} + {{- toYaml .Values.initContainers | nindent 10}} {{- end }} containers: - name: {{ include "tandoor.fullname" . }} @@ -68,16 +53,9 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.tandoor.image.repository }}:{{ .Values.tandoor.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.tandoor.image.pullPolicy }} - {{- if .Values.oauth2InitContainer.enabled }} + {{- if not (empty .Values.tandoor.command) }} command: - - sh - - -c - - | - set -e - echo "Loading oauth2 config from /env/oauth2_config" - source /env/oauth2_config - echo "Starting 'recipes'" - /opt/recipes/boot.sh + {{- toYaml .Values.tandoor.command | nindent 12 }} {{- end }} livenessProbe: httpGet: @@ -85,15 +63,17 @@ spec: scheme: HTTP port: 8080 periodSeconds: 15 + initialDelaySeconds: 120 readinessProbe: httpGet: path: / scheme: HTTP port: 8080 periodSeconds: 15 + initialDelaySeconds: 120 env: - name: DB_ENGINE - value: django.db.backends.postgresql_psycopg2 + value: "django.db.backends.postgresql" - name: POSTGRES_HOST value: {{ .Values.tandoor.config.postgres.host | quote }} - name: POSTGRES_PORT @@ -106,26 +86,20 @@ spec: value: "2" - name: GUNICORN_THREADS value: "2" + - name: GUNICORN_MEDIA + value: "0" - name: POSTGRES_PASSWORD - {{- if not .Values.tandoor.config.secretKeys.postgresUserPasswordKey }} - value: {{ .Values.tandoor.config.postgres.password | quote }} - {{- else }} valueFrom: secretKeyRef: - name: {{ .Values.tandoor.config.existingSecret }} - key: {{ .Values.tandoor.config.secretKeys.postgresUserPasswordKey }} - {{- end }} + name: {{ .Values.tandoor.config.postgres.password.secretName }} + key: {{ .Values.tandoor.config.postgres.password.secretKey }} - name: POSTGRES_DB value: {{ .Values.tandoor.config.postgres.db }} - name: SECRET_KEY - {{- if not .Values.tandoor.config.secretKeys.encryptionSecretKey }} - value: {{ .Values.tandoor.config.encryptionSecret }} - {{- else }} valueFrom: secretKeyRef: - name: {{ .Values.tandoor.config.existingSecret }} - key: {{ .Values.tandoor.config.secretKeys.encryptionSecretKey }} - {{- end}} + name: {{ .Values.tandoor.config.encryptionKey.secretName }} + key: {{ .Values.tandoor.config.encryptionKey.secretKey }} {{- if not (empty .Values.tandoor.extraEnv) }} {{- toYaml .Values.tandoor.extraEnv | nindent 12 }} {{- end }} @@ -136,10 +110,9 @@ spec: name: mediafiles - mountPath: /opt/recipes/staticfiles name: staticfiles - {{- if .Values.oauth2InitContainer.enabled }} - - mountPath: /env - name: env - {{- end}} + {{- if not (empty .Values.tandoor.extraVolumeMounts) }} + {{- toYaml .Values.tandoor.extraVolumeMounts | nindent 12 }} + {{- end}} - name: {{ include "tandoor.fullname" . }}-nginx image: {{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }} imagePullPolicy: {{ .Values.nginx.image.pullPolicy }} diff --git a/charts/tandoor/templates/pvc.yaml b/charts/tandoor/templates/pvc.yaml index 3913d21..787fbba 100644 --- a/charts/tandoor/templates/pvc.yaml +++ b/charts/tandoor/templates/pvc.yaml @@ -1,27 +1,3 @@ -{{- if not .Values.persistence.staticfiles.existingClaim }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ .Values.persistence.staticfiles.name }} - namespace: {{ include "tandoor.namespace" . }} - annotations: - {{- with .Values.persistence.staticfiles.annotations }} - {{ toYaml . | nindent 4 }} - {{- end }} - helm.sh/resource-policy: keep - labels: - {{- include "tandoor.labels" . | nindent 4 }} -spec: - {{- if .Values.persistence.staticfiles.storageClass }} - storageClassName: {{ .Values.persistence.staticfiles.storageClass | quote }} - {{- end }} - accessModes: - - {{ .Values.persistence.staticfiles.accessMode }} - resources: - requests: - storage: {{ .Values.persistence.staticfiles.size | quote }} -{{- end }} ---- {{- if not .Values.persistence.mediafiles.existingClaim }} apiVersion: v1 kind: PersistentVolumeClaim diff --git a/charts/tandoor/values.yaml b/charts/tandoor/values.yaml index 06c0c55..076296a 100644 --- a/charts/tandoor/values.yaml +++ b/charts/tandoor/values.yaml @@ -33,13 +33,6 @@ securityContext: {} # runAsUser: 1000 persistence: - staticfiles: - name: tandoor-staticfiles - # existingClaim: "" - size: 1Gi - accessMode: ReadWriteOnce - # storageClass: "" - annotations: {} mediafiles: name: tandoor-mediafiles # existingClaim: "" @@ -51,7 +44,7 @@ persistence: service: gunicorn: type: ClusterIP - port: 80 + port: 8080 name: gunicorn nginx: type: ClusterIP @@ -86,21 +79,8 @@ tolerations: [] affinity: {} -# oauth2InitContainer is used to inject the oauth2 provider configuration -oauth2InitContainer: - enabled: false - config: {} - # openid_connect: - # SERVERS: - # - id: oecis - # name: Oecis - # server_url: https://hydra.oecis.io - # token_auth_method: client_secret_post - # APP: - # client_id: "$(OIDC_CLIENT_ID)" - # client_secret: "$(OIDC_CLIENT_SECRET)" - # you can use env to add secrets like OIDC_CLIENT_SECRET - env: [] +initContainers: [] +extraVolumes: [] nginx: image: repository: nginx @@ -109,26 +89,24 @@ nginx: tag: "mainline-alpine" resources: {} tandoor: - # extraEnv can be used to select an oauth2 provider: - # extraEnv: - # - name: SOCIAL_PROVIDERS - # value: allauth.socialaccount.providers.openid_connect + command: [] extraEnv: [] + extraVolumeMounts: [] image: repository: vabene1111/recipes pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "" resources: {} config: - encryptionSecret: "" + encryptionKey: + secretName: "" + secretKey: "encryption-key" postgres: host: "" port: 5432 user: tandoor - password: "" + password: + secretName: "" + secretKey: "password" db: tandoor - existingSecret: "" - secretKeys: - postgresUserPasswordKey: "postgres-user-password" - encryptionSecretKey: "encryption-key" diff --git a/charts/teamspeak3/.helmignore b/charts/teamspeak3/.helmignore new file mode 100644 index 0000000..d607df3 --- /dev/null +++ b/charts/teamspeak3/.helmignore @@ -0,0 +1,20 @@ +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +*.tgz diff --git a/charts/teamspeak3/Chart.yaml b/charts/teamspeak3/Chart.yaml new file mode 100644 index 0000000..515c259 --- /dev/null +++ b/charts/teamspeak3/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +description: teamspeak3 server +home: https://www.teamspeak.com/en/ +keywords: +- teamspeak3 +name: teamspeak3 +type: application +sources: + - https://gitlab.com/oecis/charts/ +version: 1.0.0 +appVersion: 3.13.7 diff --git a/charts/teamspeak3/LICENSE b/charts/teamspeak3/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/charts/teamspeak3/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/charts/teamspeak3/OWNERS b/charts/teamspeak3/OWNERS new file mode 100644 index 0000000..dbe643b --- /dev/null +++ b/charts/teamspeak3/OWNERS @@ -0,0 +1,4 @@ +approvers: +- ksandermann +reviewers: +- ksandermann diff --git a/charts/teamspeak3/README.md b/charts/teamspeak3/README.md new file mode 100644 index 0000000..ab8c527 --- /dev/null +++ b/charts/teamspeak3/README.md @@ -0,0 +1,46 @@ +# teamspeak3 + +![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.13.7](https://img.shields.io/badge/AppVersion-3.13.7-informational?style=flat-square) + +teamspeak3 server + +**Homepage:** + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| configs.allowlist | list | `[]` | | +| extraEnv | list | `[]` | | +| extraVolumeMounts | list | `[]` | | +| extraVolumes | list | `[]` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"teamspeak"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| persistentVolume.accessModes[0] | string | `"ReadWriteOnce"` | | +| persistentVolume.annotations | object | `{}` | | +| persistentVolume.size | string | `"1Gi"` | | +| podAnnotations | object | `{}` | | +| resources.limits.cpu | string | `"250m"` | | +| resources.limits.memory | string | `"512Mi"` | | +| resources.requests.cpu | string | `"100m"` | | +| resources.requests.memory | string | `"256Mi"` | | +| service.file.port | int | `30033` | | +| service.file.type | string | `"ClusterIP"` | | +| service.query.port | int | `10011` | | +| service.query.type | string | `"ClusterIP"` | | +| service.voice.port | int | `9987` | | +| service.voice.type | string | `"ClusterIP"` | | +| tolerations | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/teamspeak3/docs/tcp-configuration.md b/charts/teamspeak3/docs/tcp-configuration.md new file mode 100644 index 0000000..d5fde1d --- /dev/null +++ b/charts/teamspeak3/docs/tcp-configuration.md @@ -0,0 +1,32 @@ +# TCP Configuration +This chart currently has limited support for TCP ports. See [Known Limitations](../README.md#known-limitations) +[Check](https://github.com/janosi/enhancements/blob/mixedprotocollb/keps/sig-network/20200103-mixed-protocol-lb.md#implementation-detailsnotesconstraints) if your enviorment supports `mixed protocols`. + +## How to Enable TCP + * Set `service.tcp.enabled` to `true` in the configuration option; and + * folow any additional specific instructions below + +The Following are known supported `LoadBalancers`: + +### MetalLB +MetalLB supports `mixed protocols` by allowing multiple services to share the same IP address. See [IP Address Sharing](https://metallb.universe.tf/usage/#ip-address-sharing) +This is done by combining two services on a specfic annotation. + + +Settings required: + +| Settings | Value | Comment | +| -----------------------|-------------------------------------------------|----------------------------------------------------------------| +| `services.tcp.type` | `seperate` | (default) | +| `services.annotations` | `metallb.universe.tf/allow-shared-ip`: [string] | Where [string] is a string that uniquely identifies `shared-ip` services.| + +### Azure CPI LB (Untested) +Azure supports `mixed protocols` by declaring that the ports specfied in the service are both TCP and UDP. +This is done by specifying an annotation on a single service. + +Settings required: + +| Settings | Value | Comment +| -----------------------|------------------------------------------------------------------------|-----------------------------------------| +| `services.tcp.type` | `combined` | | +| `services.annotations` | `service.beta.kubernetes.io/azure-load-balancer-mixed-protocols`: true | | diff --git a/charts/teamspeak3/templates/NOTES.txt b/charts/teamspeak3/templates/NOTES.txt new file mode 100644 index 0000000..196ae44 --- /dev/null +++ b/charts/teamspeak3/templates/NOTES.txt @@ -0,0 +1,15 @@ +Deployed image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + +{{- if eq .Values.service.type "NodePort"}} +When running behind a Loadbalancer, the IP of you TS server is the IP of your Loadbalancer. +When not running behind a Loadbalancer, you can use any of your Nodes' IPs as the IP of your server. +{{- end }} + +{{- if eq .Values.service.type "LoadBalancer"}} +In about a minute, when the Loadbalancer has been provisioned, you can get the IP of your server by running: +kubectl get svc {{ .Release.Name }} --output jsonpath='{.status.loadBalancer.ingress[0].ip}' -n {{ .Release.Namespace }} +{{- end }} + +You can get your privilege key by running: +kubectl logs -l app=teamspeak -l heritage={{ .Release.Service }} -l release={{ .Release.Name }} -l chart={{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} -n {{ .Release.Namespace }} +{{ .Release.Namespace }} diff --git a/charts/teamspeak3/templates/_helpers.tpl b/charts/teamspeak3/templates/_helpers.tpl new file mode 100644 index 0000000..2be85b3 --- /dev/null +++ b/charts/teamspeak3/templates/_helpers.tpl @@ -0,0 +1,51 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "teamspeak.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 "teamspeak.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 chart name and version as used by the chart label. +*/}} +{{- define "teamspeak.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "teamspeak.labels" -}} +helm.sh/chart: {{ include "teamspeak.chart" . }} +{{ include "teamspeak.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "teamspeak.selectorLabels" -}} +app.kubernetes.io/name: {{ include "teamspeak.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/teamspeak3/templates/configmap.yaml b/charts/teamspeak3/templates/configmap.yaml new file mode 100644 index 0000000..9dda1ef --- /dev/null +++ b/charts/teamspeak3/templates/configmap.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "teamspeak.fullname" . }} + labels: + {{- include "teamspeak.labels" . | nindent 4 }} +data: + {{- if .Values.configs.allowlist }} + allowlist.txt: | + {{- range .Values.configs.allowlist }} + {{ . }} + {{- end }} + {{- end }} diff --git a/charts/teamspeak3/templates/service.yaml b/charts/teamspeak3/templates/service.yaml new file mode 100644 index 0000000..ba4c86b --- /dev/null +++ b/charts/teamspeak3/templates/service.yaml @@ -0,0 +1,47 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "teamspeak.fullname" . }}-voice + labels: + {{- include "teamspeak.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.voice.type }} + ports: + - targetPort: ts3-voice + protocol: UDP + name: ts3-voice + port: {{ .Values.service.voice.port }} + selector: + {{- include "teamspeak.selectorLabels" . | nindent 4 }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "teamspeak.fullname" . }}-file + labels: + {{- include "teamspeak.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.file.type }} + ports: + - targetPort: ts3-file + protocol: TCP + name: ts3-file + port: {{ .Values.service.file.port }} + selector: + {{- include "teamspeak.selectorLabels" . | nindent 4 }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "teamspeak.fullname" . }}-query + labels: + {{- include "teamspeak.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.query.type }} + ports: + - targetPort: ts3-query + protocol: TCP + name: ts3-query + port: {{ .Values.service.query.port }} + selector: + {{- include "teamspeak.selectorLabels" . | nindent 4 }} diff --git a/charts/teamspeak3/templates/statefulset.yaml b/charts/teamspeak3/templates/statefulset.yaml new file mode 100644 index 0000000..d234bfc --- /dev/null +++ b/charts/teamspeak3/templates/statefulset.yaml @@ -0,0 +1,116 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "teamspeak.fullname" . }} + labels: + {{- include "teamspeak.labels" . | nindent 4 }} +spec: + replicas: 1 + selector: + matchLabels: + {{- include "teamspeak.selectorLabels" . | nindent 6 }} + template: + metadata: + annotations: + configs-hash: {{ (toYaml .Values.configs) | adler32sum | quote }} + {{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} + {{- end }} + labels: + {{- include "teamspeak.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- 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 }} + containers: + - name: teamspeak-server + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: ts3-voice + containerPort: {{ .Values.service.voice.port }} + protocol: UDP + - name: ts3-file + containerPort: {{ .Values.service.file.port }} + protocol: TCP + - name: ts3-query + containerPort: {{ .Values.service.query.port }} + protocol: TCP + livenessProbe: + tcpSocket: + port: {{ .Values.service.query.port }} + initialDelaySeconds: 15 + periodSeconds: 10 + readinessProbe: + tcpSocket: + port: {{ .Values.service.query.port }} + initialDelaySeconds: 15 + periodSeconds: 10 + resources: + {{- toYaml .Values.resources | nindent 12 }} + env: + - name: TS3SERVER_LICENSE + value: accept + {{- if .Values.configs.allowlist }} + - name: TS3SERVER_IP_ALLOWLIST + value: /allowlist.txt + {{- end }} + {{- range .Values.extraEnv }} + - name: {{ .name | quote }} + value: {{ .value | quote }} + {{- end }} + volumeMounts: + - name: data + mountPath: /var/ts3server/ + {{- if .Values.configs.allowlist }} + - name: teamspeak-configs + mountPath: /allowlist.txt + subPath: allowlist.txt + {{- end }} + {{- if .Values.extraVolumeMounts }} +{{ toYaml .Values.extraVolumeMounts | indent 10 }} + {{- end }} + {{- if .Values.image.pullSecret }} + imagePullSecrets: + - name: {{ .Values.image.pullSecret }} + {{- end }} + volumes: + - name: teamspeak-configs + configMap: + name: teamspeak + {{- if .Values.extraVolumeMounts }} +{{ toYaml .Values.extraVolumes | indent 8 }} + {{- end }} + volumeClaimTemplates: + - metadata: + name: data + {{- if .Values.persistentVolume.annotations }} + annotations: +{{ toYaml .Values.persistentVolume.annotations | indent 10 }} + {{- end }} + spec: + accessModes: +{{ toYaml .Values.persistentVolume.accessModes | indent 10 }} + resources: + requests: + storage: "{{ .Values.persistentVolume.size }}" + {{- if .Values.persistentVolume.storageClass }} + {{- if (eq "-" .Values.persistentVolume.storageClass) }} + storageClassName: "" + {{- else }} + storageClassName: "{{ .Values.persistentVolume.storageClass }}" + {{- end }} + {{- end }} diff --git a/charts/teamspeak3/values.yaml b/charts/teamspeak3/values.yaml new file mode 100644 index 0000000..f360ece --- /dev/null +++ b/charts/teamspeak3/values.yaml @@ -0,0 +1,49 @@ +image: + repository: teamspeak + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +podAnnotations: {} + +service: + voice: + type: ClusterIP + port: 9987 + file: + type: ClusterIP + port: 30033 + query: + type: ClusterIP + port: 10011 + +resources: + limits: + cpu: 250m + memory: 512Mi + requests: + cpu: 100m + memory: 256Mi + +nodeSelector: {} +tolerations: [] +affinity: {} + +extraEnv: [] + +extraVolumes: [] + +extraVolumeMounts: [] + +configs: + allowlist: [] + +persistentVolume: + accessModes: [ReadWriteOnce] + annotations: {} + #storageClass: "azure-managed-ssd" + size: 1Gi diff --git a/charts/trilium/README.md b/charts/trilium/README.md new file mode 100644 index 0000000..72f4c83 --- /dev/null +++ b/charts/trilium/README.md @@ -0,0 +1,53 @@ +# trilium + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.60.4](https://img.shields.io/badge/AppVersion-0.60.4-informational?style=flat-square) + +A Helm chart for trilium notes. + +**Homepage:** + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| dataDir | string | `"/srv/trilium-data"` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"zadam/trilium"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.enabled | bool | `false` | | +| ingress.hosts[0].host | string | `"chart-example.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| ingress.tls | list | `[]` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| persistentVolume.accessModes[0] | string | `"ReadWriteOnce"` | | +| persistentVolume.annotations | object | `{}` | | +| persistentVolume.enabled | bool | `false` | | +| persistentVolume.size | string | `"2Gi"` | | +| podSecurityContext | object | `{}` | | +| replicaCount | int | `1` | | +| resources | object | `{}` | | +| securityContext | object | `{}` | | +| service.port | int | `8080` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `nil` | | +| tolerations | list | `[]` | | +| trilium.extraEnv | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/vikunja/Chart.lock b/charts/vikunja/Chart.lock index 252c15c..64069e8 100644 --- a/charts/vikunja/Chart.lock +++ b/charts/vikunja/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 12.10.0 + version: 12.12.10 - name: redis repository: https://charts.bitnami.com/bitnami version: 17.17.1 -digest: sha256:5c1aa0e6714890ca5f363b5aff284d9367bc9fa8c51685adbe6bc59c1df16bf4 -generated: "2023-08-27T15:35:50.6261449+02:00" +digest: sha256:c4e649966b0209fe3e8795577f6fd93dbc09dbc595bef44ac00292e1248fe829 +generated: "2023-12-22T15:27:06.559935063+01:00" diff --git a/charts/vikunja/Chart.yaml b/charts/vikunja/Chart.yaml index d6b1a19..7b605fd 100644 --- a/charts/vikunja/Chart.yaml +++ b/charts/vikunja/Chart.yaml @@ -1,10 +1,13 @@ apiVersion: v2 name: vikunja description: The to-do app to organize your life -home: https://gitlab.com/oecis/charts/-/tree/main/charts/vikunja +home: https://vikunja.io/ +sources: + - https://kolaente.dev/vikunja/ + - https://gitlab.com/oecis/charts/-/tree/main/charts/vikunja type: application -version: 0.1.2 -appVersion: "0.21.0" +version: 0.1.5 +appVersion: "0.23.0" dependencies: - condition: postgresql.enabled name: postgresql diff --git a/charts/vikunja/README.md b/charts/vikunja/README.md index 99f2e2d..d6fe69a 100644 --- a/charts/vikunja/README.md +++ b/charts/vikunja/README.md @@ -1,10 +1,15 @@ # vikunja -![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.21.0](https://img.shields.io/badge/AppVersion-0.21.0-informational?style=flat-square) +![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.0](https://img.shields.io/badge/AppVersion-0.23.0-informational?style=flat-square) The to-do app to organize your life -**Homepage:** +**Homepage:** + +## Source Code + +* +* ## Requirements @@ -22,12 +27,6 @@ The to-do app to organize your life | autoscaling.maxReplicas | int | `100` | | | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | -| backend.extraEnv | list | `[]` | | -| backend.image.pullPolicy | string | `"IfNotPresent"` | | -| backend.image.repository | string | `"vikunja/api"` | | -| backend.image.tag | string | `"latest"` | | -| backend.service.port | int | `3456` | | -| backend.service.type | string | `"ClusterIP"` | | | config.cache.enabled | bool | `false` | | | config.cache.maxElementSize | int | `1000` | | | config.cache.redis.enabled | bool | `false` | | @@ -40,31 +39,31 @@ The to-do app to organize your life | config.db.secretKeys.dbPasswordKey | string | `"user-password"` | | | config.db.type | string | `"postgres"` | | | config.db.user | string | `""` | | -| config.frontendUrl | string | `"https://tasks.local"` | | | config.jwt.existingSecret | string | `""` | | | config.jwt.secretKeys.jwtSecretKey | string | `"jwt-secret"` | | | config.linkSharing | bool | `true` | | | config.log.level | string | `"ERROR"` | | +| config.publicUrl | string | `"https://tasks.local"` | | | config.registration | bool | `true` | | | config.taskAttachments | bool | `true` | | -| frontend.extraEnv | list | `[]` | | -| frontend.image.pullPolicy | string | `"IfNotPresent"` | | -| frontend.image.repository | string | `"vikunja/frontend"` | | -| frontend.image.tag | string | `"latest"` | | -| frontend.service.port | int | `80` | | -| frontend.service.type | string | `"ClusterIP"` | | +| extraEnv | list | `[]` | | +| extraVolumeMounts | list | `[]` | | +| extraVolumes | list | `[]` | | | fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"vikunja/vikunja"` | | +| image.tag | string | `""` | | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | | ingress.className | string | `""` | | | ingress.enabled | bool | `false` | | | ingress.hosts[0].host | string | `"tasks.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | | ingress.tls | list | `[]` | | +| initContainers | list | `[]` | | | nameOverride | string | `""` | | | nodeSelector | object | `{}` | | -| openIdInitContainer.config | object | `{}` | | -| openIdInitContainer.enabled | bool | `false` | | -| openIdInitContainer.env | list | `[]` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | postgresql.enabled | bool | `true` | | @@ -73,10 +72,12 @@ The to-do app to organize your life | replicaCount | int | `1` | | | resources | object | `{}` | | | securityContext | object | `{}` | | +| service.port | int | `3456` | | +| service.type | string | `"ClusterIP"` | | | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/charts/vikunja/templates/backend/service.yaml b/charts/vikunja/templates/backend/service.yaml deleted file mode 100644 index 94e2d78..0000000 --- a/charts/vikunja/templates/backend/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "vikunja.fullname" . }}-api - labels: - {{- include "vikunja.labels" . | nindent 4 }} -spec: - type: {{ .Values.backend.service.type }} - ports: - - port: {{ .Values.backend.service.port }} - targetPort: api - protocol: TCP - name: api - selector: - {{- include "vikunja.selectorLabels" . | nindent 4 }} diff --git a/charts/vikunja/templates/backend/deployment.yaml b/charts/vikunja/templates/deployment.yaml similarity index 70% rename from charts/vikunja/templates/backend/deployment.yaml rename to charts/vikunja/templates/deployment.yaml index 2f903b1..5ee0a04 100644 --- a/charts/vikunja/templates/backend/deployment.yaml +++ b/charts/vikunja/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "vikunja.fullname" . }}-backend + name: {{ include "vikunja.fullname" . }} labels: {{- include "vikunja.labels" . | nindent 4 }} spec: @@ -27,40 +27,32 @@ spec: serviceAccountName: {{ include "vikunja.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} - {{- if .Values.openIdInitContainer.enabled }} + {{- if not (empty .Values.extraVolumes ) }} volumes: - - name: openid-config - emptyDir: - medium: Memory + {{- toYaml .Values.extraVolumes | nindent 8 }} + {{- end }} + {{- if not (empty .Values.initContainers)}} initContainers: - - name: {{ .Chart.Name }}-openid-config-injector - image: busybox - volumeMounts: - - mountPath: /config - name: openid-config - command: ["/bin/sh"] - args: ["-c", {{ quote (printf "echo -e %q > /config/config.yaml" ( .Values.openIdInitContainer.config | toYaml ))}}] - env: - {{- toYaml .Values.openIdInitContainer.env | nindent 12}} + {{- toYaml .Values.initContainers | nindent 10}} {{- end }} containers: - - name: {{ .Chart.Name }}-backend + - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.backend.image.pullPolicy }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: api - containerPort: {{ .Values.backend.service.port }} + - name: http + containerPort: {{ .Values.service.port }} protocol: TCP livenessProbe: httpGet: path: /api/v1/info - port: api + port: http readinessProbe: httpGet: path: /api/v1/info - port: api + port: http resources: {{- toYaml .Values.resources | nindent 12 }} env: @@ -95,15 +87,14 @@ spec: {{- end }} - name: VIKUNJA_DATABASE_USER value: {{ .Values.config.db.user }} - - name: VIKUNJA_SERVICE_FRONTENDURL - value: {{ .Values.config.frontendUrl }} - {{- if not (empty .Values.backend.extraEnv) }} - {{- toYaml .Values.backend.extraEnv | nindent 12 }} + - name: VIKUNJA_SERVICE_PUBLICURL + value: {{ .Values.config.publicUrl }} + {{- if not (empty .Values.extraEnv) }} + {{- toYaml .Values.extraEnv | nindent 12 }} {{- end }} - {{- if .Values.openIdInitContainer.enabled }} + {{- if not (empty .Values.extraVolumeMounts) }} volumeMounts: - - mountPath: /etc/vikunja - name: openid-config + {{- toYaml .Values.extraVolumeMounts | nindent 12 }} {{- end}} {{- with .Values.nodeSelector }} nodeSelector: diff --git a/charts/vikunja/templates/ingress.yaml b/charts/vikunja/templates/ingress.yaml index 1baef6b..c545175 100644 --- a/charts/vikunja/templates/ingress.yaml +++ b/charts/vikunja/templates/ingress.yaml @@ -1,5 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "vikunja.fullname" . -}} +{{- $svcPort := .Values.service.port -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} @@ -40,33 +41,21 @@ spec: - host: {{ .host | quote }} http: paths: - - path: / - pathType: Prefix + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ $fullName }}-frontend + name: {{ $fullName }} port: - name: http - - path: /api - pathType: Prefix - backend: - service: - name: {{ $fullName }}-api - port: - name: api - - path: /dav - pathType: Prefix - backend: - service: - name: {{ $fullName }}-api - port: - name: api - - path: /.well-known - pathType: Prefix - backend: - service: - name: {{ $fullName }}-api - port: - name: api + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} {{- end }} {{- end }} diff --git a/charts/vikunja/templates/frontend/service.yaml b/charts/vikunja/templates/service.yaml similarity index 62% rename from charts/vikunja/templates/frontend/service.yaml rename to charts/vikunja/templates/service.yaml index 115efb9..e64a4bc 100644 --- a/charts/vikunja/templates/frontend/service.yaml +++ b/charts/vikunja/templates/service.yaml @@ -1,13 +1,13 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "vikunja.fullname" . }}-frontend + name: {{ include "vikunja.fullname" . }} labels: {{- include "vikunja.labels" . | nindent 4 }} spec: - type: {{ .Values.frontend.service.type }} + type: {{ .Values.service.type }} ports: - - port: {{ .Values.frontend.service.port }} + - port: {{ .Values.service.port }} targetPort: http protocol: TCP name: http diff --git a/charts/vikunja/values.yaml b/charts/vikunja/values.yaml index 4c5ce61..79f3275 100644 --- a/charts/vikunja/values.yaml +++ b/charts/vikunja/values.yaml @@ -4,30 +4,19 @@ replicaCount: 1 -frontend: - image: - repository: vikunja/frontend - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: latest - service: - type: ClusterIP - port: 80 - extraEnv: [] -backend: - image: - repository: vikunja/api - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: latest - service: - type: ClusterIP - port: 3456 - extraEnv: [] -openIdInitContainer: - enabled: false - config: {} - env: [] +image: + repository: vikunja/vikunja + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" +service: + type: ClusterIP + port: 3456 + +extraEnv: [] +extraVolumes: [] +extraVolumeMounts: [] +initContainers: [] ingress: enabled: false @@ -37,6 +26,9 @@ ingress: # kubernetes.io/tls-acme: "true" hosts: - host: tasks.local + paths: + - path: / + pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls @@ -125,7 +117,7 @@ config: existingSecret: "" secretKeys: dbPasswordKey: user-password - frontendUrl: https://tasks.local + publicUrl: https://tasks.local registration: true linkSharing: true taskAttachments: true