Fix the updatecli config generator (#1111)

Signed-off-by: Pete Wall <[email protected]>
grafana · Jan 14, 2025 · 2253065 · 2253065
1 parent 34ecfac
commit 2253065
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/check-for-dependency-updates.yaml b/.github/workflows/check-for-dependency-updates.yaml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Regenerate files
         if: steps.update-dependency.outputs.changed == 'true'
-        run: make -C "$(dirname "${{ matrix.config }}")" clean build
+        run: make clean build
 
       - name: Create pull request
         if: steps.update-dependency.outputs.changed == 'true'

diff --git a/charts/k8s-monitoring/charts/feature-auto-instrumentation/.updatecli-beyla.yaml b/charts/k8s-monitoring/charts/feature-auto-instrumentation/.updatecli-beyla.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "beyla" is specified
     kind: yaml
     spec:
-      file: charts/feature-auto-instrumentation/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-auto-instrumentation/Chart.yaml
       key: $.dependencies[0].name
       value: beyla
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/feature-auto-instrumentation
+      name: charts/k8s-monitoring/charts/feature-auto-instrumentation
       versionincrement: none
     sourceid: beyla
diff --git a/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-kepler.yaml b/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-kepler.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "kepler" is specified
     kind: yaml
     spec:
-      file: charts/feature-cluster-metrics/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[3].name
       value: kepler
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[3].version
-      name: charts/feature-cluster-metrics
+      name: charts/k8s-monitoring/charts/feature-cluster-metrics
       versionincrement: none
     sourceid: kepler
diff --git a/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml b/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "kube-state-metrics" is specified
     kind: yaml
     spec:
-      file: charts/feature-cluster-metrics/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[0].name
       value: kube-state-metrics
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/feature-cluster-metrics
+      name: charts/k8s-monitoring/charts/feature-cluster-metrics
       versionincrement: none
     sourceid: kube-state-metrics
diff --git a/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-opencost.yaml b/charts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-opencost.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "opencost" is specified
     kind: yaml
     spec:
-      file: charts/feature-cluster-metrics/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[4].name
       value: opencost
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[4].version
-      name: charts/feature-cluster-metrics
+      name: charts/k8s-monitoring/charts/feature-cluster-metrics
       versionincrement: none
     sourceid: opencost
diff --git a/...ts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml b/...ts/k8s-monitoring/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-node-exporter" is specified
     kind: yaml
     spec:
-      file: charts/feature-cluster-metrics/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[1].name
       value: prometheus-node-exporter
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[1].version
-      name: charts/feature-cluster-metrics
+      name: charts/k8s-monitoring/charts/feature-cluster-metrics
       versionincrement: none
     sourceid: prometheus-node-exporter
diff --git a/...k8s-monitoring/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml b/...k8s-monitoring/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-windows-exporter" is specified
     kind: yaml
     spec:
-      file: charts/feature-cluster-metrics/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[2].name
       value: prometheus-windows-exporter
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[2].version
-      name: charts/feature-cluster-metrics
+      name: charts/k8s-monitoring/charts/feature-cluster-metrics
       versionincrement: none
     sourceid: prometheus-windows-exporter
diff --git a/...oring/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml b/...oring/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml
@@ -15,7 +15,7 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-operator-crds" is specified
     kind: yaml
     spec:
-      file: charts/feature-prometheus-operator-objects/Chart.yaml
+      file: charts/k8s-monitoring/charts/feature-prometheus-operator-objects/Chart.yaml
       key: $.dependencies[0].name
       value: prometheus-operator-crds
     disablesourceinput: true
@@ -26,6 +26,6 @@ targets:
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/feature-prometheus-operator-objects
+      name: charts/k8s-monitoring/charts/feature-prometheus-operator-objects
       versionincrement: none
     sourceid: prometheus-operator-crds
diff --git a/scripts/charts-to-updatecli.sh b/scripts/charts-to-updatecli.sh
@@ -11,7 +11,9 @@ if [ ! -f "$CHART_YAML" ]; then
 fi
 
 rm -f .updatecli-*.yaml
-chartDir=$(basename "$(dirname "$(readlink -f "$CHART_YAML")")")
+rootDir=$(git rev-parse --show-toplevel)
+parentChart=$(basename "$(dirname "$(readlink -f "$CHART_YAML")")")
+parentChartPath=$(dirname "$(readlink -f "$CHART_YAML")" | sed "s|$rootDir/||")
 dependencyCount=$(yq eval '.dependencies | length' "$CHART_YAML")
 for ((i=0; i<dependencyCount; i++)); do
   dependency=$(yq eval ".dependencies[$i]" "$CHART_YAML")
@@ -22,7 +24,7 @@ for ((i=0; i<dependencyCount; i++)); do
     if [ ! -f ".updatecli-${chart}.yaml" ]; then
       echo "---" > ".updatecli-${chart}.yaml"
       yq eval --null-input "{
-  \"name\": \"Update dependency \\\"$chart\\\" for Helm chart \\\"$chartDir\\\"\",
+  \"name\": \"Update dependency \\\"$chart\\\" for Helm chart \\\"$parentChart\\\"\",
   \"sources\": {
     \"$chart\": {
       \"name\": \"Get latest \\\"$chart\\\" Helm chart version\",
@@ -42,7 +44,7 @@ for ((i=0; i<dependencyCount; i++)); do
       \"name\": \"Ensure Helm chart dependency \\\"$chart\\\" is specified\",
       \"kind\": \"yaml\",
       \"spec\": {
-        \"file\": \"charts/$chartDir/Chart.yaml\",
+        \"file\": \"$parentChartPath/Chart.yaml\",
         \"key\": \"$.dependencies[$i].name\",
         \"value\": \"$chart\"
       },
@@ -54,12 +56,12 @@ for ((i=0; i<dependencyCount; i++)); do
     fi
     yq eval ".targets += {
 \"$name\": {
-  \"name\": \"Bump Helm chart dependency \\\"$name\\\" for Helm chart \\\"$chartDir\\\"\",
+  \"name\": \"Bump Helm chart dependency \\\"$name\\\" for Helm chart \\\"$parentChart\\\"\",
   \"kind\": \"helmchart\",
   \"spec\": {
     \"file\": \"Chart.yaml\",
     \"key\": \"$.dependencies[$i].version\",
-    \"name\": \"charts/$chartDir\",
+    \"name\": \"$parentChartPath\",
     \"versionincrement\": \"none\"
   },
   \"sourceid\": \"$chart\"