From e4d88d592d4ed19b29f4f5a69905ecb7f2054971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20K=C4=99ska?= <372403+keskad@users.noreply.github.com> Date: Tue, 22 Mar 2022 19:39:38 +0100 Subject: [PATCH] fix: Disable prune on cluster resources, as there are namespaces inside https://github.com/jenkins-x/jx3-versions/pull/2963 https://kubernetes.slack.com/archives/C9MBGQJRH/p1647955769010979 --- src/Makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.mk b/src/Makefile.mk index 15fb9ae98..781747762 100644 --- a/src/Makefile.mk +++ b/src/Makefile.mk @@ -288,7 +288,7 @@ kubectl-apply: # NOTE be very careful about these 2 labels as getting them wrong can remove stuff in you cluster! kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=customresourcedefinitions -R -f $(OUTPUT_DIR)/customresourcedefinitions - kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=cluster -R -f $(OUTPUT_DIR)/cluster + kubectl apply $(KUBECTL_APPLY_FLAGS) -l=gitops.jenkins-x.io/pipeline=cluster -R -f $(OUTPUT_DIR)/cluster kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=namespaces -R -f $(OUTPUT_DIR)/namespaces # lets apply any infrastructure specific labels or annotations to enable IAM roles on ServiceAccounts etc