Change yq json inserting to make it the same for linux and macos (#185)

stackrox · Dec 21, 2023 · 3922b07 · 3922b07
1 parent 2005944
commit 3922b07
Show file tree

Hide file tree

Showing 18 changed files with 24,931 additions and 24,930 deletions.
diff --git a/resources/grafana/mixins/kubernetes/apiserver.yaml b/resources/grafana/mixins/kubernetes/apiserver.yaml
diff --git a/resources/grafana/mixins/kubernetes/cluster-total.yaml b/resources/grafana/mixins/kubernetes/cluster-total.yaml
diff --git a/resources/grafana/mixins/kubernetes/controller-manager.yaml b/resources/grafana/mixins/kubernetes/controller-manager.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-cluster.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-cluster.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-namespace.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-namespace.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-node.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-node.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-pod.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-pod.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-workload.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-workload.yaml
diff --git a/resources/grafana/mixins/kubernetes/k8s-resources-workloads-namespace.yaml b/resources/grafana/mixins/kubernetes/k8s-resources-workloads-namespace.yaml
diff --git a/resources/grafana/mixins/kubernetes/kubelet.yaml b/resources/grafana/mixins/kubernetes/kubelet.yaml
diff --git a/resources/grafana/mixins/kubernetes/namespace-by-pod.yaml b/resources/grafana/mixins/kubernetes/namespace-by-pod.yaml
diff --git a/resources/grafana/mixins/kubernetes/namespace-by-workload.yaml b/resources/grafana/mixins/kubernetes/namespace-by-workload.yaml
diff --git a/resources/grafana/mixins/kubernetes/persistentvolumesusage.yaml b/resources/grafana/mixins/kubernetes/persistentvolumesusage.yaml
diff --git a/resources/grafana/mixins/kubernetes/pod-total.yaml b/resources/grafana/mixins/kubernetes/pod-total.yaml
diff --git a/resources/grafana/mixins/kubernetes/proxy.yaml b/resources/grafana/mixins/kubernetes/proxy.yaml
diff --git a/resources/grafana/mixins/kubernetes/scheduler.yaml b/resources/grafana/mixins/kubernetes/scheduler.yaml
diff --git a/resources/grafana/mixins/kubernetes/workload-total.yaml b/resources/grafana/mixins/kubernetes/workload-total.yaml
diff --git a/resources/mixins/kubernetes/scripts/generate-dashboards.sh b/resources/mixins/kubernetes/scripts/generate-dashboards.sh
@@ -8,5 +8,6 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" &>/dev/null && pwd 2
 
 for file in "${SCRIPT_DIR}"/../templates/dashboards/*; do
 	name=$(basename "$file" .yaml)
-	yq ".spec.json = ($(cat generated/dashboards/"$name".json) | to_json)" templates/dashboards/"$name".yaml > ../../grafana/mixins/kubernetes/"$name".yaml
+	export json_file=generated/dashboards/"$name".json
+	yq '.spec.json = loadstr(strenv(json_file))' templates/dashboards/"$name".yaml > ../../grafana/mixins/kubernetes/"$name".yaml
 done