From f9d529ac87c3bc03a56463c46a27eb3f08852c33 Mon Sep 17 00:00:00 2001 From: "d.viti" Date: Fri, 3 Oct 2025 02:31:23 +0200 Subject: [PATCH] Rename Helm chart to api7ee-demo-k8s - Changed chart name from api7ee to api7ee-demo-k8s in Chart.yaml - Renamed helm/api7ee directory to helm/api7ee-demo-k8s - Updated all references in build.yml workflow - Updated all references in helm-release.yml workflow - Updated main README.md with new chart name - Updated Helm chart README with new chart name - Verified all old references have been replaced - Chart packages correctly as api7ee-demo-k8s-{version}.tgz --- .gitea/workflows/build.yml | 16 +++++------ .gitea/workflows/helm-release.yml | 28 +++++++++---------- README.md | 8 +++--- helm/{api7ee => api7ee-demo-k8s}/.helmignore | 0 helm/{api7ee => api7ee-demo-k8s}/Chart.yaml | 2 +- helm/{api7ee => api7ee-demo-k8s}/README.md | 10 +++---- .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/certificate.yaml | 0 .../templates/configmap-adc.yaml | 0 .../templates/configmap.yaml | 0 .../templates/deployment-api.yaml | 0 .../templates/deployment-web.yaml | 0 .../templates/hpa-api.yaml | 0 .../templates/hpa-web.yaml | 0 .../templates/ingress.yaml | 0 .../templates/job-adc-sync.yaml | 0 .../templates/poddisruptionbudget.yaml | 0 .../templates/rbac-adc.yaml | 0 .../templates/secret-api7.yaml | 0 .../templates/secret.yaml | 0 .../templates/service-api.yaml | 0 .../templates/service-web.yaml | 0 .../templates/serviceaccount.yaml | 0 .../values-dev.yaml | 0 .../values-production.yaml | 0 helm/{api7ee => api7ee-demo-k8s}/values.yaml | 0 27 files changed, 32 insertions(+), 32 deletions(-) rename helm/{api7ee => api7ee-demo-k8s}/.helmignore (100%) rename helm/{api7ee => api7ee-demo-k8s}/Chart.yaml (94%) rename helm/{api7ee => api7ee-demo-k8s}/README.md (93%) rename helm/{api7ee => api7ee-demo-k8s}/templates/NOTES.txt (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/_helpers.tpl (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/certificate.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/configmap-adc.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/configmap.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/deployment-api.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/deployment-web.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/hpa-api.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/hpa-web.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/ingress.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/job-adc-sync.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/poddisruptionbudget.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/rbac-adc.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/secret-api7.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/secret.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/service-api.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/service-web.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/templates/serviceaccount.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/values-dev.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/values-production.yaml (100%) rename helm/{api7ee => api7ee-demo-k8s}/values.yaml (100%) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 89410a6..64c3bb3 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -97,26 +97,26 @@ jobs: - name: Lint Helm chart run: | - helm lint helm/api7ee/ + helm lint helm/api7ee-demo-k8s/ - name: Package Helm chart run: | # Get version from Chart.yaml - CHART_VERSION=$(grep '^version:' helm/api7ee/Chart.yaml | awk '{print $2}') + CHART_VERSION=$(grep '^version:' helm/api7ee-demo-k8s/Chart.yaml | awk '{print $2}') echo "Chart version: ${CHART_VERSION}" # Create a temporary copy of the chart for packaging - cp -r helm/api7ee /tmp/api7ee-chart + cp -r helm/api7ee-demo-k8s /tmp/api7ee-demo-k8s-chart # Update image registry and repository in the copy's values.yaml - sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" /tmp/api7ee-chart/values.yaml - sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" /tmp/api7ee-chart/values.yaml + sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" /tmp/api7ee-demo-k8s-chart/values.yaml + sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" /tmp/api7ee-demo-k8s-chart/values.yaml # Package the modified chart - helm package /tmp/api7ee-chart --version ${CHART_VERSION} + helm package /tmp/api7ee-demo-k8s-chart --version ${CHART_VERSION} # Store chart filename for later use - echo "CHART_FILE=api7ee-${CHART_VERSION}.tgz" >> $GITHUB_ENV + echo "CHART_FILE=api7ee-demo-k8s-${CHART_VERSION}.tgz" >> $GITHUB_ENV - name: Push Helm chart to Gitea Package Registry run: | @@ -142,4 +142,4 @@ jobs: echo " helm repo update" echo "" echo "To install the chart:" - echo " helm install my-api7ee api7ee/api7ee" + echo " helm install my-api7ee api7ee/api7ee-demo-k8s" diff --git a/.gitea/workflows/helm-release.yml b/.gitea/workflows/helm-release.yml index a91eb52..29d4c40 100644 --- a/.gitea/workflows/helm-release.yml +++ b/.gitea/workflows/helm-release.yml @@ -38,28 +38,28 @@ jobs: - name: Update Chart version run: | # Update Chart.yaml with the new version - sed -i "s/^version:.*/version: ${VERSION}/" helm/api7ee/Chart.yaml + sed -i "s/^version:.*/version: ${VERSION}/" helm/api7ee-demo-k8s/Chart.yaml # Update appVersion to match - sed -i "s/^appVersion:.*/appVersion: \"${VERSION}\"/" helm/api7ee/Chart.yaml + sed -i "s/^appVersion:.*/appVersion: \"${VERSION}\"/" helm/api7ee-demo-k8s/Chart.yaml # Update image tags in values.yaml to use this version - sed -i "s|tag: \"main\"|tag: \"v${VERSION}\"|g" helm/api7ee/values.yaml + sed -i "s|tag: \"main\"|tag: \"v${VERSION}\"|g" helm/api7ee-demo-k8s/values.yaml # Update registry and repository to Gitea values - sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" helm/api7ee/values.yaml - sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" helm/api7ee/values.yaml + sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" helm/api7ee-demo-k8s/values.yaml + sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" helm/api7ee-demo-k8s/values.yaml echo "📝 Updated Chart.yaml and values.yaml with version ${VERSION}" - name: Lint Helm chart run: | - helm lint helm/api7ee/ + helm lint helm/api7ee-demo-k8s/ - name: Package Helm chart run: | - helm package helm/api7ee/ --version ${VERSION} - echo "CHART_FILE=api7ee-${VERSION}.tgz" >> $GITHUB_ENV + helm package helm/api7ee-demo-k8s/ --version ${VERSION} + echo "CHART_FILE=api7ee-demo-k8s-${VERSION}.tgz" >> $GITHUB_ENV # Generate chart README with installation instructions cat > CHART_README.md << EOF @@ -73,16 +73,16 @@ jobs: helm repo update # Install the chart - helm install my-api7ee api7ee/api7ee --version ${VERSION} + helm install my-api7ee api7ee/api7ee-demo-k8s --version ${VERSION} # Install with custom values - helm install my-api7ee api7ee/api7ee --version ${VERSION} -f values.yaml + helm install my-api7ee api7ee/api7ee-demo-k8s --version ${VERSION} -f values.yaml \`\`\` ## Upgrade \`\`\`bash - helm upgrade my-api7ee api7ee/api7ee --version ${VERSION} + helm upgrade my-api7ee api7ee/api7ee-demo-k8s --version ${VERSION} \`\`\` ## Docker Images @@ -112,7 +112,7 @@ jobs: "tag_name": "v${VERSION}", "target_commitish": "${{ gitea.sha }}", "name": "v${VERSION}", - "body": "## Helm Chart Release v${VERSION}\n\n### Installation\n\`\`\`bash\nhelm repo add api7ee https://${{ gitea.server_url }}/api/packages/${{ gitea.repository_owner }}/helm\nhelm repo update\nhelm install my-api7ee api7ee/api7ee --version ${VERSION}\n\`\`\`\n\n### Docker Images\n- Web: \`${{ gitea.server_url }}/${{ gitea.repository }}/web:v${VERSION}\`\n- API: \`${{ gitea.server_url }}/${{ gitea.repository }}/api:v${VERSION}\`\n\n### Chart Package\n- Download: [api7ee-${VERSION}.tgz](https://${{ gitea.server_url }}/${{ gitea.repository }}/releases/download/v${VERSION}/api7ee-${VERSION}.tgz)", + "body": "## Helm Chart Release v${VERSION}\n\n### Installation\n\`\`\`bash\nhelm repo add api7ee https://${{ gitea.server_url }}/api/packages/${{ gitea.repository_owner }}/helm\nhelm repo update\nhelm install my-api7ee api7ee/api7ee-demo-k8s --version ${VERSION}\n\`\`\`\n\n### Docker Images\n- Web: \`${{ gitea.server_url }}/${{ gitea.repository }}/web:v${VERSION}\`\n- API: \`${{ gitea.server_url }}/${{ gitea.repository }}/api:v${VERSION}\`\n\n### Chart Package\n- Download: [api7ee-demo-k8s-${VERSION}.tgz](https://${{ gitea.server_url }}/${{ gitea.repository }}/releases/download/v${VERSION}/api7ee-demo-k8s-${VERSION}.tgz)", "draft": false, "prerelease": false } @@ -137,7 +137,7 @@ jobs: -H "Authorization: token ${{ secrets.PACKAGES_PUSH_TOKEN }}" \ -H "Content-Type: application/gzip" \ --data-binary "@${CHART_FILE}" \ - "https://${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=api7ee-${VERSION}.tgz" + "https://${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=api7ee-demo-k8s-${VERSION}.tgz" # Upload README as release asset curl -X POST \ @@ -164,5 +164,5 @@ jobs: echo '```bash' echo "helm repo add api7ee https://${{ gitea.server_url }}/api/packages/${{ gitea.repository_owner }}/helm" echo "helm repo update" - echo "helm install my-api7ee api7ee/api7ee --version ${VERSION}" + echo "helm install my-api7ee api7ee/api7ee-demo-k8s --version ${VERSION}" echo '```' diff --git a/README.md b/README.md index 418cc66..5303e33 100644 --- a/README.md +++ b/README.md @@ -149,13 +149,13 @@ helm repo update ```bash # Install with default values -helm install my-api7ee api7ee/api7ee --namespace api7ee --create-namespace +helm install my-api7ee api7ee/api7ee-demo-k8s --namespace api7ee --create-namespace # Install with custom values -helm install my-api7ee api7ee/api7ee -f custom-values.yaml --namespace api7ee +helm install my-api7ee api7ee/api7ee-demo-k8s -f custom-values.yaml --namespace api7ee # Install with specific image tags -helm install my-api7ee api7ee/api7ee \ +helm install my-api7ee api7ee/api7ee-demo-k8s \ --set web.image.tag=v1.0.0 \ --set api.image.tag=v1.0.0 \ --namespace api7ee @@ -178,7 +178,7 @@ Key Helm values: ```bash # Upgrade the release -helm upgrade my-api7ee api7ee/api7ee --namespace api7ee +helm upgrade my-api7ee api7ee/api7ee-demo-k8s --namespace api7ee # Uninstall helm uninstall my-api7ee --namespace api7ee diff --git a/helm/api7ee/.helmignore b/helm/api7ee-demo-k8s/.helmignore similarity index 100% rename from helm/api7ee/.helmignore rename to helm/api7ee-demo-k8s/.helmignore diff --git a/helm/api7ee/Chart.yaml b/helm/api7ee-demo-k8s/Chart.yaml similarity index 94% rename from helm/api7ee/Chart.yaml rename to helm/api7ee-demo-k8s/Chart.yaml index 87ae201..f6b7e5c 100644 --- a/helm/api7ee/Chart.yaml +++ b/helm/api7ee-demo-k8s/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: api7ee +name: api7ee-demo-k8s description: A Helm chart for API7 Enterprise Edition demo application type: application version: 0.1.0 diff --git a/helm/api7ee/README.md b/helm/api7ee-demo-k8s/README.md similarity index 93% rename from helm/api7ee/README.md rename to helm/api7ee-demo-k8s/README.md index 4bd0f9a..2bab7d0 100644 --- a/helm/api7ee/README.md +++ b/helm/api7ee-demo-k8s/README.md @@ -22,13 +22,13 @@ helm repo update ```bash # Install with default values -helm install my-api7ee ./helm/api7ee +helm install my-api7ee ./helm/api7ee-demo-k8s-demo-k8s # Install in a specific namespace -helm install my-api7ee ./helm/api7ee --namespace api7ee --create-namespace +helm install my-api7ee ./helm/api7ee-demo-k8s-demo-k8s --namespace api7ee --create-namespace # Install with custom values file -helm install my-api7ee ./helm/api7ee -f custom-values.yaml +helm install my-api7ee ./helm/api7ee-demo-k8s-demo-k8s -f custom-values.yaml ``` ## Configuration @@ -131,10 +131,10 @@ api: ```bash # Upgrade to a new version -helm upgrade my-api7ee ./helm/api7ee +helm upgrade my-api7ee ./helm/api7ee-demo-k8s-demo-k8s # Upgrade with new values -helm upgrade my-api7ee ./helm/api7ee --set web.replicaCount=3 +helm upgrade my-api7ee ./helm/api7ee-demo-k8s-demo-k8s --set web.replicaCount=3 ``` ## Uninstallation diff --git a/helm/api7ee/templates/NOTES.txt b/helm/api7ee-demo-k8s/templates/NOTES.txt similarity index 100% rename from helm/api7ee/templates/NOTES.txt rename to helm/api7ee-demo-k8s/templates/NOTES.txt diff --git a/helm/api7ee/templates/_helpers.tpl b/helm/api7ee-demo-k8s/templates/_helpers.tpl similarity index 100% rename from helm/api7ee/templates/_helpers.tpl rename to helm/api7ee-demo-k8s/templates/_helpers.tpl diff --git a/helm/api7ee/templates/certificate.yaml b/helm/api7ee-demo-k8s/templates/certificate.yaml similarity index 100% rename from helm/api7ee/templates/certificate.yaml rename to helm/api7ee-demo-k8s/templates/certificate.yaml diff --git a/helm/api7ee/templates/configmap-adc.yaml b/helm/api7ee-demo-k8s/templates/configmap-adc.yaml similarity index 100% rename from helm/api7ee/templates/configmap-adc.yaml rename to helm/api7ee-demo-k8s/templates/configmap-adc.yaml diff --git a/helm/api7ee/templates/configmap.yaml b/helm/api7ee-demo-k8s/templates/configmap.yaml similarity index 100% rename from helm/api7ee/templates/configmap.yaml rename to helm/api7ee-demo-k8s/templates/configmap.yaml diff --git a/helm/api7ee/templates/deployment-api.yaml b/helm/api7ee-demo-k8s/templates/deployment-api.yaml similarity index 100% rename from helm/api7ee/templates/deployment-api.yaml rename to helm/api7ee-demo-k8s/templates/deployment-api.yaml diff --git a/helm/api7ee/templates/deployment-web.yaml b/helm/api7ee-demo-k8s/templates/deployment-web.yaml similarity index 100% rename from helm/api7ee/templates/deployment-web.yaml rename to helm/api7ee-demo-k8s/templates/deployment-web.yaml diff --git a/helm/api7ee/templates/hpa-api.yaml b/helm/api7ee-demo-k8s/templates/hpa-api.yaml similarity index 100% rename from helm/api7ee/templates/hpa-api.yaml rename to helm/api7ee-demo-k8s/templates/hpa-api.yaml diff --git a/helm/api7ee/templates/hpa-web.yaml b/helm/api7ee-demo-k8s/templates/hpa-web.yaml similarity index 100% rename from helm/api7ee/templates/hpa-web.yaml rename to helm/api7ee-demo-k8s/templates/hpa-web.yaml diff --git a/helm/api7ee/templates/ingress.yaml b/helm/api7ee-demo-k8s/templates/ingress.yaml similarity index 100% rename from helm/api7ee/templates/ingress.yaml rename to helm/api7ee-demo-k8s/templates/ingress.yaml diff --git a/helm/api7ee/templates/job-adc-sync.yaml b/helm/api7ee-demo-k8s/templates/job-adc-sync.yaml similarity index 100% rename from helm/api7ee/templates/job-adc-sync.yaml rename to helm/api7ee-demo-k8s/templates/job-adc-sync.yaml diff --git a/helm/api7ee/templates/poddisruptionbudget.yaml b/helm/api7ee-demo-k8s/templates/poddisruptionbudget.yaml similarity index 100% rename from helm/api7ee/templates/poddisruptionbudget.yaml rename to helm/api7ee-demo-k8s/templates/poddisruptionbudget.yaml diff --git a/helm/api7ee/templates/rbac-adc.yaml b/helm/api7ee-demo-k8s/templates/rbac-adc.yaml similarity index 100% rename from helm/api7ee/templates/rbac-adc.yaml rename to helm/api7ee-demo-k8s/templates/rbac-adc.yaml diff --git a/helm/api7ee/templates/secret-api7.yaml b/helm/api7ee-demo-k8s/templates/secret-api7.yaml similarity index 100% rename from helm/api7ee/templates/secret-api7.yaml rename to helm/api7ee-demo-k8s/templates/secret-api7.yaml diff --git a/helm/api7ee/templates/secret.yaml b/helm/api7ee-demo-k8s/templates/secret.yaml similarity index 100% rename from helm/api7ee/templates/secret.yaml rename to helm/api7ee-demo-k8s/templates/secret.yaml diff --git a/helm/api7ee/templates/service-api.yaml b/helm/api7ee-demo-k8s/templates/service-api.yaml similarity index 100% rename from helm/api7ee/templates/service-api.yaml rename to helm/api7ee-demo-k8s/templates/service-api.yaml diff --git a/helm/api7ee/templates/service-web.yaml b/helm/api7ee-demo-k8s/templates/service-web.yaml similarity index 100% rename from helm/api7ee/templates/service-web.yaml rename to helm/api7ee-demo-k8s/templates/service-web.yaml diff --git a/helm/api7ee/templates/serviceaccount.yaml b/helm/api7ee-demo-k8s/templates/serviceaccount.yaml similarity index 100% rename from helm/api7ee/templates/serviceaccount.yaml rename to helm/api7ee-demo-k8s/templates/serviceaccount.yaml diff --git a/helm/api7ee/values-dev.yaml b/helm/api7ee-demo-k8s/values-dev.yaml similarity index 100% rename from helm/api7ee/values-dev.yaml rename to helm/api7ee-demo-k8s/values-dev.yaml diff --git a/helm/api7ee/values-production.yaml b/helm/api7ee-demo-k8s/values-production.yaml similarity index 100% rename from helm/api7ee/values-production.yaml rename to helm/api7ee-demo-k8s/values-production.yaml diff --git a/helm/api7ee/values.yaml b/helm/api7ee-demo-k8s/values.yaml similarity index 100% rename from helm/api7ee/values.yaml rename to helm/api7ee-demo-k8s/values.yaml