Enable multi-platform support for bridge marker image builds #77
+173
−10
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,30 @@ | ||
| ARG BUILD_ARCH=amd64 | ||
| FROM --platform=linux/${BUILD_ARCH} quay.io/centos/centos:stream9 AS builder | ||
| ARG TARGETOS | ||
| ARG TARGETARCH | ||
| ENV TARGETOS=${TARGETOS:-linux} | ||
| ENV TARGETARCH=${TARGETARCH:-amd64} | ||
|
|
||
| ARG BUILDOS | ||
| ARG BUILDARCH | ||
| ENV BUILDOS=${BUILDOS:-linux} | ||
| ENV BUILDARCH=${BUILDARCH:-amd64} | ||
|
|
||
| WORKDIR /go/src/bridge-marker | ||
| RUN dnf install -y wget && dnf clean all | ||
| COPY go.mod . | ||
| COPY go.sum . | ||
| RUN GO_VERSION=$(sed -En 's/^go +(.*)$/\1/p' go.mod) && \ | ||
| wget https://dl.google.com/go/go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz && \ | ||
| tar -C /usr/local -xzf go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz && \ | ||
| rm go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz | ||
|
|
||
| ENV PATH=$PATH:/usr/local/go/bin | ||
| RUN go mod download | ||
| COPY . . | ||
| RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o build/_output/bin/marker github.com/kubevirt/bridge-marker/cmd/marker | ||
|
|
||
| FROM --platform=linux/${TARGETARCH} registry.access.redhat.com/ubi8/ubi-minimal | ||
| COPY --from=builder /go/src/bridge-marker/build/_output/bin/marker /marker | ||
| COPY --from=builder /go/src/bridge-marker/build/_output/bin/.version /.version | ||
| ENTRYPOINT [ "/marker"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ -z "$ARCH" ] || [ -z "$PLATFORMS" ] || [ -z "$MARKER_IMAGE_TAGGED" ] || [ -z "$MARKER_IMAGE_GIT_TAGGED" ]; then | ||
| echo "Error: ARCH, PLATFORMS, MARKER_IMAGE_TAGGED, and MARKER_IMAGE_GIT_TAGGED must be set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| IFS=',' read -r -a PLATFORM_LIST <<< "$PLATFORMS" | ||
|
|
||
| BUILD_ARGS="--build-arg BUILD_ARCH=$ARCH -f build/Dockerfile -t $MARKER_IMAGE_TAGGED -t $MARKER_IMAGE_GIT_TAGGED . --push" | ||
|
|
||
| if [ ${#PLATFORM_LIST[@]} -eq 1 ]; then | ||
| docker build --platform "$PLATFORMS" $BUILD_ARGS | ||
| else | ||
| ./hack/init-buildx.sh "$DOCKER_BUILDER" | ||
| docker buildx build --platform "$PLATFORMS" $BUILD_ARGS | ||
| docker buildx rm "$DOCKER_BUILDER" 2>/dev/null || echo "Builder ${DOCKER_BUILDER} not found or already removed, skipping." | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ -z "$ARCH" ] || [ -z "$PLATFORMS" ] || [ -z "$MARKER_IMAGE_TAGGED" ]; then | ||
| echo "Error: ARCH, PLATFORMS, and MARKER_IMAGE_TAGGED must be set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| IFS=',' read -r -a PLATFORM_LIST <<< "$PLATFORMS" | ||
|
|
||
| podman manifest rm "${MARKER_IMAGE_TAGGED}" 2>/dev/null || true | ||
| podman manifest rm "${MARKER_IMAGE_GIT_TAGGED}" 2>/dev/null || true | ||
| podman rmi "${MARKER_IMAGE_TAGGED}" 2>/dev/null || true | ||
| podman rmi "${MARKER_IMAGE_GIT_TAGGED}" 2>/dev/null || true | ||
|
|
||
| podman manifest create "${MARKER_IMAGE_TAGGED}" | ||
|
|
||
| for platform in "${PLATFORM_LIST[@]}"; do | ||
| podman build \ | ||
| --build-arg BUILD_ARCH="$ARCH" \ | ||
| --platform "$platform" \ | ||
| --manifest "${MARKER_IMAGE_TAGGED}" \ | ||
| -f build/Dockerfile . | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| check_buildx() { | ||
| export DOCKER_CLI_EXPERIMENTAL=enabled | ||
|
|
||
| if ! docker buildx > /dev/null 2>&1; then | ||
| mkdir -p ~/.docker/cli-plugins | ||
| BUILDX_VERSION=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | jq -r .tag_name) | ||
| ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') | ||
| curl -L https://github.com/docker/buildx/releases/download/"${BUILDX_VERSION}"/buildx-"${BUILDX_VERSION}".linux-"${ARCH}" --output ~/.docker/cli-plugins/docker-buildx | ||
| chmod a+x ~/.docker/cli-plugins/docker-buildx | ||
| fi | ||
| } | ||
|
|
||
| create_or_use_buildx_builder() { | ||
| local builder_name=$1 | ||
| if [ -z "$builder_name" ]; then | ||
| echo "Error: Builder name is required." | ||
| exit 1 | ||
| fi | ||
|
|
||
| check_buildx | ||
|
|
||
| current_builder="$(docker buildx inspect "${builder_name}" 2>/dev/null)" || echo "Builder '${builder_name}' not found" | ||
|
|
||
| if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \ | ||
| grep -q "linux/amd64" <<<"${current_builder}" && \ | ||
| grep -q "linux/arm64" <<<"${current_builder}" && \ | ||
| grep -q "linux/s390x" <<<"${current_builder}"; then | ||
| echo "The current builder already has multi-architecture support (amd64, arm64, s390x)." | ||
| echo "Skipping setup as the builder is already configured correctly." | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Check if the builder already exists by parsing the output of `docker buildx ls` | ||
| # We check if the builder_name appears in the list of active builders | ||
| existing_builder=$(docker buildx ls | grep -w "$builder_name" | awk '{print $1}') | ||
|
|
||
| if [ -n "$existing_builder" ]; then | ||
| echo "Builder '$builder_name' already exists." | ||
| echo "Using existing builder '$builder_name'." | ||
| docker buildx use "$builder_name" | ||
| else | ||
| echo "Creating a new Docker Buildx builder: $builder_name" | ||
| docker buildx create --driver-opt network=host --use --name "$builder_name" | ||
| echo "The new builder '$builder_name' has been created and set as active." | ||
| fi | ||
| } | ||
|
|
||
| if [ $# -eq 1 ]; then | ||
| create_or_use_buildx_builder "$1" | ||
| else | ||
| echo "Usage: $0 <builder_name>" | ||
| echo "Example: $0 mybuilder" | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,8 @@ | |
|
|
||
| destination=$1 | ||
| version=$(grep "^go " go.mod |awk '{print $2}') | ||
| arch=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') | ||
|
There was a problem hiding this comment. kubevirt/kubesecondarydns@d03ce8e here the logic is bit different (for s390x), are both fine ? or one should be fixed There was a problem hiding this comment. Both are same for s390x case. There was a problem hiding this comment. thank you There was a problem hiding this comment.
okay, I can see for ipam controller (https://github.com/kubevirt/ipam-extensions/blob/925bee6139751fcb241a435bae8b79ce1dfce595/Makefile#L121C50-L121C63) There was a problem hiding this comment. yes but i dont think we need to support ppc64le generally speaking on other sig network repos EDIT - anyhow, imho, even if we need it, it should be on a follow-up all over, There was a problem hiding this comment. @oshoval Just to inform you, I noticed that |
||
| tarball=go$version.linux-$arch.tar.gz | ||
| url=https://dl.google.com/go/ | ||
|
|
||
| mkdir -p $destination | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
imho it is better to be explicit with what we build please
./cmd/markerEDIT - as we spoke, since it was like that, lets keep it