Update README with multiple LDAP Sources (#271 )

We did not mention the multiple LDAP Sources as a breaking change. Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/271 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net>
Improve support for gitea instances not running as root or uid 1000 (#266 )
2021-12-23 21:43:21 +08:00 · 2021-12-23 18:50:56 +08:00 · 2021-12-23 03:56:36 +08:00 · 2021-12-23 00:25:32 +08:00 · 2021-12-22 23:41:35 +08:00 · 2021-12-22 18:44:04 +08:00
11 changed files with 1225 additions and 560 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,5 +1,6 @@
 ---
 kind: pipeline
 type: docker
 name: lint
 platform:
@ -7,12 +8,26 @@ platform:
  arch: arm64
 steps:
- name: lint
+- name: helm lint
  pull: always
  image: alpine:3.13
  commands:
-    - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
+  - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
-    - helm lint
+  - helm lint
 - name: helm template
  pull: always
  image: alpine:3.13
  commands:
  - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
  - helm dependency update
  - helm template --debug gitea-helm .
 - name: markdown lint
  pull: always
  image: docker.io/volkerraschek/markdownlint:latest
  commands:
  - markdownlint *.md
 - name: discord
  pull: always
@ -29,6 +44,7 @@ steps:
 ---
 kind: pipeline
 type: docker
 name: release-version
 platform:
@ -37,33 +53,33 @@ platform:
 trigger:
  event:
-    - tag
+  - tag
 steps:
-  - name: generate-chart
+- name: generate-chart
-    pull: always
+  pull: always
-    image: alpine:3.13
+  image: alpine:3.13
-    commands:
+  commands:
-      - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
+    - apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
-      - apk add --no-cache curl
+    - apk add --no-cache curl
-      - helm dependency update
+    - helm dependency update
-      - helm package --version "${DRONE_TAG##v}" ./
+    - helm package --version "${DRONE_TAG##v}" ./
-      - mkdir gitea
+    - mkdir gitea
-      - mv gitea*.tgz gitea/
+    - mv gitea*.tgz gitea/
-      - curl -L -o gitea/index.yaml https://dl.gitea.io/charts/index.yaml
+    - curl -L -o gitea/index.yaml https://dl.gitea.io/charts/index.yaml
-      - helm repo index gitea/ --url https://dl.gitea.io/charts --merge gitea/index.yaml
+    - helm repo index gitea/ --url https://dl.gitea.io/charts --merge gitea/index.yaml
-  - name: upload-chart
+- name: upload-chart
-    pull: always
+  pull: always
-    image: plugins/s3:latest
+  image: plugins/s3:latest
-    settings:
+  settings:
-      bucket: gitea-artifacts
+    bucket: gitea-artifacts
-      endpoint: https://storage.gitea.io
+    endpoint: https://storage.gitea.io
-      path_style: true
+    path_style: true
-      access_key:
+    access_key:
-        from_secret: aws_access_key_id
+      from_secret: aws_access_key_id
-      secret_key:
+    secret_key:
-        from_secret: aws_secret_access_key
+      from_secret: aws_secret_access_key
-      source: gitea/*
+    source: gitea/*
-      target: /charts
+    target: /charts
-      strip_prefix: gitea/
+    strip_prefix: gitea/
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@ -0,0 +1,151 @@
 # markdownlint YAML configuration
 # https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.yaml
 # Default state for all rules
 default: true
 # Path to configuration file to extend
 extends: null
 # MD003/heading-style/header-style - Heading style
 MD003:
  # Heading style
  style: "atx"
 # MD004/ul-style - Unordered list style
 MD004:
  style: "dash"
 # MD007/ul-indent - Unordered list indentation
 MD007:
  # Spaces for indent
  indent: 2
  # Whether to indent the first level of the list
  start_indented: false
 # MD009/no-trailing-spaces - Trailing spaces
 MD009:
  # Spaces for line break
  br_spaces: 2
  # Allow spaces for empty lines in list items
  list_item_empty_lines: false
  # Include unnecessary breaks
  strict: false
 # MD010/no-hard-tabs - Hard tabs
 MD010:
  # Include code blocks
  code_blocks: true
 # MD012/no-multiple-blanks - Multiple consecutive blank lines
 MD012:
  # Consecutive blank lines
  maximum: 1
 # MD013/line-length - Line length
 MD013:
  # Number of characters
  line_length: 80
  # Number of characters for headings
  heading_line_length: 80
  # Number of characters for code blocks
  code_block_line_length: 80
  # Include code blocks
  code_blocks: false
  # Include tables
  tables: false
  # Include headings
  headings: true
  # Include headings
  headers: true
  # Strict length checking
  strict: false
  # Stern length checking
  stern: false
 # MD022/blanks-around-headings/blanks-around-headers - Headings should be surrounded by blank lines
 MD022:
  # Blank lines above heading
  lines_above: 1
  # Blank lines below heading
  lines_below: 1
 # MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
 MD024:
  # Only check sibling headings
  allow_different_nesting: true
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
  # Heading level
  level: 1
  # RegExp for matching title in front matter
  front_matter_title: "^\\s*title\\s*[:=]"
 # MD026/no-trailing-punctuation - Trailing punctuation in heading
 MD026:
  # Punctuation characters
  punctuation: ".,;:!。，；：！"
 # MD029/ol-prefix - Ordered list item prefix
 MD029:
  # List style
  style: "one_or_ordered"
 # MD030/list-marker-space - Spaces after list markers
 MD030:
  # Spaces for single-line unordered list items
  ul_single: 1
  # Spaces for single-line ordered list items
  ol_single: 1
  # Spaces for multi-line unordered list items
  ul_multi: 1
  # Spaces for multi-line ordered list items
  ol_multi: 1
 # MD033/no-inline-html - Inline HTML
 MD033:
  # Allowed elements
  allowed_elements: []
 # MD035/hr-style - Horizontal rule style
 MD035:
  # Horizontal rule style
  style: "---"
 # MD036/no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading
 MD036:
  # Punctuation characters
  punctuation: ".,;:!?。，；：！？"
 # MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
 MD041:
  # Heading level
  level: 1
  # RegExp for matching title in front matter
  front_matter_title: "^\\s*title\\s*[:=]"
 # MD044/proper-names - Proper names should have the correct capitalization
 MD044:
  # List of proper names
  names:
  - Gitea
  - PostgreSQL
  - MariaDB
  - MySQL
  - Memcached
  - Prometheus
  - Git
  - GitOps
  # Include code blocks
  code_blocks: false
 # MD046/code-block-style - Code block style
 MD046:
  # Block style
  style: "fenced"
 # MD048/code-fence-style - Code fence style
 MD048:
  # Code fence syle
  style: "backtick"
--- a/Chart.yaml
+++ b/Chart.yaml
@ -3,7 +3,7 @@ name: gitea
 description: Gitea Helm chart for Kubernetes
 type: application
 version: 0.0.0
-appVersion: 1.14.3
+appVersion: 1.15.8
 icon: https://docs.gitea.io/images/gitea.png
 keywords:
@ -33,16 +33,16 @@ dependencies:
 - name: memcached
  repository: https://charts.bitnami.com/bitnami
  version: 5.9.0
-  condition: gitea.cache.builtIn.enabled
+  condition: memcached.enabled
 - name: mysql
  repository: https://charts.bitnami.com/bitnami
  version: 6.14.10
-  condition: gitea.database.builtIn.mysql.enabled
+  condition: mysql.enabled
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
  version: 10.3.17
-  condition: gitea.database.builtIn.postgresql.enabled
+  condition: postgresql.enabled
 - name: mariadb
  repository: https://charts.bitnami.com/bitnami
  version: 9.3.6
-  condition: gitea.database.builtIn.mariadb.enabled
+  condition: mariadb.enabled
--- a/README.md
+++ b/README.md
@ -1,46 +1,133 @@
 # Gitea Helm Chart
-[Gitea](https://gitea.io/en-us/) is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
+[Gitea](https://gitea.io/en-us/) is a community managed lightweight code hosting
 solution written in Go. It is published under the MIT license.
 ## Introduction
-This helm chart has taken some inspiration from <https://github.com/jfelten/gitea-helm-chart>
+This helm chart has taken some inspiration from [jfelten's helm
-But takes a completely different approach in providing a database and cache with dependencies.
+chart](https://github.com/jfelten/gitea-helm-chart). But takes a completely
-Additionally, this chart provides LDAP and admin user configuration with values, as well as being deployed as a statefulset to retain stored repositories.
+different approach in providing a database and cache with dependencies.
 Additionally, this chart provides LDAP and admin user configuration with values,
 as well as being deployed as a statefulset to retain stored repositories.
 ## Dependencies
-Gitea can be run with an external database and cache. This chart provides those dependencies, which can be
+Gitea can be run with an external database and cache. This chart provides those
-enabled, or disabled via [configuration](#configuration).
+dependencies, which can be enabled, or disabled via
 [configuration](#configuration).
 Dependencies:
-* Postgresql
+- PostgreSQL
-* Memcached
+- Memcached
-* Mysql
+- MySQL
 ## Installing
 ```sh
-  helm repo add gitea-charts https://dl.gitea.io/charts/
+helm repo add gitea-charts https://dl.gitea.io/charts/
-  helm repo update
+helm repo update
-  helm install gitea gitea-charts/gitea
+helm install gitea gitea-charts/gitea
 ```
 ## Prerequisites
-* Kubernetes 1.12+
+- Kubernetes 1.12+
-* Helm 3.0+
+- Helm 3.0+
-* PV provisioner for persistent data support
+- PV provisioner for persistent data support
 ## Chart upgrade to 5.0.0
 :warning: The most recent `5.0.0` update brings some major and breaking changes.
 Please note the following changes in the Chart to upgrade successfully. :warning:
 ### Enable Dependencies
 :warning: The values to enable the dependencies,
 such as PostgreSQL, Memcached, MySQL and MariaDB
 have been moved from `gitea.database.builtIn.` to the dependency values. :warning:
 You can now enable the dependencies as followed:
 ```yaml
 memcached:
  enabled: true
 postgresql:
  enabled: true
 mysql:
  enabled: false
 mariadb:
  enabled: false
 ```
 ### App.ini generation
 The app.ini generation has changed and now utilizes the environment-to-ini
 script provided by newer Gitea versions.
 > :boom: The Helm Chart now requires Gitea versions of at least 1.11.0.
 This change ensures, that the app.ini is now persistent.
 #### Secret Key generation
 Gitea secret keys (SECRET_KEY, INTERNAL_TOKEN, JWT_SECRET) are now generated
 automatically in certain situations:
 - New install: By default the secrets are created automatically. If you provide
  secrets via `gitea.config` they will be used instead of automatic generation.
 - Existing installs: The secrets won't be deployed, neither via
  configuration nor via auto generation. We explicitly prevent to set new secrets.
 > :rotating_light: It would be possible to set new secret keys manually by entering
 the running container and rewriting the app.ini by hand. However, this it is
 not advisable to do so for existing installations. Certain settings like
 _LDAP_ would not be readable anymore.
 ### Probes
 > :boom: `gitea.customLivenessProbe`, `gitea.customReadinessProbe` and `gitea.customStartupProbe`
 have been removed.
 They are replaced by the settings `gitea.livenessProbe`, `gitea.readinessProbe`
 and `gitea.startupProbe` which are now fully configurable and used _as-is_ for
 a Chart deployment.
 If you have customized their values instead of using the `custom` prefixed settings,
 please ensure that you remove the `enabled` property from each of them.
 In case you want to disable one of these probes, let's say the `livenessProbe`, add
 the following to your values. The `podAnnotation` is just there to have a bit more
 context.
 ```diff
 gitea:
 + livenessProbe:
  podAnnotations: {}
 ```
 ### Multiple OAuth and LDAP authentication sources
 With `5.0.0` of this Chart it is now possible to configure Gitea with multiple
 OAuth and LDAP sources. As a result, you need to update an existing OAuth/LDAP configuration
 in your customized `values.yaml` by replacing the object with settings to a list
 of settings objects. See [OAuth2 Settings](#oauth-settings) and
 [LDAP Settings](#ldap-settings) section for details.
 ## Chart upgrade from 3.x.x to 4.0.0
-:warning: The most recent 4.0.0 update brings some breaking changes. Please note the following changes in the Chart to upgrade successfully. :warning:
+:warning: The most recent `4.0.0` update brings some breaking changes. Please note
 the following changes in the Chart to upgrade successfully. :warning:
 ### Ingress changes
-To provide a more flexible Ingress configuration we now support not only host settings but also provide configuration for the path and pathType. So this change changes the hosts from a simple string list, to a list containing a more complex object for more configuration.
+To provide a more flexible Ingress configuration we now support not only host
-
+settings but also provide configuration for the path and pathType. So this
 change changes the hosts from a simple string list, to a list containing a more
 complex object for more configuration.
 ```diff
 ingress:
@ -61,7 +148,8 @@ ingress:
  #      - git.example.com
 ```
-If you want everything as it was before, you can simply add the following code to all your host entries.
+If you want everything as it was before, you can simply add the following code
 to all your host entries.
 ```yaml
 paths:
@ -71,69 +159,92 @@ paths:
 ### Dropped kebab-case support
-In 3.x.x it was possible to provide an ldap configuration via kebab-case, this support has now been dropped and only camel case is supported.
+In 3.x.x it was possible to provide an ldap configuration via kebab-case, this
-See [LDAP section](#ldap-settings) for more information.
+support has now been dropped and only camel case is supported. See [LDAP
 section](#ldap-settings) for more information.
 ### Dependency update
-The chart comes with multiple databases and memcached as dependency, the latest release updated the dependencies.
+The chart comes with multiple databases and Memcached as dependency, the latest
 release updated the dependencies.
- memcached: 4.2.20 -> 5.9.0
+- Memcached: `4.2.20` -> `5.9.0`
- postgresql: 9.7.2 -> 10.3.17
+- PostgreSQL: `9.7.2` -> `10.3.17`
- mariadb: 8.0.0 -> 9.3.6
+- MariaDB: `8.0.0` -> `9.3.6`
-If you're using the builtin databases you will most likely redeploy the chart in order to update the database correctly.
+If you're using the builtin databases you will most likely redeploy the chart in
 order to update the database correctly.
 ### Execution of initPreScript
-Generally spoken, this might not be a breaking change, but it is worth to be mentioned.  
+Generally spoken, this might not be a breaking change, but it is worth to be
-Prior to 4.0.0 only one init container was used to both setup directories and configure Gitea. As of now the actual Gitea configuration is separated from the other pre-execution. This also includes the execution of _initPreScript_. If you have such script, please be aware of this. Dynamically prepare the Gitea setup during execution by e.g. adding environment variables to the execution context won't work anymore.
+mentioned.
 Prior to `4.0.0` only one init container was used to both setup directories and
 configure Gitea. As of now the actual Gitea configuration is separated from the
 other pre-execution. This also includes the execution of _initPreScript_. If you
 have such script, please be aware of this. Dynamically prepare the Gitea setup
 during execution by e.g. adding environment variables to the execution context
 won't work anymore.
 ## Gitea Version 1.14.X repository ROOT
-Previously the ROOT folder for the gitea repositories was located at /data/git/gitea-repositories
+Previously the ROOT folder for the Gitea repositories was located at
-1.14 changed this to /data/gitea-repositories.
+`/data/git/gitea-repositories`. In version `1.14` has the path been changed to
 `/data/gitea-repositories`.
-This chart will set the gitea.config.repository.ROOT value default to /data/git/gitea-repositories
+This chart will set the `gitea.config.repository.ROOT` value default to
 `/data/git/gitea-repositories`.
 ## Configure Commit Signing
-When using the rootless image the gpg key folder was is not persistent by default. If you consider using signed commits for internal Gitea activities (e.g. initial commit), you'd need to provide a signing key. Prior to [PR 186](https://gitea.com/gitea/helm-chart/pulls/186), imported keys had to be re-imported once the container got replaced by another.  
+When using the rootless image the gpg key folder was is not persistent by
-The mentioned PR introduced a new configuration object `signing` allowing you to configure prerequisites for commit signing. By default this section is disabled to maintain backwards compatibility.
+default. If you consider using signed commits for internal Gitea activities
 (e.g. initial commit), you'd need to provide a signing key. Prior to
 [PR186](https://gitea.com/gitea/helm-chart/pulls/186), imported keys had to be
 re-imported once the container got replaced by another.
 The mentioned PR introduced a new configuration object `signing` allowing you to
 configure prerequisites for commit signing. By default this section is disabled
 to maintain backwards compatibility.
 ```yaml
-  signing:
+signing:
-    enabled: false
+  enabled: false
-    gpgHome: /data/git/.gnupg
+  gpgHome: /data/git/.gnupg
 ```
 ## Examples
 ### Gitea Configuration
-Gitea offers lots of configuration options. This is fully described in the [Gitea Cheat Sheet](https://docs.gitea.io/en-us/config-cheat-sheet/).
+Gitea offers lots of configuration options. This is fully described in the
 [Gitea Cheat Sheet](https://docs.gitea.io/en-us/config-cheat-sheet/).
 ```yaml
-  gitea:
+gitea:
-    config:
+  config:
-      APP_NAME: "Gitea: With a cup of tea."
+    APP_NAME: "Gitea: With a cup of tea."
-      repository:
+    repository:
-        ROOT: "~/gitea-repositories"
+      ROOT: "~/gitea-repositories"
-      repository.pull-request:
+    repository.pull-request:
-        WORK_IN_PROGRESS_PREFIXES: "WIP:,[WIP]:"
+      WORK_IN_PROGRESS_PREFIXES: "WIP:,[WIP]:"
 ```
 ### Default Configuration
-This chart will set a few defaults in the gitea configuration based on the service and ingress settings. All defaults can be overwritten in gitea.config.
+This chart will set a few defaults in the Gitea configuration based on the
 service and ingress settings. All defaults can be overwritten in `gitea.config`.
-INSTALL_LOCK is always set to true, since we want to configure gitea with this helm chart and everything is taken care of.
+INSTALL_LOCK is always set to true, since we want to configure Gitea with this
 helm chart and everything is taken care of.
 *All default settings are made directly in the generated app.ini, not in the Values.*
 #### Database defaults
-If a builtIn database is enabled the database configuration is set automatically. For example, postgresql builtIn will appear in the app.ini as:
+If a builtIn database is enabled the database configuration is set
 automatically. For example, PostgreSQL builtIn will appear in the app.ini as:
 ```ini
 [database]
@ -146,7 +257,8 @@ USER = gitea
 #### Memcached defaults
-Memcached is handled the exact same way as database builtIn. Once memcached builtIn is enabled, this chart will generate the following part in the app.ini:
+Memcached is handled the exact same way as database builtIn. Once Memcached
 builtIn is enabled, this chart will generate the following part in the `app.ini`:
 ```ini
 [cache]
@ -157,8 +269,9 @@ HOST = RELEASE-NAME-memcached.default.svc.cluster.local:11211
 #### Server defaults
-The server defaults are a bit more complex.
+The server defaults are a bit more complex. If ingress is `enabled`, the
-If ingress is enabled, the ROOT_URL, DOMAIN and SSH_DOMAIN will be set accordingly. HTTP_PORT always defaults to 3000 as well as SSH_PORT to 22.
+`ROOT_URL`, `DOMAIN` and `SSH_DOMAIN` will be set accordingly. `HTTP_PORT`
 always defaults to `3000` as well as `SSH_PORT` to `22`.
 ```ini
 [server]
@ -182,44 +295,92 @@ The Prometheus `/metrics` endpoint is disabled by default.
 ENABLED = false
 ```
-### External Database
+### Additional _app.ini_ settings
-An external Database can be used instead of builtIn postgresql or mysql.
+> **The [generic](https://docs.gitea.io/en-us/config-cheat-sheet/#overall-default)
 section cannot be defined that way.**
 Some settings inside _app.ini_ (like passwords or whole authentication configurations)
 must be considered sensitive and therefore should not be passed via plain text
 inside the _values.yaml_ file. In times of _GitOps_ the values.yaml could be stored
 in a Git repository where sensitive data should never be accessible.
 The Helm Chart supports this approach and let the user define custom sources like
 Kubernetes Secrets to be loaded as environment variables during _app.ini_ creation
 or update.
 ```yaml
-  gitea:
+gitea:
-    database:
+  additionalConfigSources:
-      builtIn:
+    - secret:
-        postgresql:
+        secretName: gitea-app-ini-oauth
-          enabled: false
+    - configMap:
        name: gitea-app-ini-plaintext
 ```
-    config:
+This would mount the two additional volumes (`oauth` and `some-additionals`)
-      database:
+from different sources to the init containerwhere the _app.ini_ gets updated.
-        DB_TYPE: mysql
+All files mounted that way will be read and converted to environment variables
-        HOST: 127.0.0.1:3306
+and then added to the _app.ini_ using [environment-to-ini](https://github.com/go-gitea/gitea/tree/main/contrib/environment-to-ini).
-        NAME: gitea
+
-        USER: root
+The key of such additional source represents the section inside the _app.ini_.
-        PASSWD: gitea
+The value for each key can be multiline ini-like definitions.
-        SCHEMA: gitea
+
 In example, the referenced `gitea-app-ini-plaintext` could look like this.
 ```yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
  name: gitea-app-ini-plaintext
 data:
  session: |
    PROVIDER=memory
    SAME_SITE=strict
  cron.archive_cleanup: |
    ENABLED=true
 ```
 ### External Database
 An external Database can be used instead of builtIn PostgreSQL or MySQL.
 ```yaml
 gitea:
  config:
    database:
      DB_TYPE: mysql
      HOST: 127.0.0.1:3306
      NAME: gitea
      USER: root
      PASSWD: gitea
      SCHEMA: gitea
 postgresql:
  enabled: false
 ```
 ### Ports and external url
-By default port 3000 is used for web traffic and 22 for ssh. Those can be changed:
+By default port `3000` is used for web traffic and `22` for ssh. Those can be changed:
 ```yaml
-  service:
+service:
-    http:
+  http:
-      port: 3000
+    port: 3000
-    ssh:
+  ssh:
-      port: 22
+    port: 22
 ```
-This helm chart automatically configures the clone urls to use the correct ports. You can change these ports by hand using the `gitea.config` dict. However you should know what you're doing.
+This helm chart automatically configures the clone urls to use the correct
 ports. You can change these ports by hand using the `gitea.config` dict. However
 you should know what you're doing.
 ### ClusterIP
-By default the clusterIP will be set to None, which is the default for headless services. However if you want to omit the clusterIP field in the service, use the following values:
+By default the clusterIP will be set to None, which is the default for headless
 services. However if you want to omit the clusterIP field in the service, use
 the following values:
 ```yaml
 service:
@ -235,8 +396,9 @@ service:
 ### SSH and Ingress
-If you're using ingress and wan't to use SSH, keep in mind, that ingress is not able to forward SSH Ports.
+If you're using ingress and won't to use SSH, keep in mind, that ingress is not
-You will need a LoadBalancer like metallb and a setting in your ssh service annotations.
+able to forward SSH Ports. You will need a LoadBalancer like `metallb` and a
 setting in your ssh service annotations.
 ```yaml
 service:
@ -265,33 +427,35 @@ More about this issue [here](https://gitea.com/gitea/helm-chart/issues/161).
 ### Cache
-This helm chart can use a built in cache. The default is memcached from bitnami.
+This helm chart can use a built in cache. The default is Memcached from bitnami.
 ```yaml
-  gitea:
+memcached:
-    cache:
+  enabled: true
      builtIn:
        enabled: true
 ```
-If the built in cache should not be used simply configure the cache in gitea.config
+If the built in cache should not be used simply configure the cache in
 `gitea.config`.
 ```yaml
-  gitea:
+gitea:
-    config:
+  config:
-      cache:
+    cache:
-        ENABLED: true
+      ENABLED: true
-        ADAPTER: memory
+      ADAPTER: memory
-        INTERVAL: 60
+      INTERVAL: 60
-        HOST: 127.0.0.1:9090
+      HOST: 127.0.0.1:9090
 ```
 ### Persistence
-Gitea will be deployed as a statefulset. By simply enabling the persistence and setting the storage class according to your cluster
+Gitea will be deployed as a statefulset. By simply enabling the persistence and
-everything else will be taken care of. The following example will create a PVC as a part of the statefulset. This PVC will not be deleted even if you uninstall the chart.
+setting the storage class according to your cluster everything else will be
 taken care of. The following example will create a PVC as a part of the
 statefulset. This PVC will not be deleted even if you uninstall the chart.
-Please note, that an empty storageClass in the persistence will result in kubernetes using your default storage class.
+Please note, that an empty storageClass in the persistence will result in
 kubernetes using your default storage class.
 If you want to use your own storageClass define it as followed:
@ -301,7 +465,8 @@ persistence:
  storageClass: myOwnStorageClass
 ```
-When using Postgresql as dependency, this will also be deployed as a statefulset by default.
+When using PostgreSQL as dependency, this will also be deployed as a statefulset
 by default.
 If you want to manage your own PVC you can simply pass the PVC name to the chart.
@ -313,7 +478,7 @@ If you want to manage your own PVC you can simply pass the PVC name to the chart
 In case that peristence has been disabled it will simply use an empty dir volume.
-Postgresql handles the persistence in the exact same way.
+PostgreSQL handles the persistence in the exact same way.
 You can interact with the postgres settings as displayed in the following example:
 ```yaml
@ -323,7 +488,7 @@ You can interact with the postgres settings as displayed in the following exampl
      existingClaim: MyAwesomeGiteaPostgresClaim
 ```
-Mysql also handles persistence the same, even though it is not deployed as a statefulset.
+MySQL also handles persistence the same, even though it is not deployed as a statefulset.
 You can interact with the postgres settings as displayed in the following example:
 ```yaml
@ -335,9 +500,10 @@ You can interact with the postgres settings as displayed in the following exampl
 ### Admin User
-This chart enables you to create a default admin user. It is also possible to update the password for this user by upgrading or redeloying the chart.
+This chart enables you to create a default admin user. It is also possible to
-It is not possible to delete an admin user after it has been created. This has to be done in the ui.
+update the password for this user by upgrading or redeloying the chart. It is
-You cannot use `admin` as username.
+not possible to delete an admin user after it has been created. This has to be
 done in the ui. You cannot use `admin` as username.
 ```yaml
  gitea:
@ -368,25 +534,26 @@ gitea:
 ### LDAP Settings
-Like the admin user the LDAP settings can be updated, but also disabled or deleted.
+Like the admin user the LDAP settings can be updated.
 All LDAP values from <https://docs.gitea.io/en-us/command-line/#admin> are available.
 Multiple LDAP sources can be configured with additional LDAP list items.
 ```yaml
  gitea:
    ldap:
-      enabled: true
+      - name: MyAwesomeGiteaLdap
-      name: 'MyAwesomeGiteaLdap'
+        securityProtocol: unencrypted
-      securityProtocol: unencrypted
+        host: "127.0.0.1"
-      host: "127.0.0.1"
+        port: "389"
-      port: "389"
+        userSearchBase: ou=Users,dc=example,dc=com
-      userSearchBase: ou=Users,dc=example,dc=com
+        userFilter: sAMAccountName=%s
-      userFilter: sAMAccountName=%s
+        adminFilter: CN=Admin,CN=Group,DC=example,DC=com
-      adminFilter: CN=Admin,CN=Group,DC=example,DC=com
+        emailAttribute: mail
-      emailAttribute: mail
+        bindDn: CN=ldap read,OU=Spezial,DC=example,DC=com
-      bindDn: CN=ldap read,OU=Spezial,DC=example,DC=com
+        bindPassword: JustAnotherBindPw
-      bindPassword: JustAnotherBindPw
+        usernameAttribute: CN
-      usernameAttribute: CN
+        publicSSHKeyAttribute: publicSSHKey
      sshPublicKeyAttribute: sshPublicKey
 ```
 You can also use an existing secret to set the bindDn and bindPassword:
@ -405,10 +572,13 @@ stringData:
 ```yaml
 gitea:
    ldap:
-      existingSecret: gitea-ldap-secret
+      - existingSecret: gitea-ldap-secret
        ...
 ```
-:warning: Some options are just flags and therefore don't any values. If they are defined in `gitea.ldap` configuration, they will be passed to the gitea cli without any value. Affected options:
+:warning: Some options are just flags and therefore don't any values. If they
 are defined in `gitea.ldap` configuration, they will be passed to the Gitea cli
 without any value. Affected options:
 - notActive
 - skipTlsVerify
@ -418,14 +588,17 @@ gitea:
 ### OAuth2 Settings
-Like the admin user, OAuth2 settings can be updated and disabled but not deleted. Deleting OAuth2 settings has to be done in the ui.
+Like the admin user, OAuth2 settings can be updated and disabled but not
-All OAuth2 values from <https://docs.gitea.io/en-us/command-line/#admin> are available.
+deleted. Deleting OAuth2 settings has to be done in the ui. All OAuth2 values,
 which are documented [here](https://docs.gitea.io/en-us/command-line/#admin), are
 available.
 Multiple OAuth2 sources can be configured with additional OAuth list items.
 ```yaml
-  gitea:
+gitea:
-    oauth:
+  oauth:
-      enabled: true
+    - name: 'MyAwesomeGiteaOAuth'
      name: 'MyAwesomeGiteaOAuth'
      provider: 'openidConnect'
      key: 'hello'
      secret: 'world'
@ -437,11 +610,37 @@ All OAuth2 values from <https://docs.gitea.io/en-us/command-line/#admin> are ava
      #customEmailUrl:
 ```
 You can also use an existing secret to set the `key` and `secret`:
 ```yaml
 apiVersion: v1
 kind: Secret
 metadata:
  name: gitea-oauth-secret
 type: Opaque
 stringData:
  key: hello
  secret: world
 ```
 ```yaml
 gitea:
  oauth:
    - name: 'MyAwesomeGiteaOAuth'
      existingSecret: gitea-oauth-secret
        ...
 ```
 ### Metrics and profiling
-A Prometheus `/metrics` endpoint on the `HTTP_PORT` and `pprof` profiling endpoints on port 6060 can be enabled under `gitea`. Beware that the metrics endpoint is exposed via the ingress, manage access using ingress annotations for example.
+A Prometheus `/metrics` endpoint on the `HTTP_PORT` and `pprof` profiling
 endpoints on port 6060 can be enabled under `gitea`. Beware that the metrics
 endpoint is exposed via the ingress, manage access using ingress annotations for
 example.
-To deploy the `ServiceMonitor`, you first need to ensure that you have deployed `prometheus-operator` and its CRDs: https://github.com/prometheus-operator/prometheus-operator#customresourcedefinitions.
+To deploy the `ServiceMonitor`, you first need to ensure that you have deployed
 `prometheus-operator` and its
 [CRDs](https://github.com/prometheus-operator/prometheus-operator#customresourcedefinitions).
 ```yaml
 gitea:
@ -460,169 +659,218 @@ gitea:
 Annotations can be added to the Gitea pod.
 ```yaml
-  gitea:
+gitea:
-    podAnnotations: {}
+  podAnnotations: {}
 ```
 ## Configuration
 ### Others
-| Parameter                                 | Description                                            | Default     |
+| Parameter                                   | Description                                                          | Default |
-|-------------------------------------------|--------------------------------------------------------|-------------|
+| ------------------------------------------- | -------------------------------------------------------------------- | ------- |
-| statefulset.terminationGracePeriodSeconds | How long to wait until forcefully kill the pod         | 60          |
+| `statefulset.terminationGracePeriodSeconds` | How long to wait until forcefully kill the pod                       | `60`    |
-| statefulset.env                           | Additional environment variables to pass to containers | []          |
+| `statefulset.env`                           | Additional environment variables to pass to containers               | `[]`    |
-| extraVolumes                              | Additional volumes to mount to the Gitea statefulset   | {}          |
+| `extraVolumes`                              | Additional volumes to mount to the Gitea statefulset                 | `{}`    |
-| extraVolumeMounts                         | Additional volume mounts for the Gitea containers      | {}          |
+| `extraVolumeMounts`                         | Additional volume mounts for the Gitea containers                    | `{}`    |
-| initPreScript                             | Bash script copied verbatim to start of init container |             |
+| `initPreScript`                             | Bash script copied verbatim to start of init container               |         |
-| securityContext                           | Run as a specific securityContext                      | {}          |
+| `podSecurityContext.fsGroup`                | Set the shared file system group for all containers                  | 1000    |
-| schedulerName                             | Use an alternate scheduler, e.g. "stork"               |             |
+| `containerSecurityContext`                  | Run init and Gitea containers as a specific securityContext          | `{}`    |
 | `schedulerName`                             | Use an alternate scheduler, e.g. "stork"                             |         |
 ### Image
-| Parameter           | Description                       | Default                      |
+| Parameter          | Description                                                                               | Default       |
-|---------------------|-----------------------------------|------------------------------|
+| ------------------ | ----------------------------------------------------------------------------------------- | ------------- |
-|image.repository| Image to start for this pod | gitea/gitea |
+| `image.repository` | Image to start for this pod                                                               | `gitea/gitea` |
-|image.tag| [Image tag](https://hub.docker.com/r/gitea/gitea/tags?page=1&ordering=last_updated) | 1.14.3 |
+| `image.tag`        | [Image tag](https://hub.docker.com/r/gitea/gitea/tags?page=1&ordering=last_updated)       | `1.15.8`      |
-|image.pullPolicy| Image pull policy | Always |
+| `image.pullPolicy` | Image pull policy                                                                         | `Always`      |
-|image.rootless | Wether or not to pull the rootless version of gitea, only works on gitea 1.14.x or higher | false |
+| `image.rootless`   | Wether or not to pull the rootless version of Gitea, only works on Gitea 1.14.x or higher | `false`       |
 ### Persistence
-| Parameter           | Description                       | Default                      |
+| Parameter                   | Description                                                | Default |
-|---------------------|-----------------------------------|------------------------------|
+| --------------------------- | ---------------------------------------------------------- | ------- |
-|persistence.enabled| Enable persistence for Gitea |true|
+| `persistence.enabled`       | Enable persistence for Gitea                               | `true`  |
-|persistence.existingClaim| Use an existing claim to store repository information | |
+| `persistence.existingClaim` | Use an existing claim to store repository information      |         |
-|persistence.size| Size for persistence to store repo information | 10Gi |
+| `persistence.size`          | Size for persistence to store repo information             | `10Gi`  |
-|persistence.accessModes|AccessMode for persistence||
+| `persistence.accessModes`   | AccessMode for persistence                                 |         |
-|persistence.storageClass|Storage class for repository persistence||
+| `persistence.storageClass`  | Storage class for repository persistence                   |         |
-|persistence.labels|Labels for the persistence volume claim to be created|{}|
+| `persistence.subPath`       | Subdirectory of the volume to mount at                     |         |
-|persistence.annotations|Annotations for the persistence volume claim to be created|{}|
+| `persistence.labels`        | Labels for the persistence volume claim to be created      | `{}`    |
 | `persistence.annotations`   | Annotations for the persistence volume claim to be created | `{}`    |
 ### Ingress
-| Parameter           | Description                       | Default                      |
+| Parameter                            | Description                                                                  | Default                                            |
-|---------------------|-----------------------------------|------------------------------|
+| ------------------------------------ | ---------------------------------------------------------------------------- | -------------------------------------------------- |
-|ingress.enabled| enable ingress | false|
+| `ingress.enabled`                    | enable ingress                                                               | `false`                                            |
-|ingress.annotations| add ingress annotations | |
+| `ingress.annotations`                | add ingress annotations                                                      |                                                    |
-|ingress.hosts[0].host | add hosts for ingress | git.example.com |
+| `ingress.hosts[0].host`              | add hosts for ingress                                                        | `git.example.com`                                  |
-|ingress.hosts[0].paths[0].path | add path for each ingress host | / |
+| `ingress.hosts[0].paths[0].path`     | add path for each ingress host                                               | `/`                                                |
-|ingress.hosts[0].paths[0].pathType | add ingress path type | Prefix |
+| `ingress.hosts[0].paths[0].pathType` | add ingress path type                                                        | `Prefix`                                           |
-|ingress.tls|add ingress tls settings|[]|
+| `ingress.tls`                        | add ingress tls settings                                                     | `[]`                                               |
 | `ingress.className`                  | add ingress class name. Only used in k8s 1.19+                               |                                                    |
 | `ingress.apiVersion`                 | specify APIVersion of ingress object.  Mostly would only be used for argocd. | version indicated by helm's `Capabilities` object. |
 ### Service
 #### Web
-| Parameter           | Description                       | Default                      |
+| Parameter                               | Description                                                                                                  | Default     |
-|---------------------|-----------------------------------|------------------------------|
+| --------------------------------------- | ------------------------------------------------------------------------------------------------------------ | ----------- |
-|service.http.type| Kubernetes service type for web traffic | ClusterIP |
+| `service.http.type`                     | Kubernetes service type for web traffic                                                                      | `ClusterIP` |
-|service.http.port| Port for web traffic | 3000 |
+| `service.http.port`                     | Port for web traffic                                                                                         | `3000`      |
-|service.http.clusterIP| ClusterIP setting for http autosetup for statefulset is None | None |
+| `service.http.clusterIP`                | ClusterIP setting for http autosetup for statefulset is None                                                 | `None`      |
-|service.http.loadBalancerIP| LoadBalancer Ip setting | |
+| `service.http.loadBalancerIP`           | LoadBalancer Ip setting                                                                                      |             |
-|service.http.nodePort| NodePort for http service | |
+| `service.http.nodePort`                 | NodePort for http service                                                                                    |             |
-|service.http.externalTrafficPolicy| If `service.http.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable source IP preservation | |
+| `service.http.externalTrafficPolicy`    | If `service.http.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable source IP preservation |             |
-|service.http.externalIPs| http service external IP addresses | |
+| `service.http.externalIPs`              | http service external IP addresses                                                                           |             |
-|service.http.loadBalancerSourceRanges| Source range filter for http loadbalancer | [] |
+| `service.http.loadBalancerSourceRanges` | Source range filter for http loadbalancer                                                                    | `[]`        |
-|service.http.annotations| http service annotations | |
+| `service.http.annotations`              | http service annotations                                                                                     |             |
 #### SSH
-| Parameter           | Description                       | Default                      |
+| Parameter                              | Description                                                                                                 | Default     |
-|---------------------|-----------------------------------|------------------------------|
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------- |
-|service.ssh.type| Kubernetes service type for ssh traffic | ClusterIP |
+| `service.ssh.type`                     | Kubernetes service type for ssh traffic                                                                     | `ClusterIP` |
-|service.ssh.port| Port for ssh traffic | 22 |
+| `service.ssh.port`                     | Port for ssh traffic                                                                                        | `22`        |
-|service.ssh.loadBalancerIP| LoadBalancer Ip setting | |
+| `service.ssh.loadBalancerIP`           | LoadBalancer Ip setting                                                                                     |             |
-|service.ssh.nodePort| NodePort for ssh service | |
+| `service.ssh.nodePort`                 | NodePort for ssh service                                                                                    |             |
-|service.ssh.externalTrafficPolicy| If `service.ssh.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable source IP preservation | |
+| `service.ssh.externalTrafficPolicy`    | If `service.ssh.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable source IP preservation |             |
-|service.ssh.externalIPs| ssh service external IP addresses | |
+| `service.ssh.externalIPs`              | ssh service external IP addresses                                                                           |             |
-|service.ssh.loadBalancerSourceRanges| Source range filter for ssh loadbalancer | [] |
+| `service.ssh.loadBalancerSourceRanges` | Source range filter for ssh loadbalancer                                                                    | `[]`        |
-|service.ssh.annotations| ssh service annotations | |
+| `service.ssh.annotations`              | ssh service annotations                                                                                     |             |
 ### Gitea Configuration
-| Parameter           | Description                       | Default                      |
+| Parameter      | Description                                                                                          | Default |
-|---------------------|-----------------------------------|------------------------------|
+| -------------- | ---------------------------------------------------------------------------------------------------- | ------- |
-|gitea.config | Everything in `app.ini` can be configured with this dict. See [Examples](#examples) for more details | {} |
+| `gitea.config` | Everything in `app.ini` can be configured with this dict. See [Examples](#examples) for more details | `{}`    |
 ### Gitea Probes
-Configure Liveness, Readiness and Startup [Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+Configure Liveness, Readiness and Startup
 [Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/).
-| Parameter           | Description                       | Default                      |
+#### Liveness probe
-|---------------------|-----------------------------------|------------------------------|
+
-|gitea.livenessProbe.enabled | Enable liveness probe | true |
+- Default status: Enabled
-|gitea.livenessProbe.initialDelaySeconds | Delay before probe start| 200 |
+- Default action: tcp socket connect
-|gitea.livenessProbe.timeoutSeconds | probe timeout | 1 |
+
-|gitea.livenessProbe.periodSeconds | period between probes | 10 |
+| Parameter                                  | Description                                                          | Default |
-|gitea.livenessProbe.successThreshold | Minimum consecutive success probes | 1 |
+| ------------------------------------------ | -------------------------------------------------------------------- | ------- |
-|gitea.livenessProbe.failureThreshold | Minimum consecutive error probes | 10 |
+| `gitea.livenessProbe.initialDelaySeconds`  | Delay before probe start                                             | `200`   |
-|gitea.readinessProbe.enabled | Enable readiness probe | true |
+| `gitea.livenessProbe.timeoutSeconds`       | probe timeout                                                        | `1`     |
-|gitea.readinessProbe.initialDelaySeconds | Delay before probe start| 5 |
+| `gitea.livenessProbe.periodSeconds`        | period between probes                                                | `10`    |
-|gitea.readinessProbe.timeoutSeconds | probe timeout | 1 |
+| `gitea.livenessProbe.successThreshold`     | Minimum consecutive success probes                                   | `1`     |
-|gitea.readinessProbe.periodSeconds | period between probes | 10 |
+| `gitea.livenessProbe.failureThreshold`     | Minimum consecutive error probes                                     | `10`    |
-|gitea.readinessProbe.successThreshold | Minimum consecutive success probes | 1 |
+
-|gitea.readinessProbe.failureThreshold | Minimum consecutive error probes | 3 |
+#### Readiness probe
-|gitea.startupProbe.enabled | Enable startup probe | false |
+
-|gitea.startupProbe.initialDelaySeconds | Delay before probe start| 60 |
+- Default status: Enabled
-|gitea.startupProbe.timeoutSeconds | probe timeout | 1 |
+- Default action: tcp socket connect
-|gitea.startupProbe.periodSeconds | period between probes | 10 |
+
-|gitea.startupProbe.successThreshold | Minimum consecutive success probes | 1 |
+| Parameter                                  | Description                                                          | Default |
-|gitea.startupProbe.failureThreshold | Minimum consecutive error probes | 10 |
+| ------------------------------------------ | -------------------------------------------------------------------- | ------- |
-|gitea.customLivenessProbe | Custom liveness probe (needs `gitea.livenessProbe.enabled: false`) |  |
+| `gitea.readinessProbe.initialDelaySeconds` | Delay before probe start                                             | `5`     |
-|gitea.customReadinessProbe | Custom readiness probe (needs `gitea.readinessProbe.enabled: false`) |  |
+| `gitea.readinessProbe.timeoutSeconds`      | probe timeout                                                        | `1`     |
-|gitea.customStartupProbe | Custom startup probe (needs `gitea.startupProbe.enabled: false`) |  |
+| `gitea.readinessProbe.periodSeconds`       | period between probes                                                | `10`    |
 | `gitea.readinessProbe.successThreshold`    | Minimum consecutive success probes                                   | `1`     |
 | `gitea.readinessProbe.failureThreshold`    | Minimum consecutive error probes                                     | `3`     |
 #### Startup probe
 - Default status: Disabled
 - Default action: tcp socket connect
 | Parameter                                  | Description                                                          | Default |
 | ------------------------------------------ | -------------------------------------------------------------------- | ------- |
 | `gitea.startupProbe.initialDelaySeconds`   | Delay before probe start                                             | `60`    |
 | `gitea.startupProbe.timeoutSeconds`        | probe timeout                                                        | `1`     |
 | `gitea.startupProbe.periodSeconds`         | period between probes                                                | `10`    |
 | `gitea.startupProbe.successThreshold`      | Minimum consecutive success probes                                   | `1`     |
 | `gitea.startupProbe.failureThreshold`      | Minimum consecutive error probes                                     | `10`    |
 ### Memcached BuiltIn
-Memcached is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/memcached) if enabled in the values. Complete Configuration can be taken from their website.
+Memcached is loaded as a dependency from
 [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/memcached) if
 enabled in the values. Complete Configuration can be taken from their website.
 The following parameters are the defaults set by this chart
-| Parameter           | Description                       | Default                      |
+| Parameter                | Description                 | Default |
-|---------------------|-----------------------------------|------------------------------|
+| ------------------------ | --------------------------- | ------- |
-|memcached.service.port|Memcached Port| 11211|
+| `memcached.service.port` | Memcached Port              | 11211   |
 | `memcached.enabled`      | Enable Memcached dependency | `true`  |
-### Mysql BuiltIn
+### MySQL BuiltIn
-Mysql is loaded as a dependency from stable. Configuration can be found on this [website](https://github.com/helm/charts/tree/master/stable/mysql).
+MySQL is loaded as a dependency from stable. Configuration can be found on this
 [website](https://github.com/helm/charts/tree/master/stable/mysql).
 The following parameters are the defaults set by this chart
-| Parameter           | Description                       | Default                      |
+| Parameter                | Description                                                        | Default |
-|---------------------|-----------------------------------|------------------------------|
+| ------------------------ | ------------------------------------------------------------------ | ------- |
-|mysql.root.password|Password for the root user. Ignored if existing secret is provided|gitea|
+| `mysql.root.password`    | Password for the root user. Ignored if existing secret is provided | `gitea` |
-|mysql.db.user|Username of new user to create.|gitea|
+| `mysql.db.user`          | Username of new user to create.                                    | `gitea` |
-|mysql.db.password|Password for the new user. Ignored if existing secret is provided|gitea|
+| `mysql.db.password`      | Password for the new user. Ignored if existing secret is provided  | `gitea` |
-|mysql.db.name|Name for new database to create.|gitea|
+| `mysql.db.name`          | Name for new database to create.                                   | `gitea` |
-|mysql.service.port|Port to connect to mysql service|3306|
+| `mysql.service.port`     | Port to connect to MySQL service                                   | `3306`  |
-|mysql.persistence.size|Persistence size for mysql |10Gi|
+| `mysql.persistence.size` | Persistence size for MySQL                                         | `10Gi`  |
 | `mysql.enabled`          | Enable MySQL dependency                                            | `false` |
-### Postgresql BuiltIn
+### PostgreSQL BuiltIn
-Postgresql is loaded as a dependency from Bitnami. The chart configuration can be found in this [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) repository.
+PostgreSQL is loaded as a dependency from Bitnami. The chart configuration can
 be found in this
 [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql)
 repository.
 The following parameters are the defaults set by this chart
-| Parameter           | Description                       | Default                      |
+| Parameter                                         | Description                                              | Default |
-|---------------------|-----------------------------------|------------------------------|
+| ------------------------------------------------- | -------------------------------------------------------- | ------- |
-|postgresql.global.postgresql.postgresqlDatabase| PostgreSQL database (overrides postgresqlDatabase)|gitea|
+| `postgresql.global.postgresql.postgresqlDatabase` | PostgreSQL database (overrides postgresqlDatabase)       | `gitea` |
-|postgresql.global.postgresql.postgresqlUsername| PostgreSQL username (overrides postgresqlUsername)|gitea|
+| `postgresql.global.postgresql.postgresqlUsername` | PostgreSQL username (overrides postgresqlUsername)       | `gitea` |
-|postgresql.global.postgresql.postgresqlPassword| PostgreSQL admin password (overrides postgresqlPassword)|gitea|
+| `postgresql.global.postgresql.postgresqlPassword` | PostgreSQL admin password (overrides postgresqlPassword) | `gitea` |
-|postgresql.global.postgresql.servicePort|PostgreSQL port (overrides service.port)|5432|
+| `postgresql.global.postgresql.servicePort`        | PostgreSQL port (overrides service.port)                 | `5432`  |
-|postgresql.persistence.size| PVC Storage Request for PostgreSQL volume |10Gi|
+| `postgresql.persistence.size`                     | PVC Storage Request for PostgreSQL volume                | `10Gi`  |
 | `postgresql.enabled`                              | Enable PostgreSQL dependency                             | `true`  |
 ### MariaDB BuiltIn
-MariaDB is loaded as a dependency from bitnami. Configuration can be found in this [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) repository.
+MariaDB is loaded as a dependency from bitnami. Configuration can be found in
 this [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/mariadb)
 repository.
 The following parameters are the defaults set by this chart
-| Parameter           | Description                       | Default                      |
+| Parameter                          | Description                                                       | Default |
-|---------------------|-----------------------------------|------------------------------|
+| ---------------------------------- | ----------------------------------------------------------------- | ------- |
-|mariadb.auth.username|Username of new user to create.|gitea|
+| `mariadb.auth.username`            | Username of new user to create.                                   | `gitea` |
-|mariadb.auth.password|Password for the new user. Ignored if existing secret is provided|gitea|
+| `mariadb.auth.password`            | Password for the new user. Ignored if existing secret is provided | `gitea` |
-|mariadb.auth.database|Name for new database to create.|gitea|
+| `mariadb.auth.database`            | Name for new database to create.                                  | `gitea` |
-|mariadb.auth.rootPassword|Password for the root user.|gitea|
+| `mariadb.auth.rootPassword`        | Password for the root user.                                       | `gitea` |
-|mariadb.primary.service.port|Port to connect to mariadb service|3306|
+| `mariadb.primary.service.port`     | Port to connect to MariaDB service                                | `3306`  |
-|mariadb.primary.persistence.size|Persistence size for mariadb |10Gi|
+| `mariadb.primary.persistence.size` | Persistence size for MariaDB                                      | `10Gi`  |
 | `mariadb.enabled`                  | Enable MariaDB dependency                                         | `false` |
 ## Local development & testing
 For local development and testing of pull requests, the following workflow can
 be used:
 1. Install `minikube` and `helm`.
 2. Start a `minikube` cluster via `minikube start`.
 3. From the `gitea/helm-chart` directory execute the following command. This
   will install the dependencies listed in `Chart.yml` and deploy the current
   state of the helm chart found locally. If you want to test a branch, make
   sure to switch to the respective branch first.
  `helm install --dependency-update gitea . -f values.yaml`.
 4. Gitea is now deployed in `minikube`. To access it, it's port needs to be
   forwarded first from `minikube` to localhost first via `kubectl --namespace
   default port-forward svc/gitea-http 3000:3000`. Now Gitea is accessible at
   [http://localhost:3000](http://localhost:3000).
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@ -64,11 +64,11 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- define "db.servicename" -}}
-{{- if .Values.gitea.database.builtIn.postgresql.enabled -}}
+{{- if .Values.postgresql.enabled -}}
 {{- printf "%s-postgresql" .Release.Name -}}
-{{- else if .Values.gitea.database.builtIn.mysql.enabled -}}
+{{- else if .Values.mysql.enabled -}}
 {{- printf "%s-mysql" .Release.Name -}}
-{{- else if .Values.gitea.database.builtIn.mariadb.enabled -}}
+{{- else if .Values.mariadb.enabled -}}
 {{- printf "%s-mariadb" .Release.Name -}}
 {{- else if ne .Values.gitea.config.database.DB_TYPE "sqlite3" -}}
 {{- $parts := split ":" .Values.gitea.config.database.HOST -}}
@ -77,11 +77,11 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- define "db.port" -}}
-{{- if .Values.gitea.database.builtIn.postgresql.enabled -}}
+{{- if .Values.postgresql.enabled -}}
 {{ .Values.postgresql.global.postgresql.servicePort }}
-{{- else if .Values.gitea.database.builtIn.mysql.enabled -}}
+{{- else if .Values.mysql.enabled -}}
 {{ .Values.mysql.service.port }}
-{{- else if .Values.gitea.database.builtIn.mariadb.enabled -}}
+{{- else if .Values.mariadb.enabled -}}
 {{ .Values.mariadb.primary.service.port }}
 {{- else -}}
 {{- end -}}
@ -108,21 +108,24 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- define "gitea.ldap_settings" -}}
-{{- if not (hasKey .Values.gitea.ldap "bindDn") -}}
+{{- $idx := index . 0 }}
-{{- $_ := set .Values.gitea.ldap "bindDn" "" -}}
+{{- $values := index . 1 }}
 {{- if not (hasKey $values "bindDn") -}}
 {{- $_ := set $values "bindDn" "" -}}
 {{- end -}}
-{{- if not (hasKey .Values.gitea.ldap "bindPassword") -}}
+{{- if not (hasKey $values "bindPassword") -}}
-{{- $_ := set .Values.gitea.ldap "bindPassword" "" -}}
+{{- $_ := set $values "bindPassword" "" -}}
 {{- end -}}
 {{- $flags := list "notActive" "skipTlsVerify" "allowDeactivateAll" "synchronizeUsers" "attributesInBind" -}}
-{{- range $key, $val := .Values.gitea.ldap -}}
+{{- range $key, $val := $values -}}
 {{- if and (ne $key "enabled") (ne $key "existingSecret") -}}
 {{- if eq $key "bindDn" -}}
-{{- printf "--%s %s " ($key | kebabcase) ("${GITEA_LDAP_BIND_DN}" | quote ) -}}
+{{- printf "--%s \"${GITEA_LDAP_BIND_DN_%d}\" " ($key | kebabcase) ($idx) -}}
 {{- else if eq $key "bindPassword" -}}
-{{- printf "--%s %s " ($key | kebabcase) ("${GITEA_LDAP_PASSWORD}" | quote ) -}}
+{{- printf "--%s \"${GITEA_LDAP_PASSWORD_%d}\" " ($key | kebabcase) ($idx) -}}
 {{- else if eq $key "port" -}}
 {{- printf "--%s %d " $key ($val | int) -}}
 {{- else if has $key $flags -}}
@ -135,9 +138,174 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- define "gitea.oauth_settings" -}}
-{{- range $key, $val := .Values.gitea.oauth -}}
+{{- $idx := index . 0 }}
-{{- if ne $key "enabled" -}}
+{{- $values := index . 1 }}
-{{- printf "--%s %s " ($key | kebabcase) ($val | squote) -}}
+
 {{- if not (hasKey $values "key") -}}
 {{- $_ := set $values "key" (printf "${GITEA_OAUTH_KEY_%d}" $idx) -}}
 {{- end -}}
 {{- if not (hasKey $values "secret") -}}
 {{- $_ := set $values "secret" (printf "${GITEA_OAUTH_SECRET_%d}" $idx) -}}
 {{- end -}}
 {{- range $key, $val := $values -}}
 {{- if ne $key "existingSecret" -}}
 {{- printf "--%s %s " ($key | kebabcase) ($val | quote) -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
 {{- define "gitea.inline_configuration" -}}
  {{- include "gitea.inline_configuration.init" . -}}
  {{- include "gitea.inline_configuration.defaults" . -}}
  {{- $generals := list -}}
  {{- $inlines := dict -}}
  {{- range $key, $value := .Values.gitea.config  }}
    {{- if kindIs "map" $value }}
      {{- if gt (len $value) 0 }}
        {{- $section := default list (get $inlines $key) -}}
        {{- range $n_key, $n_value := $value }}
          {{- $section = append $section (printf "%s=%v" $n_key $n_value) -}}
        {{- end }}
        {{- $_ := set $inlines $key (join "\n" $section) -}}
      {{- end -}}
    {{- else }}
      {{- if or (eq $key "APP_NAME") (eq $key "RUN_USER") (eq $key "RUN_MODE") -}}
        {{- $generals = append $generals (printf "%s=%s" $key $value) -}}
      {{- else -}}
        {{- (printf "Key %s cannot be on top level of configuration" $key) | fail -}}
      {{- end -}}
    {{- end }}
  {{- end }}
  {{- $_ := set $inlines "_generals_" (join "\n" $generals) -}}
  {{- toYaml $inlines -}}
 {{- end -}}
 {{- define "gitea.inline_configuration.init" -}}
  {{- if not (hasKey .Values.gitea.config "cache") -}}
    {{- $_ := set .Values.gitea.config "cache" dict -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config "server") -}}
    {{- $_ := set .Values.gitea.config "server" dict -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config "metrics") -}}
    {{- $_ := set .Values.gitea.config "metrics" dict -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config "database") -}}
    {{- $_ := set .Values.gitea.config "database" dict -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config "security") -}}
    {{- $_ := set .Values.gitea.config "security" dict -}}
  {{- end -}}
  {{- if not .Values.gitea.config.repository -}}
    {{- $_ := set .Values.gitea.config "repository" dict -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config "oauth2") -}}
    {{- $_ := set .Values.gitea.config "oauth2" dict -}}
  {{- end -}}
 {{- end -}}
 {{- define "gitea.inline_configuration.defaults" -}}
  {{- include "gitea.inline_configuration.defaults.server" . -}}
  {{- include "gitea.inline_configuration.defaults.database" . -}}
  {{- if not .Values.gitea.config.repository.ROOT -}}
    {{- $_ := set .Values.gitea.config.repository "ROOT" "/data/git/gitea-repositories" -}}
  {{- end -}}
  {{- if not .Values.gitea.config.security.INSTALL_LOCK -}}
    {{- $_ := set .Values.gitea.config.security "INSTALL_LOCK" "true" -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config.metrics "ENABLED") -}}
    {{- $_ := set .Values.gitea.config.metrics "ENABLED" .Values.gitea.metrics.enabled -}}
  {{- end -}}
  {{- if .Values.memcached.enabled -}}
    {{- $_ := set .Values.gitea.config.cache "ENABLED" "true" -}}
    {{- $_ := set .Values.gitea.config.cache "ADAPTER" "memcache" -}}
    {{- if not (.Values.gitea.config.cache.HOST) -}}
      {{- $_ := set .Values.gitea.config.cache "HOST" (include "memcached.dns" .) -}}
    {{- end -}}
  {{- end -}}
 {{- end -}}
 {{- define "gitea.inline_configuration.defaults.server" -}}
  {{- if not (hasKey .Values.gitea.config.server "HTTP_PORT") -}}
    {{- $_ := set .Values.gitea.config.server "HTTP_PORT" .Values.service.http.port -}}
  {{- end -}}
  {{- if not .Values.gitea.config.server.PROTOCOL -}}
    {{- $_ := set .Values.gitea.config.server "PROTOCOL" "http" -}}
  {{- end -}}
  {{- if not (.Values.gitea.config.server.DOMAIN) -}}
    {{- if gt (len .Values.ingress.hosts) 0 -}}
      {{- $_ := set .Values.gitea.config.server "DOMAIN" (index .Values.ingress.hosts 0).host -}}
    {{- else -}}
      {{- $_ := set .Values.gitea.config.server "DOMAIN" (include "gitea.default_domain" .) -}}
    {{- end -}}
  {{- end -}}
  {{- if not .Values.gitea.config.server.ROOT_URL -}}
    {{- if .Values.ingress.enabled -}}
      {{- if gt (len .Values.ingress.tls) 0 -}}
        {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL (index (index .Values.ingress.tls 0).hosts 0)) -}}
      {{- else -}}
        {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL (index .Values.ingress.hosts 0).host) -}}
      {{- end -}}
    {{- else -}}
      {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL .Values.gitea.config.server.DOMAIN) -}}
    {{- end -}}
  {{- end -}}
  {{- if not .Values.gitea.config.server.SSH_DOMAIN -}}
    {{- $_ := set .Values.gitea.config.server "SSH_DOMAIN" .Values.gitea.config.server.DOMAIN -}}
  {{- end -}}
  {{- if not .Values.gitea.config.server.SSH_PORT -}}
    {{- $_ := set .Values.gitea.config.server "SSH_PORT" .Values.service.ssh.port -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config.server "SSH_LISTEN_PORT") -}}
    {{- if not .Values.image.rootless -}}
      {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" .Values.gitea.config.server.SSH_PORT -}}
    {{- else -}}
      {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" "2222" -}}
    {{- end -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config.server "START_SSH_SERVER") -}}
    {{- if .Values.image.rootless -}}
      {{- $_ := set .Values.gitea.config.server "START_SSH_SERVER" "true" -}}
    {{- end -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config.server "APP_DATA_PATH") -}}
    {{- $_ := set .Values.gitea.config.server "APP_DATA_PATH" "/data" -}}
  {{- end -}}
  {{- if not (hasKey .Values.gitea.config.server "ENABLE_PPROF") -}}
    {{- $_ := set .Values.gitea.config.server "ENABLE_PPROF" false -}}
  {{- end -}}
 {{- end -}}
 {{- define "gitea.inline_configuration.defaults.database" -}}
  {{- if .Values.postgresql.enabled -}}
    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "postgres" -}}
    {{- if not (.Values.gitea.config.database.HOST) -}}
      {{- $_ := set .Values.gitea.config.database "HOST"      (include "postgresql.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.postgresql.global.postgresql.postgresqlDatabase -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.postgresql.global.postgresql.postgresqlUsername -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.postgresql.global.postgresql.postgresqlPassword -}}
  {{- else if .Values.mysql.enabled -}}
    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "mysql" -}}
    {{- if not (.Values.gitea.config.database.HOST) -}}
      {{- $_ := set .Values.gitea.config.database "HOST"      (include "mysql.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.mysql.db.name -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.mysql.db.user -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.mysql.db.password -}}
  {{- else if .Values.mariadb.enabled -}}
    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "mysql" -}}
    {{- if not (.Values.gitea.config.database.HOST) -}}
      {{- $_ := set .Values.gitea.config.database "HOST"      (include "mariadb.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.mariadb.auth.database -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.mariadb.auth.username -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.mariadb.auth.password -}}
  {{- end -}}
 {{- end -}}
--- a/templates/gitea/config.yaml
+++ b/templates/gitea/config.yaml
@ -1,148 +1,127 @@
 apiVersion: v1
 kind: Secret
 metadata:
  name: {{ include "gitea.fullname" . }}-inline-config
  labels:
    {{- include "gitea.labels" . | nindent 4 }}
 type: Opaque
 stringData:
  {{- include "gitea.inline_configuration" . | nindent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
  name: {{ include "gitea.fullname" . }}
  labels:
    {{- include "gitea.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  app.ini: |-
+  config_environment.sh: |-
-    {{- if not (hasKey .Values.gitea.config "cache") -}}
+    #!/usr/bin/env bash
-    {{- $_ := set .Values.gitea.config "cache" dict -}}
+    set -euo pipefail
    {{- end -}}
-    {{- if not (hasKey .Values.gitea.config "server") -}}
+    function env2ini::log() {
-    {{- $_ := set .Values.gitea.config "server" dict -}}
+      printf "${1}\n"
-    {{- end -}}
+    }
-    {{- if not (hasKey .Values.gitea.config "metrics") -}}
+    function env2ini::read_config_to_env() {
-    {{- $_ := set .Values.gitea.config "metrics" dict -}}
+      local section="${1}"
-    {{- end -}}
+      local line="${2}"
-    {{- if not (hasKey .Values.gitea.config "database") -}}
+      if [[ -z "${line}" ]]; then
-    {{- $_ := set .Values.gitea.config "database" dict -}}
+        # skip empty line
-    {{- end -}}
+        return
      fi
      # 'xargs echo -n' trims all leading/trailing whitespaces and a trailing new line
      local setting="$(awk -F '=' '{print $1}' <<< "${line}" | xargs echo -n)"
-    {{- if not (hasKey .Values.gitea.config "security") -}}
+      if [[ -z "${setting}" ]]; then
-    {{- $_ := set .Values.gitea.config "security" dict -}}
+        env2ini::log '  ! invalid setting'
-    {{- end -}}
+        exit 1
      fi
-    {{- if not .Values.gitea.config.repository -}}
+      local value=''
-    {{- $_ := set .Values.gitea.config "repository" dict -}}
+      local regex="^${setting}(\s*)=(\s*)(.*)"
-    {{- end -}}
+      if [[ $line =~ $regex ]]; then
        value="${BASH_REMATCH[3]}"
      else
        env2ini::log '  ! invalid setting'
        exit 1
      fi
-    {{- /* repository default settings */ -}}
+      env2ini::log "    + '${setting}'"
    {{- if not .Values.gitea.config.repository.ROOT -}}
    {{- $_ := set .Values.gitea.config.repository "ROOT" "/data/git/gitea-repositories" -}}
    {{- end -}}
