refactor: define sync target in distro folder

newrelic · Feb 13, 2025 · 9db58af · 9db58af
1 parent 43e529b
commit 9db58af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/ci-config-drift.yaml b/.github/workflows/ci-config-drift.yaml
@@ -18,4 +18,4 @@ jobs:
 
       - name: Sync k8s distro configs from helm chart
         run: |
-          make k8s-configs-sync-check
+          make -f ./distributions/nrdot-collector-k8s/Makefile sync-configs
diff --git a/Makefile b/Makefile
@@ -104,18 +104,3 @@ licenses-check: licenses
 			exit 1;\
 		} \
 		|| exit 0
-
-.PHONY: sync-k8s-configs
-sync-k8s-configs:
-	@./distributions/nrdot-collector-k8s/sync-configs.sh
-
-.PHONY: check-k8s-configs
-check-k8s-configs: sync-k8s-configs
-	@git diff --name-only | grep -E 'distributions\/nrdot-collector-k8s\/config-\w*.yaml' \
-    		&& { \
-    			echo "Collector configs in helm chart have changed. Adjust sync script to take changes into account.";\
-    			echo "Diff of $(NOTICE_OUTPUT):";\
-    			git --no-pager diff HEAD -- 'distributions/nrdot-collector-k8s/config-*.yaml';\
-    			exit 1;\
-    		} \
-    		|| exit 0
diff --git a/distributions/nrdot-collector-k8s/Makefile b/distributions/nrdot-collector-k8s/Makefile
@@ -0,0 +1,16 @@
+THIS_MAKEFILE_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
+
+.PHONY: sync-configs
+sync-configs:
+	@${THIS_MAKEFILE_DIR}/sync-configs.sh
+
+.PHONY: check-k8s-configs
+check-k8s-configs: sync-configs
+	@git diff --name-only | grep -E 'distributions\/nrdot-collector-k8s\/config-\w*.yaml' \
+    		&& { \
+    			echo "Collector configs in helm chart have changed. Adjust sync script to take changes into account.";\
+    			echo "Diff of $(NOTICE_OUTPUT):";\
+    			git --no-pager diff HEAD -- 'distributions/nrdot-collector-k8s/config-*.yaml';\
+    			exit 1;\
+    		} \
+    		|| exit 0