Skip to content

Conversation

@joshuabaird
Copy link
Collaborator

Adds arm64 make targets for building arm64 images locally.

apiVersion: v1
fieldPath: metadata.namespace
image: ghcr.io/fluent/fluent-operator/fluent-operator:v3.5.0
image: ghcr.io/fluent/fluent-operator/fluent-operator:latest
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated, but this resets the tag to latest on master so that CI passes.

cw-Guo
cw-Guo previously approved these changes Oct 30, 2025
@marcofranssen marcofranssen force-pushed the chore/arm64-makefile-targets branch from 9ab9746 to e465c94 Compare October 30, 2025 09:34
Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See suggestions:

  1. Some targets where copy past errors and still amd64.
  2. PHONY should be used https://makefiletutorial.com/#phony

Makefile Outdated
docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile.debug . -t ${FB_IMG_DEBUG}

# Build all amd64 docker images
PHONY: build-amd64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should there be . PHONY instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah - fixed.

# Build arm64 Fluentd container image
.PHONY: build-fd-arm64
build-fd-arm64:
docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we actually have the fluentd dockerfile for arm64 or amd64? only see cmd/fluent-watcher/fluentd/Dockerfile

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use the same Dockerfile for both architectures.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then should we change the path to cmd/fluent-watcher/fluentd/Dockerfile?

joshuabaird and others added 8 commits November 3, 2025 12:09
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
@marcofranssen marcofranssen force-pushed the chore/arm64-makefile-targets branch from ca24dfc to a82fa47 Compare November 3, 2025 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants