ci: fix release workflow

.gitea/workflows/release-version.yml

@@ -10,73 +10,77 @@ env:
   HELM_VERSION: "3.17.3"
 
 jobs:
-  generate-chart-publish:
+  # generate-chart-publish:
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: install tools
+  #     - name: install tools
-        run: |
+  #       run: |
-          apt update -y
+  #         apt update -y
-          apt install -y curl ca-certificates curl gnupg
+  #         apt install -y curl ca-certificates curl gnupg
-          # helm
+  #         # helm
-          curl -O https://get.helm.sh/helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+  #         curl -O https://get.helm.sh/helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
-          tar -xzf helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+  #         tar -xzf helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
-          mv linux-amd64/helm /usr/local/bin/
+  #         mv linux-amd64/helm /usr/local/bin/
-          rm -rf linux-amd64 helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
+  #         rm -rf linux-amd64 helm-v${{ env.HELM_VERSION }}-linux-amd64.tar.gz
-          helm version
+  #         helm version
-          # docker
+  #         # docker
-          install -m 0755 -d /etc/apt/keyrings
+  #         install -m 0755 -d /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+  #         curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          chmod a+r /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/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+  #         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 update -y
-          apt install -y python3 python3-pip apt-transport-https docker-ce-cli
+  #         apt install -y python3 python3-pip apt-transport-https docker-ce-cli
-          pip install awscli --break-system-packages
+  #         pip install awscli --break-system-packages
 
-      - name: Import GPG key
+  #     - name: Import GPG key
-        id: import_gpg
+  #       id: import_gpg
-        uses: https://github.com/crazy-max/ghaction-import-gpg@v6
+  #       uses: https://github.com/crazy-max/ghaction-import-gpg@v6
-        with:
+  #       with:
-          gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
+  #         gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
-          passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
+  #         passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
-          fingerprint: CC64B1DB67ABBEECAB24B6455FC346329753F4B0
+  #         fingerprint: CC64B1DB67ABBEECAB24B6455FC346329753F4B0
 
-      # Using helm gpg plugin as 'helm package --sign' has issues with gpg2: https://github.com/helm/helm/issues/2843
+  #     # Using helm gpg plugin as 'helm package --sign' has issues with gpg2: https://github.com/helm/helm/issues/2843
-      - name: package chart
+  #     - name: package chart
-        run: |
+  #       run: |
-          echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | docker login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} --password-stdin
+  #         echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | docker login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} --password-stdin
-          # FIXME: use upstream after https://github.com/technosophos/helm-gpg/issues/1 is solved
+  #         # 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 plugin install https://github.com/pat-s/helm-gpg
-          helm dependency build
+  #         helm dependency build
-          helm package --version "${GITHUB_REF#refs/tags/v}" ./
+  #         helm package --version "${GITHUB_REF#refs/tags/v}" ./
-          mkdir gitea
+  #         mkdir gitea
-          mv gitea*.tgz gitea/
+  #         mv gitea*.tgz gitea/
-          curl -s -L -o gitea/index.yaml https://dl.gitea.com/charts/index.yaml
+  #         curl -s -L -o gitea/index.yaml https://dl.gitea.com/charts/index.yaml
-          helm repo index gitea/ --url https://dl.gitea.com/charts --merge gitea/index.yaml
+  #         helm repo index gitea/ --url https://dl.gitea.com/charts --merge gitea/index.yaml
-          # push to dockerhub
+  #         # push to dockerhub
-          echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | helm registry login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} registry-1.docker.io --password-stdin
+  #         echo ${{ secrets.DOCKER_CHARTS_PASSWORD }} | helm registry login -u ${{ secrets.DOCKER_CHARTS_USERNAME }} registry-1.docker.io --password-stdin
-          helm push gitea/gitea-${GITHUB_REF#refs/tags/v}.tgz oci://registry-1.docker.io/giteacharts
+  #         helm push gitea/gitea-${GITHUB_REF#refs/tags/v}.tgz oci://registry-1.docker.io/giteacharts
-          helm registry logout registry-1.docker.io
+  #         helm registry logout registry-1.docker.io
 
-      - name: aws credential configure
+  #     - name: aws credential configure
-        uses: https://github.com/aws-actions/configure-aws-credentials@v4
+  #       uses: https://github.com/aws-actions/configure-aws-credentials@v4
-        with:
+  #       with:
-          aws-access-key-id: ${{ secrets.AWS_KEY_ID }}
+  #         aws-access-key-id: ${{ secrets.AWS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  #         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
+  #         aws-region: ${{ secrets.AWS_REGION }}
 
-      - name: Copy files to S3 and clear cache
+  #     - name: Copy files to S3 and clear cache
-        run: |
+  #       run: |
-          aws s3 sync gitea/ s3://${{ secrets.AWS_S3_BUCKET}}/charts/
+  #         aws s3 sync gitea/ s3://${{ secrets.AWS_S3_BUCKET}}/charts/
 
   release-gitea:
-    needs: generate-chart-publish
+    # needs: generate-chart-publish
     runs-on: ubuntu-latest
     container: docker.io/thegeeklab/git-sv:2.0.1
     steps:
+      - name: install tools
+        run: |
+          apk add -q --update --no-cache nodejs
       - uses: actions/checkout@v4
         with:
           fetch-tags: true
+          fetch-depth: 0
 
       - name: Create changelog
         run: |
@@ -89,4 +93,4 @@ jobs:
         uses: https://github.com/akkuman/gitea-release-action@v1
         with:
           body_path: CHANGELOG.md
-          token: "${{secrets.ISSUE_RW_TOKEN}}"
+          token: "${{ secrets.RELEASE_TOKEN }}"

README.md

@@ -990,15 +990,15 @@ To comply with the Gitea helm chart definition of the digest parameter, a "custo
 
 ### Ingress
 
-| Name                             | Description                    | Value             |
+| Name                             | Description                     | Value             |
-| -------------------------------- | ------------------------------ | ----------------- |
+| -------------------------------- | ------------------------------- | ----------------- |
-| `ingress.enabled`                | Enable ingress                 | `false`           |
+| `ingress.enabled`                | Enable ingress                  | `false`           |
-| `ingress.className`              | DEPRECATED: Ingress class name | `""`              |
+| `ingress.className`              | DEPRECATED: Ingress class name. | `""`              |
-| `ingress.pathType`               | Ingress Path Type              | `Prefix`          |
+| `ingress.pathType`               | Ingress Path Type               | `Prefix`          |
-| `ingress.annotations`            | Ingress annotations            | `{}`              |
+| `ingress.annotations`            | Ingress annotations             | `{}`              |
-| `ingress.hosts[0].host`          | Default Ingress host           | `git.example.com` |
+| `ingress.hosts[0].host`          | Default Ingress host            | `git.example.com` |
-| `ingress.hosts[0].paths[0].path` | Default Ingress path           | `/`               |
+| `ingress.hosts[0].paths[0].path` | Default Ingress path            | `/`               |
-| `ingress.tls`                    | Ingress tls settings           | `[]`              |
+| `ingress.tls`                    | Ingress tls settings            | `[]`              |
 
 ### deployment
 
@@ -1212,8 +1212,19 @@ If you miss this, blindly upgrading may delete your Postgres instance and you ma
 **Breaking changes**
 <!-- prettier-ignore-end -->
 
+- Outsourced "Actions" related configuration.
+  To deploy and use "Actions", please see the new dedicated chart at <https://gitea.com/gitea/helm-actions>.
+  It is maintained by a seperate maintainer group and hasn't seen a release yet (at the time of the 12.0 release).
+  Feel encouraged to contribute if "Actions" is important to you!
+  
+  This change was made to avoid overloading the existing helm chart, which is already quite large in size and configuration options.
+  In addition, the existing maintainers team was not actively using "Actions" which slowed down development and community contributions.
+  While the new chart is still young (and waiting for contributions! and maintainers), we believe that it is the best way moving forward for both parts.
 - Migrated from Redis/Redis-cluster to Valkey/Valkey-cluster charts (#775).
-  While marked as breaking, there should be no need to migrate data explicity. Cache will start to refill automatically.
+  While marked as breaking, there is no need to migrate data.
+  The cache will start to refill automatically.
+- Migrated ingress from `networking.k8s.io/v1beta` to `networking.k8s.io/v1`.
+  We didn't make any changes to the syntax, so the upgrade should be seamless.
 
 </details>
 

templates/gitea/ingress.yaml

@@ -13,11 +13,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
-{{- if .Values.ingress.className }}
   ingressClassName: {{ tpl .Values.ingress.className . }}
-{{- else if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ tpl .Values.ingress.ingressClassName . }}
-{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

unittests/helm/ingress/basic.yaml

@@ -53,7 +53,7 @@ tests:
   - it: Ingress Class using TPL
     set:
       global.ingress.className: "ingress-class"
-      ingress.ingressClassName: "{{ .Values.global.ingress.className }}"
+      ingress.className: "{{ .Values.global.ingress.className }}"
       ingress.enabled: true
       ingress.hosts[0].host: "some-host"
       ingress.tls:

values.yaml

@@ -157,7 +157,7 @@ service:
 
 ## @section Ingress
 ## @param ingress.enabled Enable ingress
-## @param ingress.className DEPRECATED: Ingress class name
+## @param ingress.className DEPRECATED: Ingress class name.
 ## @param ingress.pathType Ingress Path Type
 ## @param ingress.annotations Ingress annotations
 ## @param ingress.hosts[0].host Default Ingress host