-    {{- /* security default settings */ -}}
+      if [[ -z "${section}" ]]; then
-    {{- if not .Values.gitea.config.security.INSTALL_LOCK -}}
+        export "ENV_TO_INI____${setting^^}=${value}"                           # '^^' makes the variable content uppercase
-    {{- $_ := set .Values.gitea.config.security "INSTALL_LOCK" "true" -}}
+        return
-    {{- end -}}
+      fi
-    {{- /* server default settings */ -}}
+      local masked_section="${section//./_0X2E_}"                            # '//' instructs to replace all matches
-    {{- if not (hasKey .Values.gitea.config.server "HTTP_PORT") -}}
+      masked_section="${masked_section//-/_0X2D_}"
    {{- $_ := set .Values.gitea.config.server "HTTP_PORT" .Values.service.http.port -}}
    {{- end -}}
    {{- if not .Values.gitea.config.server.PROTOCOL -}}
    {{- $_ := set .Values.gitea.config.server "PROTOCOL" "http" -}}
    {{- end -}}
    {{- if not (.Values.gitea.config.server.DOMAIN) -}}
    {{- if gt (len .Values.ingress.hosts) 0 -}}
    {{- $_ := set .Values.gitea.config.server "DOMAIN" (index .Values.ingress.hosts 0).host -}}
    {{- else -}}
    {{- $_ := set .Values.gitea.config.server "DOMAIN" (include "gitea.default_domain" .) -}}
    {{- end -}}
    {{- end -}}
    {{- if not .Values.gitea.config.server.ROOT_URL -}}
    {{- if .Values.ingress.enabled -}}
    {{- if gt (len .Values.ingress.tls) 0 -}}
    {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL (index (index .Values.ingress.tls 0).hosts 0)) -}}
    {{- else -}}
    {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL (index .Values.ingress.hosts 0).host) -}}
    {{- end -}}
    {{- else -}}
    {{- $_ := set .Values.gitea.config.server "ROOT_URL" (printf "%s://%s" .Values.gitea.config.server.PROTOCOL .Values.gitea.config.server.DOMAIN) -}}
    {{- end -}}
    {{- end -}}
    {{- if not .Values.gitea.config.server.SSH_DOMAIN -}}
    {{- $_ := set .Values.gitea.config.server "SSH_DOMAIN" .Values.gitea.config.server.DOMAIN -}}
    {{- end -}}
    {{- if not .Values.gitea.config.server.SSH_PORT -}}
    {{- $_ := set .Values.gitea.config.server "SSH_PORT" .Values.service.ssh.port -}}
    {{- end -}}
    {{- if not (hasKey .Values.gitea.config.server "SSH_LISTEN_PORT") -}}
    {{- if not .Values.image.rootless -}}
    {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" .Values.gitea.config.server.SSH_PORT -}}
    {{- else -}}
    {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" "2222" -}}
    {{- end -}}
    {{- end -}}
    {{- if not (hasKey .Values.gitea.config.server "START_SSH_SERVER") -}}
    {{- if .Values.image.rootless -}}
    {{- $_ := set .Values.gitea.config.server "START_SSH_SERVER" "true" -}}
    {{- end -}}
    {{- end -}}
    {{- if not (hasKey .Values.gitea.config.server "APP_DATA_PATH") -}}
    {{- $_ := set .Values.gitea.config.server "APP_DATA_PATH" "/data" -}}
    {{- end -}}
    {{- if not (hasKey .Values.gitea.config.server "ENABLE_PPROF") -}}
    {{- $_ := set .Values.gitea.config.server "ENABLE_PPROF" false -}}
    {{- end -}}
-    {{- /* metrics default settings */ -}}
+      export "ENV_TO_INI__${masked_section^^}__${setting^^}=${value}"        # '^^' makes the variable content uppercase
-    {{- if not (hasKey .Values.gitea.config.metrics "ENABLED") -}}
+    }
    {{- $_ := set .Values.gitea.config.metrics "ENABLED" .Values.gitea.metrics.enabled -}}
    {{- end -}}
-    {{- /* database default settings */ -}}
+    function env2ini::process_config_file() {
-    {{- if .Values.gitea.database.builtIn.postgresql.enabled -}}
+      local config_file="${1}"
-    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "postgres" -}}
+      local section="$(basename "${config_file}")"
    {{- if not (.Values.gitea.config.database.HOST) -}}
    {{- $_ := set .Values.gitea.config.database "HOST"      (include "postgresql.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.postgresql.global.postgresql.postgresqlDatabase -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.postgresql.global.postgresql.postgresqlUsername -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.postgresql.global.postgresql.postgresqlPassword -}}
    {{ else if .Values.gitea.database.builtIn.mysql.enabled -}}
    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "mysql" -}}
    {{- if not (.Values.gitea.config.database.HOST) -}}
    {{- $_ := set .Values.gitea.config.database "HOST"      (include "mysql.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.mysql.db.name -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.mysql.db.user -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.mysql.db.password -}}
    {{ else if .Values.gitea.database.builtIn.mariadb.enabled -}}
    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "mysql" -}}
    {{- if not (.Values.gitea.config.database.HOST) -}}
    {{- $_ := set .Values.gitea.config.database "HOST"      (include "mariadb.dns" .) -}}
    {{- end -}}
    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.mariadb.auth.database -}}
    {{- $_ := set .Values.gitea.config.database "USER"      .Values.mariadb.auth.username -}}
    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.mariadb.auth.password -}}
    {{- end -}}
