From 4121628c3d74da0065fa141ee103b8439293b26c Mon Sep 17 00:00:00 2001 From: Guilherme Cassolato Date: Thu, 5 Sep 2024 11:01:23 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20ignore=20changes=20to=20the=20kustomizat?= =?UTF-8?q?ion=20file=20performed=20during=20verification=20of=20the=20man?= =?UTF-8?q?ifests=20=E2=80=93=20the=20changes=20to=20the=20manifests=20are?= =?UTF-8?q?=20the=20ones=20that=20actually=20matter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guilherme Cassolato --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d03a9db..89b29db 100644 --- a/Makefile +++ b/Makefile @@ -334,7 +334,7 @@ prepare-release: ## Prepares a release: create build info file, generate manifes .PHONY: verify-manifests verify-manifests: manifests $(YQ) ## Verify manifests update. - git diff -I' containerImage:' -I' image:' -I'^ createdAt: ' --exit-code ./config + git diff -I'^ createdAt:' -I' containerImage:' -I' image:' --exit-code -- ./config ':(exclude)config/authorino/kustomization.yaml' [ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./config)" ] $(YQ) ea -e 'select([.][].kind == "Deployment") | select([.][].metadata.name == "authorino-operator").spec.template.spec.containers[0].image | . == "$(OPERATOR_IMAGE)"' config/deploy/manifests.yaml $(YQ) ea -e 'select([.][].kind == "Deployment") | select([.][].metadata.name == "authorino-webhooks").spec.template.spec.containers[0].image | . == "$(DEFAULT_AUTHORINO_IMAGE)"' config/deploy/manifests.yaml @@ -342,7 +342,7 @@ verify-manifests: manifests $(YQ) ## Verify manifests update. .PHONY: verify-bundle verify-bundle: bundle $(YQ) ## Verify bundle update. - git diff -I' containerImage:' -I' image:' -I'^ createdAt: ' --exit-code ./bundle + git diff -I'^ createdAt:' -I' containerImage:' -I' image:' --exit-code -- ./bundle ':(exclude)config/authorino/kustomization.yaml' [ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./bundle)" ] $(YQ) e -e '.metadata.annotations.containerImage == "$(OPERATOR_IMAGE)"' $(BUNDLE_CSV) $(YQ) e -e '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image == "$(OPERATOR_IMAGE)"' $(BUNDLE_CSV)