Skip to content

Commit 987e9c8

Browse files
obnoxxxtravisn
andcommitted
build: merge helm indexes instead of recreating for every release (really)
A new helm repo index was created from scratch for every new release which meant that the release timestamps in the index were basically all identical. This change intends to fix that by merging the new index with the existing one The first attempt to fix this (PR rook#16033) did not work properly. This change is intended to fix the issue for good by closing the gap the previuous PR has left. Fixes: rook#15604 Co-Authored-By: Travis Nielsen <tnielsen@redhat.com> Signed-off-by: Michael Adam <obnox@samba.org>
1 parent 80563e2 commit 987e9c8

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

build/release/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,14 @@ HELM_URL := $(HELM_BASE_URL)/$(HELM_CHANNEL)
120120
promote.helm: $(HELM)
121121
# copy existing charts to a temp dir, then combine with new charts, reindex, and upload
122122
$(S3_SYNC) s3://$(HELM_S3_BUCKET)/$(HELM_CHANNEL) $(HELM_TEMP)
123+
# delete unnecessary files:
124+
rm -fr $(HELM_TEMP)/*tgz
125+
# rename current index to distinguish the previous file.
126+
mv $(HELM_TEMP)/index.yaml $(HELM_TEMP)/previous_index.yaml
123127
$(S3_SYNC) s3://$(S3_BUCKET)/build/$(BRANCH_NAME)/$(VERSION)/charts $(HELM_TEMP)
124-
$(HELM) repo index --url $(HELM_URL) --merge $(HELM_TEMP)/index.yaml $(HELM_TEMP)
125-
$(S3_SYNC_DEL) $(HELM_TEMP) s3://$(HELM_S3_BUCKET)/$(HELM_CHANNEL)
128+
$(HELM) repo index --url $(HELM_URL) --merge $(HELM_TEMP)/previous_index.yaml $(HELM_TEMP)
129+
rm -f $(HELM_TEMP)/previous_index.yaml
130+
$(S3_SYNC) $(HELM_TEMP) s3://$(HELM_S3_BUCKET)/$(HELM_CHANNEL)
126131
rm -fr $(HELM_TEMP)
127132

128133
# set the helm cart version number.

0 commit comments

Comments
 (0)