soo-rnd
/
infra-report
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use dynamic chart version per commit for ArgoCD auto-sync
CI/CD / build-and-push (push) Successful in 9s Details

This commit is contained in:
Cloud User 2026-03-16 11:17:49 +09:00
parent 03629431fd
commit ed63d248c3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitea/workflows/ci.yaml
View File

@ -15,15 +15,17 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set image tag - name: Set image tag and chart version
id: tag id: tag
run: | run: |
SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-7)
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
else else
echo "TAG=sha-$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_ENV echo "TAG=sha-${SHORT_SHA}" >> $GITHUB_ENV
fi fi
echo "IMAGE_NAME=${{ secrets.REGISTRY_URL }}/infra/infra-report" >> $GITHUB_ENV echo "IMAGE_NAME=${{ secrets.REGISTRY_URL }}/infra/infra-report" >> $GITHUB_ENV
echo "CHART_VERSION=0.1.0-${SHORT_SHA}" >> $GITHUB_ENV
- name: Login to Harbor - name: Login to Harbor
run: | run: |
@ -43,9 +45,10 @@ jobs:
- name: Package Helm chart - name: Package Helm chart
run: | run: |
sed -i "s/appVersion: .*/appVersion: \"${{ env.TAG }}\"/" charts/infra-report/Chart.yaml sed -i "s/appVersion: .*/appVersion: \"${{ env.TAG }}\"/" charts/infra-report/Chart.yaml
helm package charts/infra-report --version 0.1.0 --app-version ${{ env.TAG }} sed -i "s/version: .*/version: ${{ env.CHART_VERSION }}/" charts/infra-report/Chart.yaml
helm package charts/infra-report
- name: Push Helm chart to Harbor (OCI) - name: Push Helm chart to Harbor (OCI)
run: | run: |
echo '${{ secrets.REGISTRY_PASSWORD }}' | helm registry login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USER }} --password-stdin echo '${{ secrets.REGISTRY_PASSWORD }}' | helm registry login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
helm push ${CHART_NAME}-0.1.0.tgz oci://${{ secrets.REGISTRY_URL }}/infra helm push ${CHART_NAME}-${{ env.CHART_VERSION }}.tgz oci://${{ secrets.REGISTRY_URL }}/infra

2
charts/infra-report/templates/deployment.yaml
View File

@ -22,7 +22,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- containerPort: {{ .Values.service.targetPort }} - containerPort: {{ .Values.service.targetPort }}