From 25b3786e5dbbfd815586852263510bb97ec046fa Mon Sep 17 00:00:00 2001 From: Joakim Ahrlin Date: Wed, 13 Apr 2022 10:16:10 +0200 Subject: [PATCH 1/3] update tar commands to trim paths for cmctl Signed-off-by: Joakim Ahrlin --- make/cmctl.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make/cmctl.mk b/make/cmctl.mk index f877ddba5..fb9fce535 100644 --- a/make/cmctl.mk +++ b/make/cmctl.mk @@ -31,7 +31,7 @@ bin/release/cert-manager-cmctl-linux-amd64.tar.gz bin/release/cert-manager-cmctl mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-cmctl-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-linux-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata @@ -59,7 +59,7 @@ bin/release/cert-manager-cmctl-darwin-amd64.tar.gz bin/release/cert-manager-cmct mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-cmctl-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata @@ -95,7 +95,7 @@ bin/release/cert-manager-cmctl-windows-amd64.tar.gz: bin/cmctl/cmctl-windows-amd mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl.exe cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-cmctl-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-cmctl-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata @@ -137,7 +137,7 @@ bin/release/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz bin/release/cer mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-linux-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata @@ -165,7 +165,7 @@ bin/release/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz bin/release/ce mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata @@ -201,7 +201,7 @@ bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz: bin/kubectl- mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager.exe cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE - tar czf $@ -C $(TARDIR) . + find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) bin/metadata/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata From 0bb0e8dc2036d4c42cecd72a0ef60f682f3030b7 Mon Sep 17 00:00:00 2001 From: Joakim Ahrlin Date: Thu, 14 Apr 2022 11:09:38 +0200 Subject: [PATCH 2/3] add helpful comment to tar commands Signed-off-by: Joakim Ahrlin --- make/cmctl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/make/cmctl.mk b/make/cmctl.mk index fb9fce535..47827f36b 100644 --- a/make/cmctl.mk +++ b/make/cmctl.mk @@ -31,6 +31,7 @@ bin/release/cert-manager-cmctl-linux-amd64.tar.gz bin/release/cert-manager-cmctl mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) @@ -59,6 +60,7 @@ bin/release/cert-manager-cmctl-darwin-amd64.tar.gz bin/release/cert-manager-cmct mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) @@ -95,6 +97,7 @@ bin/release/cert-manager-cmctl-windows-amd64.tar.gz: bin/cmctl/cmctl-windows-amd mkdir -p $(TARDIR) cp $< $(TARDIR)/cmctl.exe cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) @@ -137,6 +140,7 @@ bin/release/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz bin/release/cer mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) @@ -165,6 +169,7 @@ bin/release/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz bin/release/ce mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) @@ -201,6 +206,7 @@ bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz: bin/kubectl- mkdir -p $(TARDIR) cp $< $(TARDIR)/kubectl-cert_manager.exe cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE + # removes leading ./ from archived paths find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T - rm -rf $(TARDIR) From ea5913e1c3739c22eb52320b46282e6e10697289 Mon Sep 17 00:00:00 2001 From: Joakim Ahrlin Date: Thu, 14 Apr 2022 11:11:18 +0200 Subject: [PATCH 3/3] update tar command to trim paths for release manifests Signed-off-by: Joakim Ahrlin --- make/manifests.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/manifests.mk b/make/manifests.mk index 2f5c63c9a..7c09ddc89 100644 --- a/make/manifests.mk +++ b/make/manifests.mk @@ -35,7 +35,8 @@ bin/release/cert-manager-manifests.tar.gz: bin/cert-manager-$(RELEASE_VERSION).t mkdir -p bin/scratch/manifests/deploy/manifests/ cp bin/cert-manager-$(RELEASE_VERSION).tgz bin/cert-manager-$(RELEASE_VERSION).tgz.prov bin/scratch/manifests/deploy/chart/ cp bin/yaml/cert-manager.crds.yaml bin/yaml/cert-manager.yaml bin/scratch/manifests/deploy/manifests/ - tar czf $@ -C bin/scratch/manifests . + # removes leading ./ from archived paths + find bin/scratch/manifests -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C bin/scratch/manifests -T - rm -rf bin/scratch/manifests # This metadata blob is constructed slightly differently and doesn't use hack/artifact-metadata.template.json directly;