Merge branch 'main' into main

2024-06-01 18:01:24 +05:30 · 2023-10-10 14:49:59 +00:00 · 2023-10-10 14:49:59 +00:00 · 3297d86e94
parent 3645ddd276 7d2a375685
commit 3297d86e94
8 changed files with 106 additions and 69 deletions
--- a/.gitea/workflows/release-version.yml
+++ b/.gitea/workflows/release-version.yml
@ -9,15 +9,21 @@ jobs:
  generate-chart-publish:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: install tools
        run: |
          apt update -y
-          apt install -y curl
+          apt install -y curl ca-certificates curl gnupg
+          # helm
          curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null
          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list
+          # docker
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          chmod a+r /etc/apt/keyrings/docker.gpg
+          echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
          apt update -y
-          apt install -y python helm python3-pip apt-transport-https
+          apt install -y python helm python3-pip apt-transport-https docker-ce-cli
          pip install awscli

      - name: Import GPG key
@ -31,6 +37,7 @@ jobs:
      # Using helm gpg plugin as 'helm package --sign' has issues with gpg2: https://github.com/helm/helm/issues/2843
      - name: package chart
        run: |
+          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
          # FIXME: use upstream after https://github.com/technosophos/helm-gpg/issues/1 is solved
          helm plugin install https://github.com/pat-s/helm-gpg
          helm dependency update
--- a/.gitea/workflows/test-pr.yml
+++ b/.gitea/workflows/test-pr.yml
@ -7,7 +7,7 @@ jobs:
  check-and-test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: install tools
        run: |
          apt update -y
--- a/Chart.lock
+++ b/Chart.lock
@ -1,12 +1,12 @@
 dependencies:
 - name: postgresql
  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 12.10.1
+  version: 12.12.5
 - name: postgresql-ha
  repository: oci://registry-1.docker.io/bitnamicharts
  version: 11.9.2
 - name: redis-cluster
  repository: oci://registry-1.docker.io/bitnamicharts
  version: 9.0.4
