Skip to content

Commit c8b6ad4

Browse files
committed
chore: drop linux/arm/v7 build, make use of multiple exporters
Signed-off-by: Bence Csati <[email protected]>
1 parent 3562d65 commit c8b6ad4

File tree

4 files changed

+7
-26
lines changed

4 files changed

+7
-26
lines changed

.github/workflows/artifacts.yaml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878

7979
- name: Set up Cosign
8080
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
81-
if: inputs.publish
81+
if: ${{ inputs.publish }}
8282

8383
- name: Set image name
8484
id: image-name
@@ -102,37 +102,28 @@ jobs:
102102
org.opencontainers.image.authors=Kube logging authors
103103
org.opencontainers.image.documentation=https://kube-logging.dev/docs/
104104
105-
# Multiple exporters are not supported yet
106-
# See https://github.com/moby/buildkit/pull/2760
107-
- name: Determine build output
108-
uses: haya14busa/action-cond@94f77f7a80cd666cb3155084e428254fea4281fd # v1.2.1
109-
id: build-output
110-
with:
111-
cond: ${{ inputs.publish }}
112-
if_true: type=image,push=true
113-
if_false: type=oci,dest=image.tar
114-
115105
- name: Login to GitHub Container Registry
116106
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
117107
with:
118108
registry: ghcr.io
119109
username: ${{ github.actor }}
120110
password: ${{ github.token }}
121-
if: inputs.publish
111+
if: ${{ inputs.publish }}
122112

123113
- name: Build and push image
124114
id: build
125115
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
126116
with:
127117
context: .
128-
platforms: linux/amd64,linux/arm64,linux/arm/v7
118+
platforms: linux/amd64,linux/arm64
129119
tags: ${{ steps.meta.outputs.tags }}
130120
labels: ${{ steps.meta.outputs.labels }}
131121
cache-from: type=gha
132122
cache-to: type=gha,mode=max
133123
build-args: GO_BUILD_FLAGS=-ldflags=-X=github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1.Version=${{ inputs.version }}
134-
outputs: ${{ steps.build-output.outputs.value }},name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
135-
# push: ${{ inputs.publish }}
124+
outputs: |
125+
type=image,push=${{ inputs.publish }},name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
126+
type=oci,dest=image.tar,name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
136127
137128
- name: Sign image with GitHub OIDC Token
138129
if: ${{ inputs.publish && github.repository_owner == 'kube-logging' }} # Check if the workflow is called by the same GitHub organization
@@ -199,10 +190,6 @@ jobs:
199190
fi
200191
fi
201192

202-
- name: Fetch image
203-
run: skopeo --insecure-policy copy docker://${{ steps.image-name.outputs.value }}:${{ steps.meta.outputs.version }} oci-archive:image.tar
204-
if: inputs.publish
205-
206193
- name: Extract OCI tarball
207194
run: |
208195
mkdir -p image

.github/workflows/config-reloader.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323

2424
- name: Set up QEMU
2525
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
26-
with:
27-
platforms: all
2826

2927
- name: Set up Docker Buildx
3028
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

.github/workflows/fluentd-images.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ jobs:
8484

8585
- name: Set up QEMU
8686
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
87-
with:
88-
platforms: all
8987

9088
- name: Set up Docker Buildx
9189
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
@@ -198,8 +196,6 @@ jobs:
198196

199197
- name: Set up QEMU
200198
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
201-
with:
202-
platforms: all
203199

204200
- name: Set up Docker Buildx
205201
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

hack/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function main()
2020

2121
function load_images()
2222
{
23-
local images=( "controller:local" "fluentd-full:local" "config-reloader:local")
23+
local images=( "controller:local" "fluentd-full:local" "config-reloader:local" )
2424
for image in ${images[@]}; do
2525
kind load docker-image "${image}"
2626
done

0 commit comments

Comments
 (0)