Remove requirements and improve the branch name

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Oct 11, 2024 · 253b556 · 253b556
1 parent 25b90a5
commit 253b556
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/check-for-dependency-updates.yaml b/.github/workflows/check-for-dependency-updates.yaml
@@ -70,10 +70,14 @@ jobs:
       - name: Get details
         id: get-details
         run: |
+          echo "title=$(yq eval ".name" "${{ matrix.config }}")" >> "${GITHUB_OUTPUT}"
+
           versionPath="$(yq eval '.targets.*.spec.key' "${{ matrix.config }}" | head -n 1 | cut -c2-)"
           echo "version=$(yq eval "${versionPath}" "$(dirname "${{ matrix.config }}")/Chart.yaml")" >> "${GITHUB_OUTPUT}"
-          echo "chart=$(basename "${{ matrix.config }}" | sed -e "s/.updatecli-\(.*\)\.yaml/\1/")" >> "${GITHUB_OUTPUT}"
-          echo "title=$(yq eval ".name" "${{ matrix.config }}")" >> "${GITHUB_OUTPUT}"
+
+          chart="$(basename "$(dirname "${{ matrix.config }}")")" >> "${GITHUB_OUTPUT}"
+          dep="$(basename "${{ matrix.config }}" | sed -e "s/.updatecli-\(.*\)\.yaml/\1/")"
+          echo "branch=chore/update-${chart}-${dep}" >> "${GITHUB_OUTPUT}"
 
       - name: Create pull request
         if: steps.update-dependency.outputs.changed == 'true'
@@ -86,5 +90,5 @@ jobs:
           committer: "GitHub <noreply@github.com>"
           commit-message: Update ${{ steps.get-details.outputs.title }} to ${{ steps.get-details.outputs.version }}
           labels: dependencies
-          branch: chore/update-${{ steps.get-details.outputs.chart }}
+          branch: ${{ steps.get-details.outputs.branch }}
           delete-branch: true
diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md
@@ -118,25 +118,6 @@ podLogs:
 
 * <https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/k8s-monitoring>
 <!-- markdownlint-enable list-marker-space -->
-
-## Requirements
-
-| Repository | Name | Version |
-|------------|------|---------|
-| file://../feature-annotation-autodiscovery | annotationAutodiscovery(k8s-monitoring-feature-annotation-autodiscovery) | 1.0.0 |
-| file://../feature-application-observability | applicationObservability(k8s-monitoring-feature-application-observability) | 1.0.0 |
-| file://../feature-cluster-events | clusterEvents(k8s-monitoring-feature-cluster-events) | 1.0.0 |
-| file://../feature-cluster-metrics | clusterMetrics(k8s-monitoring-feature-cluster-metrics) | 1.0.0 |
-| file://../feature-frontend-observability | frontendObservability(k8s-monitoring-feature-frontend-observability) | 1.0.0 |
-| file://../feature-integrations | integrations(k8s-monitoring-feature-integrations) | 1.0.0 |
-| file://../feature-pod-logs | podLogs(k8s-monitoring-feature-pod-logs) | 1.0.0 |
-| file://../feature-profiling | profiling(k8s-monitoring-feature-profiling) | 1.0.0 |
-| file://../feature-prometheus-operator-objects | prometheusOperatorObjects(k8s-monitoring-feature-prometheus-operator-objects) | 1.0.0 |
-| https://grafana.github.io/helm-charts | alloy-metrics(alloy) | 0.7.0 |
-| https://grafana.github.io/helm-charts | alloy-singleton(alloy) | 0.7.0 |
-| https://grafana.github.io/helm-charts | alloy-logs(alloy) | 0.7.0 |
-| https://grafana.github.io/helm-charts | alloy-receiver(alloy) | 0.7.0 |
-| https://grafana.github.io/helm-charts | alloy-profiles(alloy) | 0.7.0 |
 <!-- markdownlint-enable no-bare-urls -->
 
 ## Values

diff --git a/charts/k8s-monitoring/README.md.gotmpl b/charts/k8s-monitoring/README.md.gotmpl
@@ -115,8 +115,6 @@ podLogs:
 <!-- markdownlint-disable list-marker-space -->
 {{ template "chart.sourcesSection" . }}
 <!-- markdownlint-enable list-marker-space -->
-
-{{ template "chart.requirementsSection" . }}
 <!-- markdownlint-enable no-bare-urls -->
 
 {{ template "chart.valuesSection" . }}