-    {{- /* cache default settings */ -}}
+      if [[ $section == '_generals_' ]]; then
-    {{- if .Values.gitea.cache.builtIn.enabled -}}
+        env2ini::log "  [ini root]"
-    {{- $_ := set .Values.gitea.config.cache "ENABLED" "true" -}}
+        section=''
-    {{- $_ := set .Values.gitea.config.cache "ADAPTER" "memcache" -}}
+      else
-    {{- if not (.Values.gitea.config.cache.HOST) -}}
+        env2ini::log "  ${section}"
-    {{- $_ := set .Values.gitea.config.cache "HOST" (include "memcached.dns" .) -}}
+      fi
    {{- end -}}
    {{- end -}}
-    {{- /* autogenerate app.ini */ -}}
+      while read -r line; do
-    {{- range $key, $value := .Values.gitea.config  }}
+        env2ini::read_config_to_env "${section}" "${line}"
-    {{- if kindIs "map" $value }}
+      done < <(awk 1 "${config_file}")                             # Helm .toYaml trims the trailing new line which breaks line processing; awk 1 ... adds it back while reading
-    {{- if gt (len $value) 0 }}
+    }
-    [{{ $key }}]
+    function env2ini::load_config_sources() {
-    {{- range $n_key, $n_value := $value }}
+      local path="${1}"
-    {{ $n_key | upper }} = {{ $n_value }}
+
-    {{- end }}
+      env2ini::log "Processing $(basename "${path}")..."
-    {{- end }}
+
-    {{- else }}
+      while read -d '' configFile; do
-    {{ $key | upper }} = {{ $value }}
+        env2ini::process_config_file "${configFile}"
-    {{- end }}
+      done < <(find "${path}" -type l -not -name '..data' -print0)
-    {{- end }}
+
      env2ini::log "\n"
    }
    function env2ini::generate_initial_secrets() {
      # These environment variables will either be
      #   - overwritten with user defined values,
      #   - initially used to set up Gitea
      # Anyway, they won't harm existing app.ini files
      export ENV_TO_INI__SECURITY__INTERNAL_TOKEN=$(gitea generate secret INTERNAL_TOKEN)
      export ENV_TO_INI__SECURITY__SECRET_KEY=$(gitea generate secret SECRET_KEY)
      export ENV_TO_INI__OAUTH2__JWT_SECRET=$(gitea generate secret JWT_SECRET)
      env2ini::log "...Initial secrets generated\n"
    }
    # MUST BE CALLED BEFORE OTHER CONFIGURATION
    env2ini::generate_initial_secrets
    env2ini::load_config_sources '/env-to-ini-mounts/inlines/'
    env2ini::load_config_sources '/env-to-ini-mounts/additionals/'
    env2ini::log "=== All configuration sources loaded ===\n"
    # safety to prevent rewrite of secret keys if an app.ini already exists
    if [ -f ${GITEA_APP_INI} ]; then
      env2ini::log 'An app.ini file already exists. To prevent overwriting secret keys, these settings are dropped and remain unchanged:'
      env2ini::log '  - security.INTERNAL_TOKEN'
      env2ini::log '  - security.SECRET_KEY'
      env2ini::log '  - oauth2.JWT_SECRET'
      unset ENV_TO_INI__SECURITY__INTERNAL_TOKEN
      unset ENV_TO_INI__SECURITY__SECRET_KEY
      unset ENV_TO_INI__OAUTH2__JWT_SECRET
    fi
    environment-to-ini -o $GITEA_APP_INI -p ENV_TO_INI
