.gitea/workflows/test-pr.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   # renovate: datasource=github-releases depName=helm-unittest/helm-unittest
-  HELM_UNITTEST_VERSION: "v0.5.2"
+  HELM_UNITTEST_VERSION: "v0.5.1"
 
 jobs:
   check-and-test:

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "yaml.schemas": {
-        "https://raw.githubusercontent.com/helm-unittest/helm-unittest/v0.5.2/schema/helm-testsuite.json": [
+        "https://raw.githubusercontent.com/helm-unittest/helm-unittest/v0.5.1/schema/helm-testsuite.json": [
             "/unittests/**/*.yaml"
         ]
     },

Chart.lock

@@ -1,15 +1,15 @@
 dependencies:
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 15.5.20
+  version: 15.5.17
 - name: postgresql-ha
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 14.2.16
+  version: 14.2.12
 - name: redis-cluster
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 10.3.0
+  version: 10.2.7
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 19.6.4
-digest: sha256:a28c809273f313c482e3f803a0a002c3bb3a0d2090bf6b732d68ecc4710b4732
-generated: "2024-08-03T00:21:16.080925346Z"
+  version: 19.6.2
+digest: sha256:842e8878e2da9cd62c2233f5ebfcdaa05598633a8bc2fa84803006929cf0c3cc
+generated: "2024-07-20T00:44:58.227558466Z"

Chart.yaml

@@ -3,8 +3,7 @@ name: gitea
 description: Gitea Helm chart for Kubernetes
 type: application
 version: 0.0.0
-# renovate datasource=github-releases depName=go-gitea/gitea extractVersion=^v(?<version>.*)$
-appVersion: 1.22.2
+appVersion: 1.22.0
 icon: https://gitea.com/assets/img/logo.svg
 
 keywords:
@@ -36,20 +35,20 @@ dependencies:
   # https://github.com/bitnami/charts/blob/main/bitnami/postgresql
   - name: postgresql
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: 15.5.20
+    version: 15.5.17
     condition: postgresql.enabled
   # https://github.com/bitnami/charts/blob/main/bitnami/postgresql-ha/Chart.yaml
   - name: postgresql-ha
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: 14.2.16
+    version: 14.2.12
     condition: postgresql-ha.enabled
   # https://github.com/bitnami/charts/blob/main/bitnami/redis-cluster/Chart.yaml
   - name: redis-cluster
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: 10.3.0
+    version: 10.2.7
     condition: redis-cluster.enabled
   # https://github.com/bitnami/charts/blob/main/bitnami/redis/Chart.yaml
   - name: redis
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: 19.6.4
+    version: 19.6.2
     condition: redis.enabled

README.md

@@ -498,9 +498,6 @@ redis-cluster:
   enabled: true
 ```
 
-⚠️ The redis charts [do not work well with special characters in the password](https://gitea.com/gitea/helm-chart/issues/690).
-Consider omitting such or open an issue in the Bitnami repo and let us know once this got fixed.
-
 ### Persistence
 
 Gitea will be deployed as a deployment.
@@ -1005,19 +1002,14 @@ To comply with the Gitea helm chart definition of the digest parameter, a "custo
 ### Gitea
 
 | Name                                   | Description                                                                                                                   | Value                |
-| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------- |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | -------------------- |
 | `gitea.admin.username`                 | Username for the Gitea admin user                                                                                             | `gitea_admin`        |
 | `gitea.admin.existingSecret`           | Use an existing secret to store admin user credentials                                                                        | `nil`                |
 | `gitea.admin.password`                 | Password for the Gitea admin user                                                                                             | `r8sA8CPHD9!bt6d`    |
 | `gitea.admin.email`                    | Email for the Gitea admin user                                                                                                | `gitea@local.domain` |
 | `gitea.admin.passwordMode`             | Mode for how to set/update the admin user password. Options are: initialOnlyNoReset, initialOnlyRequireReset, and keepUpdated | `keepUpdated`        |
 | `gitea.metrics.enabled`                | Enable Gitea metrics                                                                                                          | `false`              |
-| `gitea.metrics.serviceMonitor.enabled`       | Enable Gitea metrics service monitor. Requires, that `gitea.metrics.enabled` is also set to true, to enable metrics generally. | `false`              |
-| `gitea.metrics.serviceMonitor.interval`      | Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.                      | `""`                 |
-| `gitea.metrics.serviceMonitor.relabelings`   | RelabelConfigs to apply to samples before scraping.                                                                            | `[]`                 |
-| `gitea.metrics.serviceMonitor.scheme`        | HTTP scheme to use for scraping. For example `http` or `https`. Default is http.                                               | `""`                 |
-| `gitea.metrics.serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.                           | `""`                 |
-| `gitea.metrics.serviceMonitor.tlsConfig`     | TLS configuration to use when scraping the metric endpoint by Prometheus.                                                      | `{}`                 |
+| `gitea.metrics.serviceMonitor.enabled` | Enable Gitea metrics service monitor                                                                                          | `false`              |
 | `gitea.ldap`                           | LDAP configuration                                                                                                            | `[]`                 |
 | `gitea.oauth`                          | OAuth configuration                                                                                                           | `[]`                 |
 | `gitea.config.server.SSH_PORT`         | SSH port for rootlful Gitea image                                                                                             | `22`                 |
@@ -1098,7 +1090,7 @@ Redis and [Redis cluster](#redis-cluster) cannot be enabled at the same time.
 | `postgresql-ha.postgresql.postgresPassword` | postgres Password                                                | `changeme1` |
 | `postgresql-ha.pgpool.adminPassword`        | pgpool adminPassword                                             | `changeme3` |
 | `postgresql-ha.service.ports.postgresql`    | PostgreSQL service port (overrides `service.ports.postgresql`)   | `5432`      |
-| `postgresql-ha.persistence.size`            | PVC Storage Request for PostgreSQL HA volume                     | `10Gi`      |
+| `postgresql-ha.primary.persistence.size`    | PVC Storage Request for PostgreSQL HA volume                     | `10Gi`      |
 
 ### PostgreSQL
 

renovate.json5

@@ -30,14 +30,6 @@
       ],
       datasourceTemplate: 'github-releases',
     },
