Merge branch 'release/v7.13.1'

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v7.13.1](https://github.com/cloudogu/makefiles/releases/tag/v7.13.1) 2023-09-01
+### Fixed
+- [#139] Use `yq` from `bin` instead of the host machine to fix pipeline errors.
+
 ## [v7.13.0](https://github.com/cloudogu/makefiles/releases/tag/v7.13.0) 2023-08-31
 ### Fixed
 - [#137] Package generated chart-dependencies in helm-chart

Makefile

@@ -2,7 +2,7 @@
 ARTIFACT_ID=
 VERSION=
 
-MAKEFILES_VERSION=7.11.0
+MAKEFILES_VERSION=7.13.1
 
 .DEFAULT_GOAL:=help
 

build/make/k8s.mk

@@ -147,11 +147,11 @@ ${K8S_HELM_RELEASE_TGZ}: ${BINARY_HELM} ${K8S_HELM_TARGET}/templates/$(ARTIFACT_
 	@${BINARY_HELM} package ${K8S_HELM_TARGET} -d ${K8S_HELM_TARGET} ${BINARY_HELM_ADDITIONAL_PACK_ARGS}
 
 .PHONY: k8s-helm-create-temp-dependencies
-k8s-helm-create-temp-dependencies: ${K8S_HELM_TARGET}/Chart.yaml
+k8s-helm-create-temp-dependencies: ${BINARY_YQ} ${K8S_HELM_TARGET}/Chart.yaml
 # we use helm dependencies internally but never use them as "official" dependency because the namespace may differ
 # instead we create empty dependencies to satisfy the helm package call and delete the whole directory from the chart.tgz later-on.
 	@echo "Create helm temp dependencies (if they exist)"
-	@for dep in `yq -e '.dependencies[].name // ""' ${K8S_HELM_TARGET}/Chart.yaml`; do \
+	@for dep in `${BINARY_YQ} -e '.dependencies[].name // ""' ${K8S_HELM_TARGET}/Chart.yaml`; do \
 		mkdir -p ${K8S_HELM_TARGET}/${K8S_HELM_TARGET_DEP_DIR}/$${dep} ; \
 		sed "s|replaceme|$${dep}|g" $(BUILD_DIR)/make/k8s-helm-temp-chart.yaml > ${K8S_HELM_TARGET}/${K8S_HELM_TARGET_DEP_DIR}/$${dep}/Chart.yaml ; \
 	done