--- a/templates/gitea/deprecation.yaml
+++ b/templates/gitea/deprecation.yaml
@ -0,0 +1,34 @@
 {{- if .Values.checkDeprecation -}}
  {{/* CUSTOM PROBES */}}
  {{- if .Values.gitea.customLivenessProbe -}}
    {{- fail "`gitea.customLivenessProbe` does no longer exist. Please refer to the changelog and configure `gitea.livenessProbe` instead." -}}
  {{- end -}}
  {{- if .Values.gitea.customReadinessProbe -}}
    {{- fail "`gitea.customReadinessProbe` does no longer exist. Please refer to the changelog and configure `gitea.readinessProbe` instead." -}}
  {{- end -}}
  {{- if .Values.gitea.customStartupProbe -}}
    {{- fail "`gitea.customStartupProbe` does no longer exist. Please refer to the changelog and configure `gitea.startupProbe` instead." -}}
  {{- end -}}
  {{/* LDAP SOURCES */}}
  {{- if kindIs "map" .Values.gitea.ldap -}}
    {{- fail "You can configure multiple LDAP sources. Please refer to the changelog and switch `gitea.ldap` from object to array notation." -}}
  {{- end -}}
  {{/* OAUTH SOURCES */}}
  {{- if kindIs "map" .Values.gitea.oauth -}}
    {{- fail "You can configure multiple OAuth sources. Please refer to the changelog and switch `gitea.oauth` from object to array notation." -}}
  {{- end -}}
  {{/* BUILTIN */}}
  {{- if .Values.gitea.cache -}}
    {{- if .Values.gitea.cache.builtIn -}}
      {{- fail "`gitea.cache.builtIn` does no longer exist. Please use `memcached` at root level instead." -}}
    {{- end -}}
  {{- end -}}
  {{- if .Values.gitea.database -}}
    {{- if .Values.gitea.database.builtIn -}}
      {{- fail "`gitea.database.builtIn` does no longer exist. Builtin databases can be configured inside the dependencies itself. Please refer to the changelog." -}}
    {{- end -}}
  {{- end -}}
 {{- end -}}
