Merge pull request #175 from mintel/INFRA-32499-fix-repatch-attempts

Fix repatching attempts
mintel · Dec 6, 2023 · 7372b46 · 7372b46
2 parents 54a3390 + 7103905
commit 7372b46
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/k8s/Makefile.tanka b/modules/k8s/Makefile.tanka
@@ -27,8 +27,13 @@ endif
 k8s/tanka/charts/patch:
 ifneq ("$(wildcard ./charts)", "")
 ifneq ("$(wildcard ./charts/*.patch)", "")
-	@for f in charts/*.patch; do \
-		patch -d charts -p0 < $$f; \
+	@cd charts ;\
+	for f in *.patch; do \
+		patch --strip=0 --forward --reject-file=$$f.rej < $$f ;\
+		rc=$$? ;\
+		if [[ $$rc -gt 1 ]]; then \
+			exit $$rc ;\
+		fi ;\
 	done
 endif
 endif