diff --git a/.github/workflows/build-helm-chart-release.yaml b/.github/workflows/build-helm-chart-release.yaml index 5952af6..46d0a1d 100644 --- a/.github/workflows/build-helm-chart-release.yaml +++ b/.github/workflows/build-helm-chart-release.yaml @@ -50,41 +50,8 @@ jobs: echo "VERSION=$VERSION" >> $GITHUB_ENV echo "Version: $VERSION" - - name: Merge README.md files using diff3 - run: | - # Ensure both README.md files are present - if [ ! -f README.md ]; then - echo "Root README.md does not exist." - exit 1 - fi - if [ ! -f charts/home-assistant/README.md ]; then - echo "charts/home-assistant/README.md does not exist. Creating an empty file." - touch charts/home-assistant/README.md - fi - - # Create a base file (empty or a common ancestor if available) - touch baseREADME.md - - # Show content of both files for debugging - echo "Content of root README.md:" - cat README.md - echo "-------------------" - echo "Content of charts/home-assistant/README.md:" - cat charts/home-assistant/README.md - echo "-------------------" - - # Attempt to auto-merge using diff3 - diff3 -m baseREADME.md README.md charts/home-assistant/README.md > mergedREADME.md || true - DIFF3_EXIT_CODE=$? - - if [ $DIFF3_EXIT_CODE -eq 0 ]; then - echo "Merge successful without conflicts." - mv mergedREADME.md charts/home-assistant/README.md - else - echo "Using root README.md as the source of truth" - cp README.md charts/home-assistant/README.md - fi - + - name: Copy README.md to charts/home-assistant + run: cp README.md charts/home-assistant/README.md - name: Commit latest release version run: | diff --git a/README.md b/README.md index e9b8500..e9ac8f4 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ This document provides detailed configuration options for the Home Assistant Hel | `serviceAccount.annotations` | Annotations to add to the service account | `{}` | | `serviceAccount.name` | The name of the service account to use | `""` | | `podAnnotations` | Annotations to add to the pod | `{}` | +| `statefulSetAnnotations` | Annotations to add to the StatefulSet | `{}` | | `podSecurityContext` | Pod security context settings | `{}` | | `env` | Environment variables | `[]` | | `envFrom` | Use environment variables from ConfigMaps or Secrets | `[]` |