.gitea/workflows/release-version.yml aktualisiert

.gitea/workflows/changelog.yml

@@ -8,12 +8,12 @@ on:
 jobs:
   changelog:
     runs-on: ubuntu-latest
-    container: docker.io/thegeeklab/git-sv:2.0.5
+    container: docker.io/thegeeklab/git-sv:1.0.12
     steps:
       - name: install tools
         run: |
           apk add -q --update --no-cache nodejs curl jq sed
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Generate upcoming changelog

.gitea/workflows/commitlint.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     container: commitlint/commitlint:19.7.1
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: check PR title
         run: |
           echo "${{ gitea.event.pull_request.title }}" | commitlint --config .commitlintrc.json

.gitea/workflows/release-version.yml

@@ -1,70 +1,68 @@
-name: generate-chart
+name: check-secrets
 
 on:
   push:
-    tags:
-      - "*"
-
-env:
-  # renovate: datasource=docker depName=alpine/helm
-  HELM_VERSION: "3.17.1"
 
 jobs:
-  generate-chart-publish:
+  check-secrets:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
-      - name: install tools
+      
+      - name: Check all required secrets
         run: |
-          apt update -y
+          echo "=== Checking availability of required secrets ==="
-          apt install -y curl ca-certificates curl gnupg
+          
-          # helm
+          # List of all secrets used in the original workflow
-          curl -O https://get.helm.sh/helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+          SECRETS=(
-          tar -xzf helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+            "GPGSIGN_KEY"
-          mv linux-amd64/helm /usr/local/bin/
+            "GPGSIGN_PASSPHRASE"
-          rm -rf linux-amd64 helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+            "DOCKER_CHARTS_PASSWORD"
-          helm version
+            "DOCKER_CHARTS_USERNAME"
-          # docker
+            "AWS_KEY_ID"
-          install -m 0755 -d /etc/apt/keyrings
+            "AWS_SECRET_ACCESS_KEY"
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            "AWS_REGION"
-          chmod a+r /etc/apt/keyrings/docker.gpg
+            "AWS_S3_BUCKET"
-          echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          )
-          apt update -y
+          
-          apt install -y python3 python3-pip apt-transport-https docker-ce-cli
+          MISSING_SECRETS=()
-          pip install awscli --break-system-packages
+          AVAILABLE_SECRETS=()
-
+          
-      - name: Import GPG key
+          for secret in "${SECRETS[@]}"; do
-        id: import_gpg
+            # Check if secret is set (not empty)
-        uses: https://github.com/crazy-max/ghaction-import-gpg@v6
+            if [ -z "${!secret:-}" ]; then
-        with:
+              echo "❌ Secret '$secret' is NOT available or empty"
-          gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
+              MISSING_SECRETS+=("$secret")
-          passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
+            else
-          fingerprint: CC64B1DB67ABBEECAB24B6455FC346329753F4B0
+              echo "✅ Secret '$secret' is available"
-
+              AVAILABLE_SECRETS+=("$secret")
-      # Using helm gpg plugin as 'helm package --sign' has issues with gpg2: https://github.com/helm/helm/issues/2843
+            fi
-      - name: package chart
+          done
-        run: |
+          
-          echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | docker login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} --password-stdin
+          echo ""
-          # FIXME: use upstream after https://github.com/technosophos/helm-gpg/issues/1 is solved
+          echo "=== Summary ==="
-          helm plugin install https://github.com/pat-s/helm-gpg
+          echo "Available secrets: ${#AVAILABLE_SECRETS[@]}"
-          helm dependency build
+          echo "Missing secrets: ${#MISSING_SECRETS[@]}"
-          helm package --version "${GITHUB_REF#refs/tags/v}" ./
+          
-          mkdir actions
+          if [ ${#MISSING_SECRETS[@]} -gt 0 ]; then
-          mv actions*.tgz actions/
+            echo ""
-          curl -s -L -o actions/index.yaml https://dl.gitea.com/charts/index.yaml
+            echo "Missing secrets:"
-          helm repo index actions/ --url https://dl.gitea.com/charts --merge actions/index.yaml
+            for secret in "${MISSING_SECRETS[@]}"; do
-          # push to dockerhub
+              echo "  - $secret"
-          echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | helm registry login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} registry-1.docker.io --password-stdin
+            done
-          helm push actions/actions-${GITHUB_REF#refs/tags/v}.tgz oci://registry-1.docker.io/giteacharts
+            echo ""
-          helm registry logout registry-1.docker.io
+            echo "❌ Some secrets are missing. Please configure them in repository settings."
-
+            exit 1
-      - name: aws credential configure
+          else
-        uses: https://github.com/aws-actions/configure-aws-credentials@v5
+            echo ""
-        with:
+            echo "✅ All required secrets are available!"
-          aws-access-key-id: ${{ secrets.AWS_KEY_ID }}
+          fi
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
-          aws-region: ${{ secrets.AWS_REGION }}
+          GPGSIGN_KEY: ${{ secrets.GPGSIGN_KEY }}
-
+          GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
-      - name: Copy files to S3 and clear cache
+          DOCKER_CHARTS_PASSWORD: ${{ secrets.DOCKER_CHARTS_PASSWORD }}
-        run: |
+          DOCKER_CHARTS_USERNAME: ${{ secrets.DOCKER_CHARTS_USERNAME }}
-          aws s3 sync actions/ s3://${{ secrets.AWS_S3_BUCKET}}/charts/
+          AWS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}

.gitea/workflows/shellcheck.yml

@@ -9,6 +9,6 @@ jobs:
   shellcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4.2.2
       - run: apt update --yes && apt install --yes shellcheck
       - run: find . -type f -name "*.sh" -exec shellcheck -a {} \;

.gitea/workflows/test-pr.yml

@@ -25,7 +25,7 @@ jobs:
         uses: pnpm/action-setup@v4
         with:
           version: 10
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: install chart dependencies
         run: helm dependency build
       - name: lint

CODEOWNERS

@@ -1 +0,0 @@
-* @DaanSelen @volker.raschek @ChristopherHX

Chart.yaml

@@ -13,18 +13,7 @@ keywords:
 sources:
   - https://gitea.com/gitea/helm-actions
   - https://gitea.com/gitea/act
-
+# FIXME:
-maintainers:
+# maintainers:
-  # https://gitea.com/DaanSelen
-  - name: Daan Selen
-    email: dselen@nerthus.nl
-
-  # https://gitea.com/volker.raschek
-  - name: Markus Pesch
-    email: markus.pesch+apps@cryptic.systems
-
-  # https://gitea.com/ChristopherHX
-  - name: Christopher Homberger
-    email: christopher.homberger@web.de
 
 dependencies: []

README.md

@@ -6,10 +6,6 @@ The parameters which can be used to customize the deployment are described below
 
 If you want to propose a new feature or mechanism, submit an [issue here](https://gitea.com/gitea/helm-actions/issues).
 
-## Docs
-
-[Docs](./docs/README.md)
-
 ## Rootless Defaults
 
 If `.Values.image.rootless: true`, then the following will occur. In case you use `.Values.image.fullOverride`, check that this works in your image:
@@ -34,12 +30,12 @@ If `.Values.image.rootless: true`, then the following will occur. In case you us
 | `statefulset.affinity`                    | Affinity for the statefulset                                                                                                                | `{}`                           |
 | `statefulset.extraVolumes`                | Extra volumes for the statefulset                                                                                                           | `[]`                           |
 | `statefulset.actRunner.repository`        | The Gitea act runner image                                                                                                                  | `gitea/act_runner`             |
-| `statefulset.actRunner.tag`               | The Gitea act runner tag                                                                                                                    | `0.2.13`                       |
+| `statefulset.actRunner.tag`               | The Gitea act runner tag                                                                                                                    | `0.2.11`                       |
 | `statefulset.actRunner.pullPolicy`        | The Gitea act runner pullPolicy                                                                                                             | `IfNotPresent`                 |
 | `statefulset.actRunner.extraVolumeMounts` | Allows mounting extra volumes in the act runner container                                                                                   | `[]`                           |
 | `statefulset.actRunner.config`            | Act runner custom configuration. See [Act Runner documentation](https://docs.gitea.com/usage/actions/act-runner#configuration) for details. | `Too complex. See values.yaml` |
 | `statefulset.dind.repository`             | The Docker-in-Docker image                                                                                                                  | `docker`                       |
-| `statefulset.dind.tag`                    | The Docker-in-Docker image tag                                                                                                              | `28.3.3-dind`                  |
+| `statefulset.dind.tag`                    | The Docker-in-Docker image tag                                                                                                              | `25.0.2-dind`                  |
 | `statefulset.dind.pullPolicy`             | The Docker-in-Docker pullPolicy                                                                                                             | `IfNotPresent`                 |
 | `statefulset.dind.extraVolumeMounts`      | Allows mounting extra volumes in the Docker-in-Docker container                                                                             | `[]`                           |
 | `statefulset.dind.extraEnvs`              | Allows adding custom environment variables, such as `DOCKER_IPTABLES_LEGACY`                                                                | `[]`                           |

docs/README.md

@@ -1,3 +0,0 @@
-# Gitea Actions Helm Chart Docs
-
-- [Share dind with job container](share-dind-with-job-container.md)

docs/share-dind-with-job-container.md

@@ -1,36 +0,0 @@
-# Share dind with job container
-
-You can weaken isolation and allow jobs to call docker commands.
-
-## Limitations
-
-- Docker bind mounts like `-v /path/on/self/container:/path/to/new/container` do not work, because they are going to mount the path from the dind container
-- Docker port expose to local host `-e 80:8080` is not going to work
-
-## Example Values
-
-```yaml
-enabled: true
-statefulset:
-  actRunner:
-    # See full example here: https://gitea.com/gitea/act_runner/src/branch/main/internal/pkg/config/config.example.yaml
-    config: |
-      log:
-        level: debug
-      cache:
-        enabled: false
-      container:
-        valid_volumes:
-        - /var/run/docker.sock
-        options: -v /var/run/docker.sock:/var/run/docker.sock
-
-## Specify an existing token secret
-##
-existingSecret: "runner-token2"
-existingSecretKey: "token"
-
-## Specify the root URL of the Gitea instance
-giteaRootURL: "http://192.168.1.2:3000"
-```
-
-Now you can run docker commands inside your jobs.

renovate.json5

@@ -9,19 +9,19 @@
   labels: [
     'kind/dependency',
   ],
-  digest: {
+  "digest": {
-    automerge: true,
+    "automerge": true
   },
   automergeStrategy: 'squash',
   'git-submodules': {
-    enabled: true,
+    'enabled': true
   },
   customManagers: [
     {
       description: 'Gitea-version of https://docs.renovatebot.com/presets-regexManagers/#regexmanagersgithubactionsversions',
       customType: 'regex',
-      managerFilePatterns: [
+      fileMatch: [
-        '/.gitea/workflows/.+\\.ya?ml$/',
+        '.gitea/workflows/.+\\.ya?ml$',
       ],
       matchStrings: [
         '# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*["\']?(?<currentValue>.+?)["\']?\\s',
@@ -30,9 +30,7 @@
     {
       description: 'Detect helm-unittest yaml schema file',
       customType: 'regex',
-      managerFilePatterns: [
+      fileMatch: ['.vscode/settings\\.json$'],
-        '/.vscode/settings\\.json$/',
-      ],
       matchStrings: [
         'https:\\/\\/raw\\.githubusercontent\\.com\\/(?<depName>[^\\s]+?)\\/(?<currentValue>v[0-9.]+?)\\/schema\\/helm-testsuite\\.json',
       ],

templates/statefulset.yaml

@@ -54,7 +54,7 @@ spec:
             - name: DOCKER_TLS_VERIFY
               value: "1"
             - name: DOCKER_CERT_PATH
-              value: /certs/client
+              value: /certs/server
             - name: GITEA_RUNNER_REGISTRATION_TOKEN
               valueFrom:
                 secretKeyRef:
@@ -70,7 +70,7 @@ spec:
             - mountPath: /actrunner/config.yaml
               name: act-runner-config
               subPath: config.yaml
-            - mountPath: /certs/client
+            - mountPath: /certs/server
               name: docker-certs
             - mountPath: /data
               name: data-act-runner
@@ -86,7 +86,7 @@ spec:
             - name: DOCKER_TLS_VERIFY
               value: "1"
             - name: DOCKER_CERT_PATH
-              value: /certs/client
+              value: /certs/server
             {{- if .Values.statefulset.dind.extraEnvs }}
             {{- toYaml .Values.statefulset.dind.extraEnvs | nindent 12 }}
             {{- end }}
@@ -95,7 +95,7 @@ spec:
           resources:
             {{- toYaml .Values.statefulset.resources | nindent 12 }}
           volumeMounts:
-            - mountPath: /certs/client
+            - mountPath: /certs/server
               name: docker-certs
             {{- with .Values.statefulset.dind.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
@@ -112,10 +112,6 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.statefulset.dnsConfig }}
-      dnsConfig:
-        {{- toYaml .Values.statefulset.dnsConfig | nindent 8 }}
-      {{- end }}
       volumes:
         - name: act-runner-config
           configMap:

unittests/helm/statefulset.yaml

@@ -69,7 +69,7 @@ tests:
           name: gitea-unittests-actions-act-runner
       - equal:
           path: spec.template.metadata.annotations["checksum/config"]
-          value: "2bafbf04b3c4293c8ddf895ae3d908e14176ee54a6c724c8cf5b2a1e43c6ece7"
+          value: "7566d9c60261bf8cbff6a6936fc7aead96cec540d8c793d142a5ad4664c56ba5"
   - it: renders a StatefulSet http (with correct GITEA_INSTANCE_URL env from giteaRootURL)
     template: templates/statefulset.yaml
     set:

values.yaml

@@ -10,7 +10,6 @@
 ## @param statefulset.resources Act runner resources
 ## @param statefulset.nodeSelector NodeSelector for the statefulset
 ## @param statefulset.tolerations Tolerations for the statefulset
-## @param statefulset.dnsConfig dnsConfig for the statefulset
 ## @param statefulset.affinity Affinity for the statefulset
 ## @param statefulset.extraVolumes Extra volumes for the statefulset
 ## @param statefulset.actRunner.repository The Gitea act runner image
@@ -35,13 +34,12 @@ statefulset:
   resources: {}
   nodeSelector: {}
   tolerations: []
-  dnsConfig: {}
   affinity: {}
   extraVolumes: []
 
   actRunner:
     repository: gitea/act_runner
-    tag: 0.2.13
+    tag: 0.2.11
     pullPolicy: IfNotPresent
     extraVolumeMounts: []
 
@@ -51,13 +49,10 @@ statefulset:
         level: debug
       cache:
         enabled: false
-      container:
-        require_docker: true
-        docker_timeout: 300s
 
   dind:
     repository: docker
-    tag: 28.3.3-dind
+    tag: 25.0.2-dind
     pullPolicy: IfNotPresent
     extraVolumeMounts: []