-    {
-      'description': 'Automatically detect new Gitea releases',
-      'customType': 'regex',
-      'fileMatch': ['(^|/)Chart\\.yaml$'],
-      'matchStrings': [
-        '# renovate datasource=(?<datasource>\\S+) depName=(?<depName>\\S+) extractVersion=(?<extractVersion>\\S+)\\nappVersion:\\s?(?<currentValue>\\S+)\\n',
-      ],
-    },
   ],
   packageRules: [
     {
@@ -64,12 +56,5 @@
         'digest',
       ],
     },
-    {
-      description: 'Override changelog url for Helm image, to have release notes in our PRs',
-      matchDepNames: [
-        'alpine/helm',
-      ],
-      changelogUrl: 'https://github.com/helm/helm',
-    },
   ],
 }

templates/gitea/init.yaml

@@ -24,25 +24,27 @@ stringData:
     # END: initPreScript
     {{- end }}
 
+    set -x
+
     {{- if not .Values.image.rootless }}
-    chown -v 1000:1000 /data
+    chown 1000:1000 /data
     {{- end }}
-    mkdir -pv /data/git/.ssh
-    chmod -Rv 700 /data/git/.ssh
-    [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+    mkdir -p /data/git/.ssh
+    chmod -R 700 /data/git/.ssh
+    [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
     # prepare temp directory structure
-    mkdir -pv "${GITEA_TEMP}"
+    mkdir -p "${GITEA_TEMP}"
     {{- if not .Values.image.rootless }}
-    chown -v 1000:1000 "${GITEA_TEMP}"
+    chown 1000:1000 "${GITEA_TEMP}"
     {{- end }}
-    chmod -v ug+rwx "${GITEA_TEMP}"
+    chmod ug+rwx "${GITEA_TEMP}"
 
     {{ if .Values.signing.enabled -}}
     if [ ! -d "${GNUPGHOME}" ]; then
-      mkdir -pv "${GNUPGHOME}"
-      chmod -v 700 "${GNUPGHOME}"
-      chown -v 1000:1000 "${GNUPGHOME}"
+      mkdir -p "${GNUPGHOME}"
+      chmod 700 "${GNUPGHOME}"
+      chown 1000:1000 "${GNUPGHOME}"
     fi
     {{- end }}
 

templates/gitea/servicemonitor.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.gitea.metrics.enabled .Values.gitea.metrics.serviceMonitor.enabled -}}
+{{- if .Values.gitea.metrics.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -14,21 +14,4 @@ spec:
       {{- include "gitea.selectorLabels" . | nindent 6 }}
   endpoints:
   - port: http
-    {{- if .Values.gitea.metrics.serviceMonitor.interval }}
-    interval: {{ .Values.gitea.metrics.serviceMonitor.interval }}
-    {{- end }}
-    {{- with .Values.gitea.metrics.serviceMonitor.relabelings }}
-    relabelings:
-      {{- . | toYaml | nindent 6 }}
-    {{- end }}
-    {{- if .Values.gitea.metrics.serviceMonitor.scheme }}
-    scheme: {{ .Values.gitea.metrics.serviceMonitor.scheme }}
-    {{- end }}
-    {{- if .Values.gitea.metrics.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.gitea.metrics.serviceMonitor.scrapeTimeout }}
-    {{- end }}
-    {{- with .Values.gitea.metrics.serviceMonitor.tlsConfig }}
-    tlsConfig:
-      {{- . | toYaml | nindent 6 }}
-    {{- end }}
 {{- end -}}

unittests/init/init_directory_structure.sh-rootless.yaml

@@ -28,13 +28,15 @@ tests:
             #!/usr/bin/env bash
 
             set -euo pipefail
-            mkdir -pv /data/git/.ssh
-            chmod -Rv 700 /data/git/.ssh
-            [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+
+            set -x
+            mkdir -p /data/git/.ssh
+            chmod -R 700 /data/git/.ssh
+            [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
             # prepare temp directory structure
-            mkdir -pv "${GITEA_TEMP}"
-            chmod -v ug+rwx "${GITEA_TEMP}"
+            mkdir -p "${GITEA_TEMP}"
+            chmod ug+rwx "${GITEA_TEMP}"
   - it: adds gpg script block for enabled signing
     set:
       signing.enabled: true
@@ -49,18 +51,20 @@ tests:
             #!/usr/bin/env bash
 
             set -euo pipefail
-            mkdir -pv /data/git/.ssh
-            chmod -Rv 700 /data/git/.ssh
-            [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+
+            set -x
+            mkdir -p /data/git/.ssh
+            chmod -R 700 /data/git/.ssh
+            [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
             # prepare temp directory structure
-            mkdir -pv "${GITEA_TEMP}"
-            chmod -v ug+rwx "${GITEA_TEMP}"
+            mkdir -p "${GITEA_TEMP}"
+            chmod ug+rwx "${GITEA_TEMP}"
 
             if [ ! -d "${GNUPGHOME}" ]; then
-              mkdir -pv "${GNUPGHOME}"
-              chmod -v 700 "${GNUPGHOME}"
-              chown -v 1000:1000 "${GNUPGHOME}"
+              mkdir -p "${GNUPGHOME}"
+              chmod 700 "${GNUPGHOME}"
+              chown 1000:1000 "${GNUPGHOME}"
             fi
   - it: it does not chown /data even when image.fullOverride is set
     template: templates/gitea/init.yaml
@@ -73,10 +77,12 @@ tests:
             #!/usr/bin/env bash
 
             set -euo pipefail
-            mkdir -pv /data/git/.ssh
-            chmod -Rv 700 /data/git/.ssh
-            [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+
+            set -x
+            mkdir -p /data/git/.ssh
+            chmod -R 700 /data/git/.ssh
+            [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
             # prepare temp directory structure
-            mkdir -pv "${GITEA_TEMP}"
-            chmod -v ug+rwx "${GITEA_TEMP}"
+            mkdir -p "${GITEA_TEMP}"
+            chmod ug+rwx "${GITEA_TEMP}"

unittests/init/init_directory_structure.sh.yaml

@@ -31,15 +31,17 @@ tests:
             #!/usr/bin/env bash
 
             set -euo pipefail
-            chown -v 1000:1000 /data
-            mkdir -pv /data/git/.ssh
-            chmod -Rv 700 /data/git/.ssh
-            [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+
+            set -x
+            chown 1000:1000 /data
+            mkdir -p /data/git/.ssh
+            chmod -R 700 /data/git/.ssh
+            [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
             # prepare temp directory structure
-            mkdir -pv "${GITEA_TEMP}"
-            chown -v 1000:1000 "${GITEA_TEMP}"
-            chmod -v ug+rwx "${GITEA_TEMP}"
+            mkdir -p "${GITEA_TEMP}"
+            chown 1000:1000 "${GITEA_TEMP}"
+            chmod ug+rwx "${GITEA_TEMP}"
   - it: adds gpg script block for enabled signing
     set:
       image.rootless: false
@@ -55,18 +57,20 @@ tests:
             #!/usr/bin/env bash
 
             set -euo pipefail
-            chown -v 1000:1000 /data
-            mkdir -pv /data/git/.ssh
-            chmod -Rv 700 /data/git/.ssh
-            [ ! -d /data/gitea/conf ] && mkdir -pv /data/gitea/conf
+
+            set -x
+            chown 1000:1000 /data
+            mkdir -p /data/git/.ssh
+            chmod -R 700 /data/git/.ssh
+            [ ! -d /data/gitea/conf ] && mkdir -p /data/gitea/conf
 
             # prepare temp directory structure
-            mkdir -pv "${GITEA_TEMP}"
-            chown -v 1000:1000 "${GITEA_TEMP}"
-            chmod -v ug+rwx "${GITEA_TEMP}"
+            mkdir -p "${GITEA_TEMP}"
+            chown 1000:1000 "${GITEA_TEMP}"
+            chmod ug+rwx "${GITEA_TEMP}"
 
             if [ ! -d "${GNUPGHOME}" ]; then
-              mkdir -pv "${GNUPGHOME}"
-              chmod -v 700 "${GNUPGHOME}"
-              chown -v 1000:1000 "${GNUPGHOME}"
+              mkdir -p "${GNUPGHOME}"
+              chmod 700 "${GNUPGHOME}"
+              chown 1000:1000 "${GNUPGHOME}"
             fi

unittests/servicemonitor/basic.yaml

@@ -1,89 +0,0 @@
-suite: ServiceMonitor template (basic)
-release:
-  name: gitea-unittests
-  namespace: testing
-templates:
-  - templates/gitea/servicemonitor.yaml
-tests:
-  - it: skips rendering by default
-    asserts:
-      - hasDocuments:
-          count: 0
-  - it: renders default ServiceMonitor object with gitea.metrics.enabled=true
-    set:
-      gitea.metrics.enabled: true
-    asserts:
-      - hasDocuments:
-          count: 0
-  - it: renders default ServiceMonitor object with gitea.metrics.serviceMonitor.enabled=true
-    set:
-      gitea.metrics.serviceMonitor.enabled: true
-    asserts:
-      - hasDocuments:
-          count: 0
-  - it: renders defaults
-    set:
-      gitea.metrics.enabled: true
-      gitea.metrics.serviceMonitor.enabled: true
-    asserts:
-      - hasDocuments:
-          count: 1
-      - containsDocument:
-          kind: ServiceMonitor
-          apiVersion: monitoring.coreos.com/v1
-          name: gitea-unittests
-      - notExists:
-          path: metadata.annotations
-      - notExists:
-          path: spec.endpoints[0].interval
-      - equal:
-          path: spec.endpoints[0].port
-          value: http
-      - notExists:
-          path: spec.endpoints[0].scheme
-      - notExists:
-          path: spec.endpoints[0].scrapeTimeout
-      - notExists:
-          path: spec.endpoints[0].tlsConfig
-  - it: renders custom scrape interval
-    set:
-      gitea.metrics.enabled: true
-      gitea.metrics.serviceMonitor.enabled: true
-      gitea.metrics.serviceMonitor.interval: 30s
-      gitea.metrics.serviceMonitor.scrapeTimeout: 5s
-    asserts:
-      - equal:
-          path: spec.endpoints[0].interval
-          value: 30s
-      - equal:
-          path: spec.endpoints[0].scrapeTimeout
-          value: 5s
-  - it: renders custom tls config
-    set:
-      gitea.metrics.enabled: true
-      gitea.metrics.serviceMonitor.enabled: true
-      gitea.metrics.serviceMonitor.scheme: https
-      gitea.metrics.serviceMonitor.tlsConfig.caFile: /etc/prometheus/tls/ca.crt
-      gitea.metrics.serviceMonitor.tlsConfig.certFile: /etc/prometheus/tls/tls.crt
-      gitea.metrics.serviceMonitor.tlsConfig.keyFile: /etc/prometheus/tls/tls.key
-      gitea.metrics.serviceMonitor.tlsConfig.insecureSkipVerify: false
-      gitea.metrics.serviceMonitor.tlsConfig.serverName: gitea-unittest
-    asserts:
-      - equal:
-          path: spec.endpoints[0].scheme
-          value: https
-      - equal:
-          path: spec.endpoints[0].tlsConfig.caFile
-          value: /etc/prometheus/tls/ca.crt
-      - equal:
-          path: spec.endpoints[0].tlsConfig.certFile
-          value: /etc/prometheus/tls/tls.crt
-      - equal:
-          path: spec.endpoints[0].tlsConfig.keyFile
-          value: /etc/prometheus/tls/tls.key
-      - equal:
-          path: spec.endpoints[0].tlsConfig.insecureSkipVerify
-          value: false
-      - equal:
-          path: spec.endpoints[0].tlsConfig.serverName
-          value: gitea-unittest

values.yaml

@@ -356,23 +356,13 @@ gitea:
     passwordMode: keepUpdated
 
   ## @param gitea.metrics.enabled Enable Gitea metrics
-  ## @param gitea.metrics.serviceMonitor.enabled Enable Gitea metrics service monitor. Requires, that `gitea.metrics.enabled` is also set to true, to enable metrics generally.
-  ## @param gitea.metrics.serviceMonitor.interval Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.
-  ## @param gitea.metrics.serviceMonitor.relabelings RelabelConfigs to apply to samples before scraping.
-  ## @param gitea.metrics.serviceMonitor.scheme HTTP scheme to use for scraping. For example `http` or `https`. Default is http.
-  ## @param gitea.metrics.serviceMonitor.scrapeTimeout Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.
-  ## @param gitea.metrics.serviceMonitor.tlsConfig TLS configuration to use when scraping the metric endpoint by Prometheus.
+  ## @param gitea.metrics.serviceMonitor.enabled Enable Gitea metrics service monitor
   metrics:
     enabled: false
     serviceMonitor:
       enabled: false
       #  additionalLabels:
       #    prometheus-release: prom1
-      interval: ""
-      relabelings: []
-      scheme: ""
-      scrapeTimeout: ""
-      tlsConfig: {}
 
   ## @param gitea.ldap LDAP configuration
   ldap:
@@ -498,8 +488,6 @@ gitea:
 
 ## @section redis-cluster
 ## @param redis-cluster.enabled Enable redis cluster
-# ⚠️ The redis charts do not work well with special characters in the password (<https://gitea.com/gitea/helm-chart/issues/690>).
-# Consider omitting such or open an issue in the Bitnami repo and let us know once this got fixed.
 ## @param redis-cluster.usePassword Whether to use password authentication
 ## @param redis-cluster.cluster.nodes Number of redis cluster master nodes
 ## @param redis-cluster.cluster.replicas Number of redis cluster master node replicas
@@ -516,8 +504,6 @@ redis-cluster:
 ## @section redis
 ## @param redis.enabled Enable redis standalone or replicated
 ## @param redis.architecture Whether to use standalone or replication
-# ⚠️ The redis charts do not work well with special characters in the password (<https://gitea.com/gitea/helm-chart/issues/690>).
-# Consider omitting such or open an issue in the Bitnami repo and let us know once this got fixed.
 ## @param redis.global.redis.password Required password
 ## @param redis.master.count Number of Redis master instances to deploy
 ## @descriptionStart
@@ -543,7 +529,7 @@ redis:
 ## @param postgresql-ha.postgresql.postgresPassword postgres Password
 ## @param postgresql-ha.pgpool.adminPassword pgpool adminPassword
 ## @param postgresql-ha.service.ports.postgresql PostgreSQL service port (overrides `service.ports.postgresql`)
-## @param postgresql-ha.persistence.size PVC Storage Request for PostgreSQL HA volume
+## @param postgresql-ha.primary.persistence.size PVC Storage Request for PostgreSQL HA volume
 postgresql-ha:
   global:
     postgresql:
@@ -560,6 +546,7 @@ postgresql-ha:
   service:
     ports:
       postgresql: 5432
+  primary:
     persistence:
       size: 10Gi