Skip to content

🐛 fix monorepo logic for image manifests & initial changelogs #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 4, 2025
Merged

🐛 fix monorepo logic for image manifests & initial changelogs #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9a8527
fix: correctly create & push image manifests
TylerGillson Jul 4, 2025
d5ebfca
fix: build correct changelog for initial tags
TylerGillson Jul 4, 2025
e852c7a
fix: properly handle arch suffix in IMAGE_TAG that occurs in CI
TylerGillson Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/releaseimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,6 @@ jobs:

- name: push
run: |
docker manifest push quay.io/open-cluster-management/${{ matrix.repository }}:${{ needs.env.outputs.RELEASE_VERSION }}
set -e
cd ${{ matrix.repository }}
IMAGE_TAG=${{ needs.env.outputs.RELEASE_VERSION }} make image-manifest-push
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ All projects must define the following `make` targets:
- `image-push`: Push all container images.
- `image-manifest`: Create multi-architecture manifests for all images.
- `image-manifest-annotate`: Annotate multi-architecture manifests for all images.
- `image-manifest-push`: Push finalized image manifests for all images.

#### Dockerfiles

Expand Down
30 changes: 23 additions & 7 deletions fleetconfig-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ IMAGE_FLAVOURS ?= \
# Generate build targets for each variant
$(foreach flavour,$(IMAGE_FLAVOURS),\
$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(IMAGE_TAG)-$(VARIANT))) \
$(eval ARCH_SUFFIX := $(if $(filter %-amd64,$(IMAGE_TAG)),-amd64,$(if $(filter %-arm64,$(IMAGE_TAG)),-arm64,))) \
$(eval BASE_TAG := $(patsubst %$(ARCH_SUFFIX),%,$(IMAGE_TAG))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(BASE_TAG)-$(VARIANT)$(ARCH_SUFFIX))) \
$(eval DOCKERFILE := $(word 2,$(subst :, ,$(flavour)))) \
$(eval $(call build-image,$(IMAGE_REPO)-$(VARIANT),$(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG),$(DOCKERFILE),.)) \
)
Expand All @@ -34,27 +36,41 @@ images: $(foreach flavour,$(IMAGE_FLAVOURS),image-$(IMAGE_REPO)-$(word 1,$(subst
image-push:
$(foreach flavour,$(IMAGE_FLAVOURS),\
$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(IMAGE_TAG)-$(VARIANT))) \
$(eval ARCH_SUFFIX := $(if $(filter %-amd64,$(IMAGE_TAG)),-amd64,$(if $(filter %-arm64,$(IMAGE_TAG)),-arm64,))) \
$(eval BASE_TAG := $(patsubst %$(ARCH_SUFFIX),%,$(IMAGE_TAG))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(BASE_TAG)-$(VARIANT)$(ARCH_SUFFIX))) \
docker push $(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG); \
)

.PHONY: image-manifest
image-manifest:
$(foreach flavour,$(IMAGE_FLAVOURS),\
$(eval IMAGE_TAG_NO_ARCH := $(patsubst %-amd64,%,$(patsubst %-arm64,%,$(IMAGE_TAG)))) \
$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(IMAGE_TAG)-$(VARIANT))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG_NO_ARCH),$(IMAGE_TAG_NO_ARCH)-$(VARIANT))) \
$(eval IMAGE := $(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG)) \
docker manifest create $(IMAGE) $(IMAGE)-amd64 --amd64 $(IMAGE)-arm64 --arm64; \
docker manifest create $(IMAGE) $(IMAGE)-amd64 $(IMAGE)-arm64; \
)

.PHONY: image-manifest-annotate
image-manifest-annotate:
$(foreach flavour,$(IMAGE_FLAVOURS),\
$(eval IMAGE_TAG_NO_ARCH := $(patsubst %-amd64,%,$(patsubst %-arm64,%,$(IMAGE_TAG)))) \
$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(IMAGE_TAG)-$(VARIANT))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG_NO_ARCH),$(IMAGE_TAG_NO_ARCH)-$(VARIANT))) \
$(eval IMAGE := $(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG)) \
docker manifest annotate $(IMAGE) --arch amd64 $(IMAGE)-amd64; \
docker manifest annotate $(IMAGE) --arch arm64 $(IMAGE)-arm64; \
docker manifest annotate $(IMAGE) $(IMAGE)-amd64 --arch amd64; \
docker manifest annotate $(IMAGE) $(IMAGE)-arm64 --arch arm64; \
)

.PHONY: image-manifest-push
image-manifest-push:
$(foreach flavour,$(IMAGE_FLAVOURS),\
$(eval IMAGE_TAG_NO_ARCH := $(patsubst %-amd64,%,$(patsubst %-arm64,%,$(IMAGE_TAG)))) \
$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG_NO_ARCH),$(IMAGE_TAG_NO_ARCH)-$(VARIANT))) \
$(eval IMAGE := $(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG)) \
docker manifest push $(IMAGE); \
)

##@ Generation Targets
Expand Down
18 changes: 11 additions & 7 deletions hack/changelog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,15 @@ def section_if_present(changes: [], pr_title):

# get related PR from the last release tag
last_release_pr = 0
for tag in tags:
if tag.name == last_release_tag:
tag_pulls = tag.commit.get_pulls()
last_release_pr = tag_pulls[0].number
break
release_word = "in"

if tags.totalCount > 1:
release_word = "since"
for tag in tags:
if tag.name == last_release_tag:
tag_pulls = tag.commit.get_pulls()
last_release_pr = tag_pulls[0].number
break

# collect all PRs from the last release tag
features = []
Expand Down Expand Up @@ -112,8 +116,8 @@ def section_if_present(changes: [], pr_title):

# Print
print("# %s %s" % (repo_name, release_tag))
print("\n**changes since [%s](https://github.com/open-cluster-management-io/releases/%s)**\n"
% (last_release_tag, last_release_tag))
print("\n**changes %s [%s](https://github.com/open-cluster-management-io/releases/%s)**\n"
% (release_word, last_release_tag, last_release_tag))
section_if_present(breakings, ":warning: Breaking Changes")
section_if_present(features, ":sparkles: New Features")
section_if_present(bugs, ":bug: Bug Fixes")
Expand Down
Loading