-digest: sha256:eaa681df119bef7ef7973d8b13eea28e03c86e72c25a03648e4fc0d4b603ff6e
-generated: "2023-09-12T00:03:47.823115644Z"
+digest: sha256:aba0798b2d882a0e44119cc1e586278c3433227d65c37f9035e835ab3c554965
+generated: "2023-09-22T19:18:56.559259773Z"
--- a/Chart.yaml
+++ b/Chart.yaml
@ -1,50 +1,50 @@
-apiVersion: v2
-name: gitea
-description: Gitea Helm chart for Kubernetes
-type: application
-version: 0.0.0
-appVersion: 1.20.4
-icon: https://gitea.com/assets/img/logo.svg
-
-keywords:
-  - git
-  - issue tracker
-  - code review
-  - wiki
-  - gitea
-  - gogs
-sources:
-  - https://gitea.com/gitea/helm-chart
-  - https://github.com/go-gitea/gitea
-  - https://hub.docker.com/r/gitea/gitea/
-maintainers:
-  - name: Charlie Drage
-    email: charlie@charliedrage.com
-  - name: Gitea Authors
-    email: maintainers@gitea.io
-  - name: Konrad Lother
-    email: konrad.lother@novum-rgi.de
-  - name: Lucas Hahn
-    email: lucas.hahn@novum-rgi.de
-  - name: Steven Kriegler
-    email: sk.bunsenbrenner@gmail.com
-  - name: Patrick Schratz
-    email: patrick.schratz@gmail.com
-
-# Bitnami charts are served from GitHub CDN - See https://github.com/bitnami/charts/issues/10539 for details
-dependencies:
-  #https://github.com/bitnami/charts/blob/main/bitnami/postgresql
-  - name: postgresql
-    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 12.10.1
-    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: 11.9.2
-    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: 9.0.4
-    condition: redis-cluster.enabled
+apiVersion: v2
+name: gitea
+description: Gitea Helm chart for Kubernetes
+type: application
+version: 0.0.0
+appVersion: 1.20.5
+icon: https://gitea.com/assets/img/logo.svg
+
+keywords:
+  - git
+  - issue tracker
+  - code review
+  - wiki
+  - gitea
+  - gogs
+sources:
+  - https://gitea.com/gitea/helm-chart
+  - https://github.com/go-gitea/gitea
+  - https://hub.docker.com/r/gitea/gitea/
+maintainers:
+  - name: Charlie Drage
+    email: charlie@charliedrage.com
+  - name: Gitea Authors
+    email: maintainers@gitea.io
+  - name: Konrad Lother
+    email: konrad.lother@novum-rgi.de
+  - name: Lucas Hahn
+    email: lucas.hahn@novum-rgi.de
+  - name: Steven Kriegler
+    email: sk.bunsenbrenner@gmail.com
+  - name: Patrick Schratz
+    email: patrick.schratz@gmail.com
+
+# Bitnami charts are served from GitHub CDN - See https://github.com/bitnami/charts/issues/10539 for details
+dependencies:
+  #https://github.com/bitnami/charts/blob/main/bitnami/postgresql
+  - name: postgresql
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 12.12.5
+    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: 11.9.2
+    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: 9.0.4
+    condition: redis-cluster.enabled
--- a/README.md
+++ b/README.md
@ -27,6 +27,7 @@
 - [Metrics and profiling](#metrics-and-profiling)
 - [Pod annotations](#pod-annotations)
 - [Themes](#themes)
+- [Renovate](#renovate)
 - [Parameters](#parameters)
  - [Global](#global)
  - [strategy](#strategy)
@ -691,6 +692,34 @@ or natively via `kubectl`:
 kubectl create secret generic gitea-themes --from-file={{FULL-PATH-TO-CSS}} --namespace gitea
 ```

+## Renovate
+
+To be able to use a digest value which is automatically updated by `Renovate` a [customManager](https://docs.renovatebot.com/modules/manager/regex/) is required.
+Here's an examplary `values.yml` definition which makes use of a digest:
+
+```yaml
+image:
+  repository: gitea/gitea
+  tag: 1.20.2
+  digest: sha256:6e3b85a36653894d6741d0aefb41dfaac39044e028a42e0a520cc05ebd7bfc3f
+```
+
+By default Renovate adds digest after the `tag`.
+To comply with the Gitea helm chart definition of the digest parameter, a "customManagers" definition is required:
+
+```json
+"customManagers": [
+  {
+    "customType": "regex",
+    "description": "Apply an explicit gitea digest field match",
+    "fileMatch": ["values\\.ya?ml"],
+    "matchStrings": ["(?<depName>gitea\\/gitea)\\n(?<indentation>\\s+)tag: (?<currentValue>[^@].*?)\\n\\s+digest: (?<currentDigest>sha256:[a-f0-9]+)"],
+    "datasourceTemplate": "docker",
+    "autoReplaceStringTemplate": "{{depName}}\n{{indentation}}tag: {{newValue}}\n{{indentation}}digest: {{#if newDigest}}{{{newDigest}}}{{else}}{{{currentDigest}}}{{/if}}"
+  }
+]
+```
+
 ## Parameters

 ### Global
--- a/package-lock.json
+++ b/package-lock.json
@ -8,7 +8,7 @@
      "license": "MIT",
      "devDependencies": {
        "@bitnami/readme-generator-for-helm": "^2.5.0",
-        "markdownlint-cli": "^0.36.0"
+        "markdownlint-cli": "^0.37.0"
      },
      "engines": {
        "node": ">=16.0.0",
@ -399,9 +399,9 @@
      }
    },
    "node_modules/markdownlint": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.30.0.tgz",
-      "integrity": "sha512-nInuFvI/rEzanAOArW5490Ez4EYpB5ODqVM0mcDYCPx9DKJWCQqCgejjiCvbSeE7sjbDscVtZmwr665qpF5xGA==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.31.1.tgz",
+      "integrity": "sha512-CKMR2hgcIBrYlIUccDCOvi966PZ0kJExDrUi1R+oF9PvqQmCrTqjOsgIvf2403OmJ+CWomuzDoylr6KbuMyvHA==",
      "dev": true,
      "dependencies": {
        "markdown-it": "13.0.1",
@ -412,9 +412,9 @@
      }
    },
    "node_modules/markdownlint-cli": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.36.0.tgz",
-      "integrity": "sha512-h4WdqOam3+QOVOcJSOQuG8KvvN8dlS0OiJhbPwYWBk7VMZR40UtSSMIOpSP5B4EHPHg3W3ILSQUvqg1HNpTCxA==",
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.37.0.tgz",
+      "integrity": "sha512-hNKAc0bWBBuVhJbSWbUhRzavstiB4o1jh3JeSpwC4/dt6eJ54lRfYHRxVdzVp4qGWBKbeE6Pg490PFEfrKjqSg==",
      "dev": true,
      "dependencies": {
        "commander": "~11.0.0",
@ -423,7 +423,7 @@
        "ignore": "~5.2.4",
        "js-yaml": "^4.1.0",
        "jsonc-parser": "~3.2.0",
-        "markdownlint": "~0.30.0",
+        "markdownlint": "~0.31.1",
        "minimatch": "~9.0.3",
        "run-con": "~1.3.2"
      },
@ -453,9 +453,9 @@
      }
    },
    "node_modules/markdownlint-cli/node_modules/glob": {
-      "version": "10.3.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz",
-      "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.5.tgz",
+      "integrity": "sha512-bYUpUD7XDEHI4Q2O5a7PXGvyw4deKR70kHiDxzQbe925wbZknhOzUt2xBgTkYL6RBcVeXYuD9iNYeqoWbBZQnA==",
      "dev": true,
      "dependencies": {
        "foreground-child": "^3.1.0",
--- a/package.json
+++ b/package.json
@ -14,6 +14,6 @@
  },
  "devDependencies": {
    "@bitnami/readme-generator-for-helm": "^2.5.0",
-    "markdownlint-cli": "^0.36.0"
+    "markdownlint-cli": "^0.37.0"
  }
 }
--- a/renovate.json5
+++ b/renovate.json5
@ -7,6 +7,7 @@
      matchManagers: ["helmv3"],
      matchUpdateTypes: ["minor", "patch", "digest"],
      automerge: true,
+      automergeStrategy: "squash",
      extends: ["schedule:weekly"],
    },
  ],