--- a/templates/gitea/ingress.yaml
+++ b/templates/gitea/ingress.yaml
@ -1,13 +1,15 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "gitea.fullname" . -}}
 {{- $httpPort := .Values.service.http.port -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $apiVersion := "extensions/v1beta1" -}}
-apiVersion: networking.k8s.io/v1
+{{- if .Values.ingress.apiVersion -}}
 {{- $apiVersion = .Values.ingress.apiVersion -}}
 {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
 {{- $apiVersion = "networking.k8s.io/v1" }}
 {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
-apiVersion: networking.k8s.io/v1beta1
+{{- $apiVersion = "networking.k8s.io/v1beta1" }}
 {{- else -}}
 apiVersion: extensions/v1beta1
 {{- end }}
 apiVersion: {{ $apiVersion }}
 kind: Ingress
 metadata:
  name: {{ $fullName }}
@ -18,6 +20,9 @@ metadata:
    {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
 {{- if .Values.ingress.className }}
  ingressClassName: {{ .Values.ingress.className }}
 {{- end }}
 {{- if .Values.ingress.tls }}
  tls:
  {{- range .Values.ingress.tls }}
@ -35,11 +40,11 @@ spec:
        paths:
          {{- range .paths }}
          - path: {{ .path }}
-            {{- if and .pathType ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") }}
+            {{- if and .pathType (eq $apiVersion "networking.k8s.io/v1") }}
            pathType: {{ .pathType }}
            {{- end }}
            backend:
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if eq $apiVersion "networking.k8s.io/v1" }}
              service:
                name: {{ $fullName }}-http
                port:
--- a/templates/gitea/init.yaml
+++ b/templates/gitea/init.yaml
@ -26,16 +26,15 @@ stringData:
    {{- end }}
    mkdir -p /data/git/.ssh
    chmod -R 700 /data/git/.ssh
-    mkdir -p /data/gitea/conf
+    [ ! -d /data/gitea ] && mkdir -p /data/gitea/conf
    # prepare temp directory structure
    mkdir -p "${GITEA_TEMP}"
    {{- if not .Values.image.rootless }}
    chown 1000:1000 "${GITEA_TEMP}"
    {{- end }}
    chmod ug+rwx "${GITEA_TEMP}"
    # Copy config file to writable volume
    cp /etc/gitea/conf/app.ini /data/gitea/conf/app.ini
    chmod a+rwx /data/gitea/conf/app.ini
  configure_gitea.sh: |-
    #!/usr/bin/env bash
@ -84,42 +83,50 @@ stringData:
    configure_admin_user
    {{- end }}
    {{- if .Values.gitea.ldap.enabled }}
    function configure_ldap() {
-      local LDAP_NAME={{ (printf "%s" .Values.gitea.ldap.name) | squote }}
+      {{- if .Values.gitea.ldap }}
      {{- range $idx, $value := .Values.gitea.ldap }}
      local LDAP_NAME={{ (printf "%s" $value.name) | squote }}
      local GITEA_AUTH_ID=$(gitea admin auth list --vertical-bars | grep -E "\|${LDAP_NAME}\s+\|" | grep -iE '\|LDAP \(via BindDN\)\s+\|' | awk -F " "  "{print \$1}")
      if [[ -z "${GITEA_AUTH_ID}" ]]; then
        echo "No ldap configuration found with name '${LDAP_NAME}'. Installing it now..."
-        gitea admin auth add-ldap {{- include "gitea.ldap_settings" . | indent 1 }}
+        gitea admin auth add-ldap {{- include "gitea.ldap_settings" (list $idx $value) | indent 1 }}
        echo '...installed.'
      else
        echo "Existing ldap configuration with name '${LDAP_NAME}': '${GITEA_AUTH_ID}'. Running update to sync settings..."
-        gitea admin auth update-ldap --id "${GITEA_AUTH_ID}" {{- include "gitea.ldap_settings" . | indent 1 }}
+        gitea admin auth update-ldap --id "${GITEA_AUTH_ID}" {{- include "gitea.ldap_settings" (list $idx $value) | indent 1 }}
        echo '...sync settings done.'
      fi
      {{- end }}
      {{- else }}
        echo 'no ldap configuration... skipping.'
      {{- end }}
    }
    configure_ldap
    {{- end }}
    {{- if .Values.gitea.oauth.enabled }}
    function configure_oauth() {
-      local OAUTH_NAME={{ (printf "%s" .Values.gitea.oauth.name) | squote }}
+      {{- if .Values.gitea.oauth }}
      {{- range $idx, $value := .Values.gitea.oauth }}
      local OAUTH_NAME={{ (printf "%s" $value.name) | squote }}
      local AUTH_ID=$(gitea admin auth list --vertical-bars | grep -E "\|${OAUTH_NAME}\s+\|" | grep -iE '\|OAuth2\s+\|' | awk -F " "  "{print \$1}")
      if [[ -z "${AUTH_ID}" ]]; then
        echo "No oauth configuration found with name '${OAUTH_NAME}'. Installing it now..."
-        gitea admin auth add-oauth {{- include "gitea.oauth_settings" . | indent 1 }}
+        gitea admin auth add-oauth {{- include "gitea.oauth_settings" (list $idx $value) | indent 1 }}
        echo '...installed.'
      else
        echo "Existing oauth configuration with name '${OAUTH_NAME}': '${AUTH_ID}'. Running update to sync settings..."
-        gitea admin auth update-oauth --id "${AUTH_ID}" {{- include "gitea.oauth_settings" . | indent 1 }}
+        gitea admin auth update-oauth --id "${AUTH_ID}" {{- include "gitea.oauth_settings" (list $idx $value) | indent 1 }}
        echo '...sync settings done.'
      fi
      {{- end }}
      {{- else }}
        echo 'no oauth configuration... skipping.'
      {{- end }}
    }
    configure_oauth
    {{- end }}
    echo '==== END GITEA CONFIGURATION ===='
--- a/templates/gitea/statefulset.yaml
+++ b/templates/gitea/statefulset.yaml
@ -17,8 +17,12 @@ spec:
    metadata:
      annotations:
        checksum/config: {{ include (print $.Template.BasePath "/gitea/config.yaml") . | sha256sum }}
-        checksum/ldap: {{ include "gitea.ldap_settings" . | sha256sum }}
+        {{- range $idx, $value := .Values.gitea.ldap }}
-        checksum/oauth: {{ include "gitea.oauth_settings" . | sha256sum }}
+        checksum/ldap_{{ $idx }}: {{ include "gitea.ldap_settings" (list $idx $value) | sha256sum }}
        {{- end }}
        {{- range $idx, $value := .Values.gitea.oauth }}
        checksum/oauth_{{ $idx }}: {{ include "gitea.oauth_settings" (list $idx $value) | sha256sum }}
        {{- end }}
        {{- with .Values.gitea.podAnnotations }}
        {{- toYaml . | nindent 8 }}
        {{- end }}
@ -36,7 +40,7 @@ spec:
        {{- toYaml . | nindent 8 }}
      {{- end }}
      securityContext:
-        fsGroup: 1000
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
      initContainers:
        - name: init-directories
          image: "{{ include "gitea.image" . }}"
@ -58,18 +62,19 @@ spec:
              mountPath: /usr/sbin
            - name: temp
              mountPath: /tmp
            - name: config
              mountPath: /etc/gitea/conf
            - name: data
              mountPath: /data
              {{- if .Values.persistence.subPath }}
              subPath: {{ .Values.persistence.subPath }}
              {{- end }}
            {{- if .Values.extraVolumeMounts }}
            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
            {{- end }}
        - name: configure-gitea
          image: "{{ include "gitea.image" . }}"
          command: ["/usr/sbin/configure_gitea.sh"]
          securityContext:
-            runAsUser: 1000
+            {{- toYaml .Values.containerSecurityContext | nindent 12 }}
        - name: init-app-ini
          image: "{{ include "gitea.image" . }}"
          command: ["/usr/sbin/config_environment.sh"]
          env:
            - name: GITEA_APP_INI
              value: /data/gitea/conf/app.ini
@ -79,23 +84,84 @@ spec:
              value: /data
            - name: GITEA_TEMP
              value: /tmp/gitea
-            {{- if .Values.gitea.ldap.enabled }}
+            {{- if .Values.statefulset.env }}
-            {{- if .Values.gitea.ldap.existingSecret }}
+            {{- toYaml .Values.statefulset.env | nindent 12 }}
-            - name: GITEA_LDAP_BIND_DN
+            {{- end }}
          volumeMounts:
            - name: config
              mountPath: /usr/sbin
            - name: temp
              mountPath: /tmp
            - name: data
              mountPath: /data
              {{- if .Values.persistence.subPath }}
              subPath: {{ .Values.persistence.subPath }}
              {{- end }}
            - name: inline-config-sources
              mountPath: /env-to-ini-mounts/inlines/
            {{- range $idx, $value := .Values.gitea.additionalConfigSources }}
            - name: additional-config-sources-{{ $idx }}
              mountPath: "/env-to-ini-mounts/additionals/{{ $idx }}/"
            {{- end }}
            {{- if .Values.extraVolumeMounts }}
            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
            {{- end }}
          securityContext:
            {{- toYaml .Values.containerSecurityContext | nindent 12 }}
        - name: configure-gitea
          image: "{{ include "gitea.image" . }}"
          command: ["/usr/sbin/configure_gitea.sh"]
          securityContext:
            {{- /* By default this container runs as user 1000 unless otherwise stated */ -}}
            {{- $csc := deepCopy .Values.containerSecurityContext -}}
            {{- if not (hasKey $csc "runAsUser") -}}
            {{- $_ := set $csc "runAsUser" 1000 -}}
            {{- end -}}
            {{- toYaml $csc | nindent 12 }}
          env:
            - name: GITEA_APP_INI
              value: /data/gitea/conf/app.ini
            - name: GITEA_CUSTOM
              value: /data/gitea
            - name: GITEA_WORK_DIR
              value: /data
            - name: GITEA_TEMP
              value: /tmp/gitea
            {{- if .Values.gitea.ldap }}
            {{- range $idx, $value := .Values.gitea.ldap }}
            {{- if $value.existingSecret }}
            - name: GITEA_LDAP_BIND_DN_{{ $idx }}
              valueFrom:
                secretKeyRef:
                  key:  bindDn
-                  name: {{ .Values.gitea.ldap.existingSecret }}
+                  name: {{ $value.existingSecret }}
-            - name: GITEA_LDAP_PASSWORD
+            - name: GITEA_LDAP_PASSWORD_{{ $idx }}
              valueFrom:
                secretKeyRef:
                  key:  bindPassword
-                  name: {{ .Values.gitea.ldap.existingSecret }}
+                  name: {{ $value.existingSecret }}
            {{- else }}
-            - name: GITEA_LDAP_BIND_DN
+            - name: GITEA_LDAP_BIND_DN_{{ $idx }}
-              value: {{ .Values.gitea.ldap.bindDn | quote }}
+              value: {{ $value.bindDn | quote }}
-            - name: GITEA_LDAP_PASSWORD
+            - name: GITEA_LDAP_PASSWORD_{{ $idx }}
-              value: {{ .Values.gitea.ldap.bindPassword | quote }}
+              value: {{ $value.bindPassword | quote }}
            {{- end }}
            {{- end }}
            {{- end }}
            {{- if .Values.gitea.oauth }}
            {{- range $idx, $value := .Values.gitea.oauth }}
            {{- if $value.existingSecret }}
            - name: GITEA_OAUTH_KEY_{{ $idx }}
              valueFrom:
                secretKeyRef:
                  key:  key
                  name: {{ $value.existingSecret }}
            - name: GITEA_OAUTH_SECRET_{{ $idx }}
              valueFrom:
                secretKeyRef:
                  key:  secret
                  name: {{ $value.existingSecret }}
            {{- end }}
            {{- end }}
            {{- end }}
            {{- if .Values.gitea.admin.existingSecret }}
@ -125,6 +191,9 @@ spec:
              mountPath: /tmp
            - name: data
              mountPath: /data
              {{- if .Values.persistence.subPath }}
              subPath: {{ .Values.persistence.subPath }}
              {{- end }}
            {{- if .Values.extraVolumeMounts }}
            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
            {{- end }}
@ -165,54 +234,35 @@ spec:
            - name: profiler
              containerPort: 6060
            {{- end }}
-          {{- if .Values.gitea.livenessProbe.enabled }}
+          {{- if .Values.gitea.livenessProbe }}
          livenessProbe:
-            tcpSocket:
+            {{- toYaml .Values.gitea.livenessProbe | nindent 12 }}
              port: http
            initialDelaySeconds: {{ .Values.gitea.livenessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.gitea.livenessProbe.periodSeconds }}
            timeoutSeconds: {{ .Values.gitea.livenessProbe.timeoutSeconds }}
            successThreshold: {{ .Values.gitea.livenessProbe.successThreshold }}
            failureThreshold: {{ .Values.gitea.livenessProbe.failureThreshold }}
          {{- else if .Values.gitea.customLivenessProbe }}
          livenessProbe:
            {{- toYaml .Values.gitea.customLivenessProbe | nindent 12 }}
          {{- end }}
-          {{- if .Values.gitea.readinessProbe.enabled }}
+          {{- if .Values.gitea.readinessProbe }}
          readinessProbe:
-            tcpSocket:
+            {{- toYaml .Values.gitea.readinessProbe | nindent 12 }}
              port: http
            initialDelaySeconds: {{ .Values.gitea.readinessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.gitea.readinessProbe.periodSeconds }}
            timeoutSeconds: {{ .Values.gitea.readinessProbe.timeoutSeconds }}
            successThreshold: {{ .Values.gitea.readinessProbe.successThreshold }}
            failureThreshold: {{ .Values.gitea.readinessProbe.failureThreshold }}
          {{- else if .Values.gitea.customReadinessProbe }}
          readinessProbe:
            {{- toYaml .Values.gitea.customReadinessProbe | nindent 12 }}
          {{- end }}
-          {{- if .Values.gitea.startupProbe.enabled }}
+          {{- if .Values.gitea.startupProbe }}
          startupProbe:
-            tcpSocket:
+            {{- toYaml .Values.gitea.startupProbe | nindent 12 }}
              port: http
            initialDelaySeconds: {{ .Values.gitea.startupProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.gitea.startupProbe.periodSeconds }}
            timeoutSeconds: {{ .Values.gitea.startupProbe.timeoutSeconds }}
            successThreshold: {{ .Values.gitea.startupProbe.successThreshold }}
            failureThreshold: {{ .Values.gitea.startupProbe.failureThreshold }}
          {{- else if .Values.gitea.customStartupProbe }}
          startupProbe:
            {{- toYaml .Values.gitea.customStartupProbe | nindent 12 }}
          {{- end }}
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- /* Honor the deprecated securityContext variable when defined */ -}}
            {{- if .Values.containerSecurityContext -}}
            {{ toYaml .Values.containerSecurityContext | nindent 12 -}}
            {{- else -}}
            {{ toYaml .Values.securityContext | nindent 12 -}}
            {{- end }}
          volumeMounts:
            - name: temp
              mountPath: /tmp
            - name: data
              mountPath: /data
              {{- if .Values.persistence.subPath }}
              subPath: {{ .Values.persistence.subPath }}
              {{- end }}
            {{- if .Values.extraVolumeMounts }}
            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
            {{- end }}
@ -232,19 +282,29 @@ spec:
        - name: init
          secret:
            secretName: {{ include "gitea.fullname" . }}-init
-            defaultMode: 0777
+            defaultMode: 110
        - name: config
          secret:
            secretName: {{ include "gitea.fullname" . }}
            defaultMode: 110
        {{- if .Values.extraVolumes }}
        {{- toYaml .Values.extraVolumes | nindent 8 }}
        {{- end }}
        - name: inline-config-sources
          secret:
            secretName: {{ include "gitea.fullname" . }}-inline-config
        {{- range $idx, $value := .Values.gitea.additionalConfigSources }}
        - name: additional-config-sources-{{ $idx }}
          {{- toYaml $value | nindent 10 }}
        {{- end }}
        - name: temp
          emptyDir: {}
  {{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
        - name: data
          persistentVolumeClaim:
-            claimName: {{ .Values.persistence.existingClaim }}
+  {{- with .Values.persistence.existingClaim }}
            claimName: {{ tpl . $ }}
  {{- end }}
  {{- else if not .Values.persistence.enabled }}
        - name: data
          emptyDir: {}
--- a/values.yaml
+++ b/values.yaml
@ -8,14 +8,17 @@ clusterDomain: cluster.local
 image:
  repository: gitea/gitea
-  tag: 1.14.3
+  tag: 1.15.8
  pullPolicy: Always
  rootless: false # only possible when running 1.14 or later
 imagePullSecrets: []
-# only usable with rootless image due to image design
+# Security context is only usable with rootless image due to image design
-securityContext: {}
+podSecurityContext:
  fsGroup: 1000
 containerSecurityContext: {}
 #   allowPrivilegeEscalation: false
 #   capabilities:
 #     drop:
@ -33,6 +36,11 @@ securityContext: {}
 #   runAsNonRoot: true
 #   runAsUser: 1000
 # DEPRECATED. The securityContext variable has been split two:
 # - containerSecurityContext
 # - podSecurityContext.
 securityContext: {}
 service:
  http:
    type: ClusterIP
@ -57,6 +65,7 @@ service:
 ingress:
  enabled: false
  # className: nginx
  annotations: {}
    # kubernetes.io/ingress.class: nginx
    # kubernetes.io/tls-acme: "true"
@ -69,6 +78,9 @@ ingress:
  #  - secretName: chart-example-tls
  #    hosts:
  #      - git.example.com
  # Mostly for argocd or any other CI that uses `helm template | kubectl apply` or similar
  # If helm doesn't correctly detect your ingress API version you can set it here.
  # apiVersion: networking.k8s.io/v1
 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
@ -109,6 +121,7 @@ persistence:
  labels: {}
  annotations: {}
  # storageClass:
  # subPath:
 # additional volumes to add to the Gitea statefulset.
 extraVolumes:
@ -153,34 +166,34 @@ gitea:
      #  additionalLabels:
      #    prometheus-release: prom1
-  ldap:
+  ldap: []
-    enabled: false
+    # - name: "LDAP 1"
-    #existingSecret: gitea-ldap-secret
+    #  existingSecret:
-    #name:
+    #  securityProtocol:
-    #securityProtocol:
+    #  host:
-    #host:
+    #  port:
-    #port:
+    #  userSearchBase:
-    #userSearchBase:
+    #  userFilter:
-    #userFilter:
+    #  adminFilter:
-    #adminFilter:
+    #  emailAttribute:
-    #emailAttribute:
+    #  bindDn:
-    #bindDn:
+    #  bindPassword:
-    #bindPassword:
+    #  usernameAttribute:
-    #usernameAttribute:
+    #  publicSSHKeyAttribute:
    #sshPublicKeyAttribute:
-  oauth:
+  # Either specify inline `key` and `secret` or refer to them via `existingSecret`
-    enabled: false
+  oauth: []
-    #name:
+    # - name: 'OAuth 1'
-    #provider:
+    #   provider:
-    #key:
+    #   key:
-    #secret:
+    #   secret:
-    #autoDiscoverUrl:
+    #   existingSecret:
-    #useCustomUrls:
+    #   autoDiscoverUrl:
-    #customAuthUrl:
+    #   useCustomUrls:
-    #customTokenUrl:
+    #   customAuthUrl:
-    #customProfileUrl:
+    #   customTokenUrl:
-    #customEmailUrl:
+    #   customProfileUrl:
    #   customEmailUrl:
  config: {}
  #  APP_NAME: "Gitea: Git with a cup of tea"
@ -192,73 +205,51 @@ gitea:
  #  security:
  #    PASSWORD_COMPLEXITY: spec
  additionalConfigSources: []
  #   - secret:
  #       secretName: gitea-app-ini-oauth
  #   - configMap:
  #       name: gitea-app-ini-plaintext
  podAnnotations: {}
-  database:
+  # Modify the liveness probe for your needs or completely disable it by commenting out.
    builtIn:
      postgresql:
        enabled: true
      mysql:
        enabled: false
      mariadb:
        enabled: false
  cache:
    builtIn:
      enabled: true
  livenessProbe:
-    enabled: true
+    tcpSocket:
      port: http
    initialDelaySeconds: 200
    timeoutSeconds: 1
    periodSeconds: 10
    successThreshold: 1
    failureThreshold: 10
  # Modify the readiness probe for your needs or completely disable it by commenting out.
  readinessProbe:
-    enabled: true
+    tcpSocket:
      port: http
    initialDelaySeconds: 5
    timeoutSeconds: 1
    periodSeconds: 10
    successThreshold: 1
    failureThreshold: 3
  startupProbe:
    enabled: false
    initialDelaySeconds: 60
    timeoutSeconds: 1
    periodSeconds: 10
    successThreshold: 1
    failureThreshold: 10
-  # customLivenessProbe:
+  # # Uncomment the startup probe to enable and modify it for your needs.
-  #   httpGet:
+  # startupProbe:
-  #     path: /user/login
+  #   tcpSocket:
  #     port: http
  #   initialDelaySeconds: 60
  #   periodSeconds: 10
  #   successThreshold: 1
  #   failureThreshold: 10
  # customReadinessProbe:
  #   httpGet:
  #     path: /user/login
  #     port: http
  #   initialDelaySeconds: 5
  #   periodSeconds: 10
  #   successThreshold: 1
  #   failureThreshold: 3
  # customStartupProbe:
  #   httpGet:
  #     path: /user/login
  #     port: http
  #   initialDelaySeconds: 60
  #   timeoutSeconds: 1
  #   periodSeconds: 10
  #   successThreshold: 1
  #   failureThreshold: 10
 memcached:
  enabled: true
  service:
    port: 11211
 postgresql:
  enabled: true
  global:
    postgresql:
      postgresqlDatabase: gitea
@ -269,6 +260,7 @@ postgresql:
    size: 10Gi
 mysql:
  enabled: false
  root:
    password: gitea
  db:
@ -281,6 +273,7 @@ mysql:
    size: 10Gi
 mariadb:
  enabled: false
  auth:
    database: gitea
    username: gitea
@ -291,3 +284,7 @@ mariadb:
      port: 3306
    persistence:
      size: 10Gi
 # By default, removed or moved settings that still remain in a user defined values.yaml will cause Helm to fail running the install/update.
 # Set it to false to skip this basic validation check.
 checkDeprecation: true
Author	SHA1	Message	Date
luhahn	7fc444c08e	Update README with multiple LDAP Sources (#271 ) We did not mention the multiple LDAP Sources as a breaking change. Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/271 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net>	2021-12-23 21:43:21 +08:00
nmasse-itix	d550b5a2c4	Improve support for gitea instances not running as root or uid 1000 (#266 ) ## Context PR #259 introduced support for running Gitea as a uid different than 1000 (git) or 0 (root). ## Problem In init_directory_structure.sh, there is a "chown 1000:1000" on /tmp/gitea. This chown only works when running as root or when the target directory is already owned by uid 1000. As a result, the init container "init-directories" fails on startup when running Gitea with a uid different from 0 or 1000. Initially, I worked around it by implementing an "initPreScript". But it would make user's life easier if we can make it work out-of-the-box. ## Resolution I'm taking model on the chown a few lines above that depends on the value of image.rootless. Since the chown only works on default (root) image and is useless on rootless image, there is no need to run it on rootless image. Co-authored-by: Nicolas MASSE <nicolas.masse@itix.fr> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/266 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-authored-by: nmasse-itix <nmasse-itix@noreply.gitea.io> Co-committed-by: nmasse-itix <nmasse-itix@noreply.gitea.io>	2021-12-23 18:50:56 +08:00
justusbunsi	5bb91510df	Bump Gitea version to 1.15.8 (#270 ) As title. Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/270 Reviewed-by: techknowlogick <techknowlogick@gitea.io> Reviewed-by: Gusted <gusted@noreply.gitea.io> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-23 03:56:36 +08:00
justusbunsi	c27140c4cb	Add deprecation fail-safe for Chart templating (#269 ) With release 5.0.0 there are so many deprecations and breaking changes that it is probably a good way to assist the users with values migration before breaking their environments. This adds another template file that doesn't render anything but ensures the removal of dropped or deprecated settings from customized values files. For when it is necessary, this check can be disabled via new setting `checkDeprecation`. Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/269 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: wxiaoguang <wxiaoguang@noreply.gitea.io> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-23 00:25:32 +08:00
luhahn	d97ea18626	Remove builtIn dependency values (#268 ) ⚠️ Breaking Moved the values to enable the dependencies into the dependencies itself, this way we don't need a seperate field in the values and it is more obvious how to enable for example postgresql. Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/268 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net>	2021-12-22 23:41:35 +08:00
justusbunsi	7b0a1c7ae6	Generic way for configuring Gitea app.ini (#240 ) With the result of PR #239 it is much easier to provide additional values to the _app.ini_ configuration from different sources. These changes adds an _additionalConfigSources_ field where the users can define such sources. This enables the users to choose on their own whether to store values in _values.yaml_ or load them from Kuberetes Secrets or ConfigMaps. - Fixes #243 - Fixes #174 - Fixes #260 Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/240 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: wxiaoguang <wxiaoguang@noreply.gitea.io> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-22 18:44:04 +08:00
justusbunsi	66683e14df	Remove "enabled" key check from OAuth (#267 ) As this key must not exist anymore, we don't have to check it. Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/267 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: wxiaoguang <wxiaoguang@noreply.gitea.io> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-21 18:59:18 +08:00
justusbunsi	6d9362ed39	Rework OAuth sources (#244 ) This change request includes two different things to improve OAuth source handling: - Allow multiple OAuth source configuration (Fixes: #191) - Support reading sensitive OAuth configuration data from Kubernetes secrets (Closes: #242) ⚠️ BREAKING ⚠️ --- Users need to migrate their `gitea.oauth` configuration. Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/244 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-20 22:43:55 +08:00
aleksey.sergey	cd09ccfcdb	add support for persistence.subPath option (#263 ) Hello, PR adds a `persistence.subPath` option to provide user more flexibility on mounting the `data` PV. https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath The setting is similar to e.g. `primary.persistence.subPath` in MariaDB helm chart: https://github.com/bitnami/charts/tree/master/bitnami/mariadb Co-authored-by: Aleksey Sergey <sergey.aleksey90@gmail.com> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/263 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: luhahn <luhahn@noreply.gitea.io> Co-authored-by: aleksey.sergey <aleksey.sergey@noreply.gitea.io> Co-committed-by: aleksey.sergey <aleksey.sergey@noreply.gitea.io>	2021-12-20 19:58:44 +08:00
iMartyn	d97b1567e2	Enable overriding of ingress api version for systems where detection doesn't work (#252 ) fixes #251 The rendering is a bit more programatic but the result is the same if you don't have an override. This makes the code a little easier at the end of the template, and slightly less easier to read at the beginning, which I think is a valid tradeoff. Co-authored-by: Martyn Ranyard <m@rtyn.berlin> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/252 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: luhahn <luhahn@noreply.gitea.io> Co-authored-by: iMartyn <imartyn@noreply.gitea.io> Co-committed-by: iMartyn <imartyn@noreply.gitea.io>	2021-12-20 19:54:37 +08:00
nmasse-itix	bef0cea1b1	split the securityContext in two: pod and container securityContext (#259 ) Hello ! I'm using the new Helm chart (5.x) and I really like the new configuration mechanism. 👍 I would like to contribute the following enhancement. ## The problem I want to solve I'm trying to deploy Gitea in a Kubernetes shared platform and I need to make sure each instance is running as a different user so that in case of container escape, the risk of data leak is minimized. Additionally, on my platform (OpenShift), arbitrary users (such as uid 1000 for Gitea) are not allowed. The current helm chart does not allow me to achieve this because: - the container security context is configurable only for the main container. The security context of init containers cannot be specified. - a fixed uid is hard coded - a fixed fs group is hard coded Also, the securityContext of a pod and the securityContext of a container do not accept the same options. - https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#podsecuritycontext-v1-core - https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#securitycontext-v1-core ## How I'm solving the problem I split the `securityContext` (values.yaml) in two: `containerSecurityContext` and `podSecurityContext`. The containerSecurityContext applies to all containers (init and main) in order to be consistent with file permissions. The behavior for existing deployments is unchanged: - fsGroup 1000 is the default value for the podSecurityContext variable - the "configure-gitea" init container uses the uid 1000 unless otherwise stated in the containerSecurityContext - the main container is using the existing securityContext variable when defined in order not to break existing deployments and uses the new containerSecurityContext variable if not. This approach is well tested: it is used consistently on bitnami's Helm charts. ## How I tested I tested both root and rootless variants on a Kubernetes 1.22, as well as rootless variant on OpenShift 4.7. rootless variant on Kubernetes: ```yaml podSecurityContext: fsGroup: 10001 containerSecurityContext: allowPrivilegeEscalation: false capabilities: drop: - ALL add: - SYS_CHROOT privileged: false runAsGroup: 10001 runAsNonRoot: true runAsUser: 10001 extraVolumes: - name: var-lib-gitea emptyDir: {} extraVolumeMounts: - name: var-lib-gitea readOnly: false mountPath: "/var/lib/gitea" ``` rootless variant on OpenShift: ```yaml podSecurityContext: fsGroup: null containerSecurityContext: allowPrivilegeEscalation: false privileged: false runAsNonRoot: true runAsUser: 1000790000 extraVolumes: - name: var-lib-gitea emptyDir: {} extraVolumeMounts: - name: var-lib-gitea readOnly: false mountPath: "/var/lib/gitea" ``` Let me know if something is unclear. Co-authored-by: Nicolas MASSE <nicolas.masse@itix.fr> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/259 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-authored-by: nmasse-itix <nmasse-itix@noreply.gitea.io> Co-committed-by: nmasse-itix <nmasse-itix@noreply.gitea.io>	2021-12-18 19:10:48 +08:00
justusbunsi	bfa68f6f58	Drop custom probes (#248 ) As a replacement, the default probes are now fully configurable and used as-is during Chart deployment. Fixes: #189 ⚠️ BREAKING ⚠️ --- Users have to remove the `custom` prefix from their probes, if customized. Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/248 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-authored-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-committed-by: justusbunsi <justusbunsi@noreply.gitea.io>	2021-12-13 16:50:08 +08:00
luhahn	0461fa92a9	Rework app.ini generation (#239 ) App ini is now generated by environment-to-ini This should prevent some of the problems we had earlier with persisting the app.ini Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/239 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-authored-by: luhahn <luhahn@noreply.gitea.io> Co-committed-by: luhahn <luhahn@noreply.gitea.io>	2021-11-20 05:15:45 +08:00
Markus Pesch	82763f109b	feat/markdownlint (#200 ) Hi, this patch contains a markdownlinter. I think this has the advantage that all users stick to the same format and the `README.md` follows a consistent structure. The markdownlinter can be configured via the `.markdownlint.yaml` file. All possible options are [here](https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.yaml) documented. I have created the initialie configuration. However, can be adapted to suggestions for change. Has of course the consequence that if necessary the `README.md` would have to be adapted. I have formatted this in advance according to the defined rules. For users which use visual-code as IDE is additionally a plugin [available](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint). Co-authored-by: Markus Pesch <markus.pesch@cryptic.systems> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/200 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-by: pat-s <pat-s@noreply.gitea.io> Co-authored-by: Markus Pesch <volker.raschek@noreply.gitea.io> Co-committed-by: Markus Pesch <volker.raschek@noreply.gitea.io>	2021-11-05 12:06:48 +08:00
techknowlogick	3fd34a9455	1.15.4 (#230 ) Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/230 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: pat-s <pat-s@noreply.gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-committed-by: techknowlogick <techknowlogick@gitea.io>	2021-10-17 00:08:17 +08:00
luhahn	3273b245e7	Add multiple LDAP sources (#222 ) Add multiple add sources. Instead of a single entry for ldap configuration we now would have a dictionary for ldap config. This would be a breaking change for those working with the ldap config. fixes: #190 Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/222 Reviewed-by: Andrew Thornton <art27@cantab.net> Reviewed-by: pat-s <pat-s@noreply.gitea.io> Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-authored-by: luhahn <luhahn@noreply.gitea.io> Co-committed-by: luhahn <luhahn@noreply.gitea.io>	2021-10-08 20:16:24 +08:00
pat-s	b344673d11	Add dev instructions to README (#228 ) FYI: My editor automatically changes two trailing whitespaces into a linebreak. I know it's not completely the same but maybe it can be accepted (would make things easier in the long run). Co-authored-by: pat-s <patrick.schratz@gmail.com> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/228 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Reviewed-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: pat-s <pat-s@noreply.gitea.io> Co-committed-by: pat-s <pat-s@noreply.gitea.io>	2021-09-28 03:52:37 +08:00
techknowlogick	5a7d168c2e	1.15.3 (#225 ) Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/225 Reviewed-by: pat-s <pat-s@noreply.gitea.io> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-committed-by: techknowlogick <techknowlogick@gitea.io>	2021-09-26 08:44:59 +08:00
techknowlogick	9a220c2ddd	1.15.0 (#218 ) Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/218 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-by: luhahn <luhahn@noreply.gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-committed-by: techknowlogick <techknowlogick@gitea.io>	2021-09-12 06:40:47 +08:00
wkit23	ce3e9babec	Add support for ingressClassName (#217 ) Hi, I just add some minor changes to support specifying ingressClassName to support the newer specification in `networking.k8s.io/v1`. The annotation `kubernetes.io/ingress.class: nginx` only works with older API `networking.k8s.io/v1beta1`. This is part of our move to support kubernetes 1.22. Co-authored-by: Leong Wai Kit <waikit.leong@bertelsmann.de> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/217 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: wkit23 <wkit23@noreply.gitea.io> Co-committed-by: wkit23 <wkit23@noreply.gitea.io>	2021-09-02 10:53:48 +08:00
Michael Kriese	4ef9a3ec35	fix: Only create conf directoy if not exists (#211 ) Only create conf directory if not yet exists fixes #210 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/211 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-committed-by: Michael Kriese <michael.kriese@visualon.de>	2021-08-15 20:43:51 +08:00
techknowlogick	ba0e8b18b5	1.14.6 (#212 ) Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/212 Reviewed-by: justusbunsi <justusbunsi@noreply.gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-committed-by: techknowlogick <techknowlogick@gitea.io>	2021-08-13 04:14:49 +08:00
skriesch	9e7387f0f8	Fix for #203 possible existingClaim at persistence with namespace variable in the name (#204 ) Fix for #203 Co-authored-by: techknowlogick <techknowlogick@gitea.io> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/204 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: skriesch <skriesch@noreply.gitea.io> Co-committed-by: skriesch <skriesch@noreply.gitea.io>	2021-07-17 10:47:41 +08:00