Skip to content

Commit 53947d5

Browse files
committed
Build multiarch images
Signed-off-by: Dinar Valeev <[email protected]>
1 parent 82f664a commit 53947d5

File tree

4 files changed

+91
-117
lines changed

4 files changed

+91
-117
lines changed

.github/workflows/build-docker.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ jobs:
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: '1.24'
19+
go-version-file: ./go.mod
2020
id: go
21-
- name: Build binary
22-
run: |
23-
make managers
2421
- name: 'Login to GitHub Container Registry'
2522
uses: docker/login-action@v1
2623
with:
@@ -31,6 +28,7 @@ jobs:
3128
env:
3229
REGISTRY: ghcr.io/absaoss
3330
TAG: v2.9.3
31+
GO_VERSION: ${{steps.go.outputs.go-version}}
3432
run: |
3533
make docker-build-all
3634
make docker-push-manifest

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY go.sum go.sum
3232
# and so that source changes don't invalidate our downloaded layer
3333
RUN --mount=type=cache,target=/root/.local/share/golang \
3434
--mount=type=cache,target=/go/pkg/mod \
35-
go mod download
35+
go mod tidy
3636

3737
# Copy the sources
3838
COPY ./ ./

go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ require (
6868
sigs.k8s.io/aws-iam-authenticator v0.6.13
6969
sigs.k8s.io/cluster-api v1.10.2
7070
sigs.k8s.io/cluster-api/test v1.10.2
71-
sigs.k8s.io/controller-runtime v0.20.4
71+
sigs.k8s.io/controller-runtime v0.21.0
7272
sigs.k8s.io/yaml v1.4.0
7373
)
7474

@@ -91,11 +91,13 @@ require (
9191
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
9292
github.com/openshift-online/ocm-api-model/model v0.0.431 // indirect
9393
github.com/robfig/cron/v3 v3.0.1 // indirect
94+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
95+
sigs.k8s.io/randfill v1.0.0 // indirect
9496
)
9597

9698
require (
9799
al.essio.dev/pkg/shellescape v1.5.1 // indirect
98-
cel.dev/expr v0.18.0 // indirect
100+
cel.dev/expr v0.19.1 // indirect
99101
dario.cat/mergo v1.0.1 // indirect
100102
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
101103
github.com/99designs/keyring v1.2.2 // indirect
@@ -110,7 +112,6 @@ require (
110112
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
111113
github.com/adrg/xdg v0.5.3 // indirect
112114
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
113-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
114115
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
115116
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 // indirect
116117
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect
@@ -167,19 +168,18 @@ require (
167168
github.com/gogo/protobuf v1.3.2 // indirect
168169
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
169170
github.com/golang/glog v1.2.5 // indirect
170-
github.com/golang/protobuf v1.5.4 // indirect
171171
github.com/google/btree v1.1.3 // indirect
172-
github.com/google/cel-go v0.22.0 // indirect
173-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
172+
github.com/google/cel-go v0.23.2 // indirect
173+
github.com/google/gnostic-models v0.6.9 // indirect
174174
github.com/google/go-github/v53 v53.2.0 // indirect
175175
github.com/google/go-querystring v1.1.0 // indirect
176176
github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect
177177
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
178178
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
179179
github.com/google/uuid v1.6.0 // indirect
180180
github.com/gorilla/css v1.0.1 // indirect
181-
github.com/gorilla/websocket v1.5.3 // indirect
182-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
181+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
182+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
183183
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
184184
github.com/hashicorp/go-version v1.6.0 // indirect
185185
github.com/huandu/xstrings v1.5.0 // indirect
@@ -232,35 +232,35 @@ require (
232232
github.com/x448/float16 v0.8.4 // indirect
233233
github.com/zalando/go-keyring v0.2.3 // indirect
234234
gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a // indirect
235-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
236-
go.opentelemetry.io/otel v1.29.0 // indirect
237-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
238-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
239-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
240-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
241-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
242-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
235+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
236+
go.opentelemetry.io/otel v1.33.0 // indirect
237+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
238+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
239+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
240+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
241+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
242+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
243243
go.uber.org/multierr v1.11.0 // indirect
244244
go.uber.org/zap v1.27.0 // indirect
245245
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
246246
golang.org/x/oauth2 v0.30.0 // indirect
247247
golang.org/x/sync v0.16.0 // indirect
248248
golang.org/x/sys v0.35.0 // indirect
249249
golang.org/x/term v0.34.0 // indirect
250-
golang.org/x/time v0.8.0 // indirect
250+
golang.org/x/time v0.9.0 // indirect
251251
golang.org/x/tools v0.35.0 // indirect
252252
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
253253
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
254254
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
255-
google.golang.org/grpc v1.67.3 // indirect
255+
google.golang.org/grpc v1.68.1 // indirect
256256
google.golang.org/protobuf v1.36.8 // indirect
257257
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
258258
gopkg.in/inf.v0 v0.9.1 // indirect
259259
gopkg.in/yaml.v3 v3.0.1 // indirect
260260
k8s.io/cluster-bootstrap v0.32.3 // indirect
261-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
262-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
261+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
262+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
263263
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
264264
sigs.k8s.io/kind v0.27.0 // indirect
265-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
265+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
266266
)

0 commit comments

Comments
 (0)