Skip to content

Commit 7f09750

Browse files
smirasmira
committed
feat: update to Talos 1.8
Update integration tests. Add Apache CloudStack, new overlays. Fixes #141 Fixes #142 Fixes #131 Fixes #143 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent b985abc commit 7f09750

14 files changed

Lines changed: 557 additions & 310 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-08-07T12:15:26Z by kres dbf015a.
5+
# Generated on 2024-08-30T14:42:37Z by kres b5ca957.
66

77
ARG TOOLCHAIN
88

99
FROM alpine:3.18 AS base-image-image-factory
1010

1111
# runs markdownlint
12-
FROM docker.io/oven/bun:1.1.21-alpine AS lint-markdown
12+
FROM docker.io/oven/bun:1.1.26-alpine AS lint-markdown
1313
WORKDIR /src
1414
RUN bun i markdownlint-cli@0.41.0 sentences-per-line@0.2.1
1515
COPY .markdownlint.json .

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-08-07T12:15:26Z by kres dbf015a.
3+
# Generated on 2024-08-30T14:42:37Z by kres b5ca957.
44

55
# common variables
66

@@ -19,13 +19,13 @@ USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
2020
PROTOBUF_GO_VERSION ?= 1.34.2
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.21.0
22+
GRPC_GATEWAY_VERSION ?= 2.22.0
2323
VTPROTOBUF_VERSION ?= 0.6.0
2424
GOIMPORTS_VERSION ?= 0.24.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.59.1
27-
GOFUMPT_VERSION ?= v0.6.0
28-
GO_VERSION ?= 1.22.5
26+
GOLANGCILINT_VERSION ?= v1.60.3
27+
GOFUMPT_VERSION ?= v0.7.0
28+
GO_VERSION ?= 1.23.0
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
@@ -67,7 +67,7 @@ COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
6767
COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
6868
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
6969
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
70-
TOOLCHAIN ?= docker.io/golang:1.22-alpine
70+
TOOLCHAIN ?= docker.io/golang:1.23-alpine
7171

7272
# extra variables
7373

‎go.mod‎

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
module github.com/siderolabs/image-factory
22

3-
go 1.22.5
4-
5-
// https://github.com/golang/go/issues/68761
6-
replace golang.org/x/sys => golang.org/x/sys v0.22.0
3+
go 1.22.6
74

85
require (
96
github.com/blang/semver/v4 v4.0.0
107
github.com/google/go-containerregistry v0.20.2
118
github.com/h2non/filetype v1.1.3
129
github.com/julienschmidt/httprouter v1.3.0
10+
github.com/klauspost/compress v1.17.9
1311
github.com/opencontainers/go-digest v1.0.0
14-
github.com/prometheus/client_golang v1.19.1
12+
github.com/prometheus/client_golang v1.20.2
1513
github.com/siderolabs/gen v0.5.0
16-
github.com/siderolabs/go-debug v0.3.0
14+
github.com/siderolabs/go-debug v0.4.0
1715
github.com/siderolabs/go-pointer v1.0.0
18-
github.com/siderolabs/talos v1.8.0-alpha.1.0.20240807121828-9a126d70e0ad
19-
github.com/siderolabs/talos/pkg/machinery v1.8.0-alpha.1.0.20240807121828-9a126d70e0ad
16+
github.com/siderolabs/talos v1.8.0-alpha.2
17+
github.com/siderolabs/talos/pkg/machinery v1.8.0-alpha.2.0.20240830181738-6f7c3a8e5c63
2018
github.com/sigstore/cosign/v2 v2.4.0
2119
github.com/sigstore/sigstore v1.8.8
2220
github.com/slok/go-http-metrics v0.12.0
@@ -26,7 +24,7 @@ require (
2624
go.uber.org/zap v1.27.0
2725
golang.org/x/net v0.28.0
2826
golang.org/x/sync v0.8.0
29-
golang.org/x/sys v0.23.0
27+
golang.org/x/sys v0.24.0
3028
gopkg.in/yaml.v3 v3.0.1
3129
)
3230

@@ -54,12 +52,12 @@ require (
5452
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
5553
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
5654
github.com/Microsoft/go-winio v0.6.2 // indirect
57-
github.com/Microsoft/hcsshim v0.12.4 // indirect
58-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
55+
github.com/Microsoft/hcsshim v0.12.6 // indirect
56+
github.com/ProtonMail/go-crypto v1.1.0-alpha.5.0.20240827111422-b5837fa4476e // indirect
5957
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
6058
github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
6159
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
62-
github.com/adrg/xdg v0.4.0 // indirect
60+
github.com/adrg/xdg v0.5.0 // indirect
6361
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
6462
github.com/alibabacloud-go/cr-20160607 v1.0.1 // indirect
6563
github.com/alibabacloud-go/cr-20181201 v1.0.10 // indirect
@@ -71,24 +69,25 @@ require (
7169
github.com/alibabacloud-go/tea-utils v1.4.5 // indirect
7270
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
7371
github.com/aliyun/credentials-go v1.3.1 // indirect
72+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7473
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
7574
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
76-
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
77-
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
78-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
79-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
80-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
81-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
82-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
75+
github.com/aws/aws-sdk-go-v2 v1.30.4 // indirect
76+
github.com/aws/aws-sdk-go-v2/config v1.27.31 // indirect
77+
github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect
78+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
79+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
80+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
81+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
8382
github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 // indirect
8483
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
86-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
87-
github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 // indirect
88-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
89-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
90-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
91-
github.com/aws/smithy-go v1.20.3 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/kms v1.35.5 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
88+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
89+
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect
90+
github.com/aws/smithy-go v1.20.4 // indirect
9291
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
9392
github.com/beorn7/perks v1.0.1 // indirect
9493
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -100,8 +99,8 @@ require (
10099
github.com/cloudflare/circl v1.3.9 // indirect
101100
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
102101
github.com/containerd/cgroups/v3 v3.0.3 // indirect
103-
github.com/containerd/containerd/api v1.8.0-rc.2 // indirect
104-
github.com/containerd/containerd/v2 v2.0.0-rc.3 // indirect
102+
github.com/containerd/containerd/api v1.8.0-rc.3 // indirect
103+
github.com/containerd/containerd/v2 v2.0.0-rc.4 // indirect
105104
github.com/containerd/continuity v0.4.3 // indirect
106105
github.com/containerd/errdefs v0.1.0 // indirect
107106
github.com/containerd/fifo v1.1.0 // indirect
@@ -110,12 +109,12 @@ require (
110109
github.com/containerd/platforms v0.2.1 // indirect
111110
github.com/containerd/plugin v0.1.0 // indirect
112111
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
113-
github.com/containerd/ttrpc v1.2.4 // indirect
114-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
115-
github.com/containernetworking/cni v1.2.2 // indirect
112+
github.com/containerd/ttrpc v1.2.5 // indirect
113+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
114+
github.com/containernetworking/cni v1.2.3 // indirect
116115
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
117116
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
118-
github.com/cosi-project/runtime v0.5.3 // indirect
117+
github.com/cosi-project/runtime v0.5.5 // indirect
119118
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
120119
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
121120
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
@@ -130,7 +129,7 @@ require (
130129
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
131130
github.com/fatih/color v1.17.0 // indirect
132131
github.com/felixge/httpsnoop v1.0.4 // indirect
133-
github.com/foxboron/go-uefi v0.0.0-20240522180132-205d5597883a // indirect
132+
github.com/foxboron/go-uefi v0.0.0-20240805124652-e2076f0e58ca // indirect
134133
github.com/freddierice/go-losetup/v2 v2.0.1 // indirect
135134
github.com/fsnotify/fsnotify v1.7.0 // indirect
136135
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -158,6 +157,7 @@ require (
158157
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
159158
github.com/golang/protobuf v1.5.4 // indirect
160159
github.com/golang/snappy v0.0.4 // indirect
160+
github.com/google/cel-go v0.20.1 // indirect
161161
github.com/google/certificate-transparency-go v1.2.1 // indirect
162162
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
163163
github.com/google/go-cmp v0.6.0 // indirect
@@ -167,7 +167,7 @@ require (
167167
github.com/google/gofuzz v1.2.0 // indirect
168168
github.com/google/nftables v0.2.0 // indirect
169169
github.com/google/uuid v1.6.0 // indirect
170-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
170+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
171171
github.com/hashicorp/errwrap v1.1.0 // indirect
172172
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
173173
github.com/hashicorp/go-envparse v0.1.0 // indirect
@@ -183,7 +183,6 @@ require (
183183
github.com/josharian/native v1.1.0 // indirect
184184
github.com/jsimonetti/rtnetlink/v2 v2.0.2 // indirect
185185
github.com/json-iterator/go v1.1.12 // indirect
186-
github.com/klauspost/compress v1.17.9 // indirect
187186
github.com/kylelemons/godebug v1.1.0 // indirect
188187
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
189188
github.com/linode/go-metadata v0.2.0 // indirect
@@ -200,10 +199,11 @@ require (
200199
github.com/mitchellh/go-homedir v1.1.0 // indirect
201200
github.com/mitchellh/mapstructure v1.5.0 // indirect
202201
github.com/moby/locker v1.0.1 // indirect
203-
github.com/moby/sys/mountinfo v0.7.1 // indirect
204-
github.com/moby/sys/sequential v0.5.0 // indirect
205-
github.com/moby/sys/signal v0.7.0 // indirect
206-
github.com/moby/sys/user v0.1.0 // indirect
202+
github.com/moby/sys/mountinfo v0.7.2 // indirect
203+
github.com/moby/sys/sequential v0.6.0 // indirect
204+
github.com/moby/sys/signal v0.7.1 // indirect
205+
github.com/moby/sys/user v0.3.0 // indirect
206+
github.com/moby/sys/userns v0.1.0 // indirect
207207
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
208208
github.com/modern-go/reflect2 v1.0.2 // indirect
209209
github.com/mozillazg/docker-credential-acr-helper v0.3.0 // indirect
@@ -215,36 +215,36 @@ require (
215215
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
216216
github.com/opencontainers/selinux v1.11.0 // indirect
217217
github.com/opentracing/opentracing-go v1.2.0 // indirect
218-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
218+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
219219
github.com/pierrec/lz4/v4 v4.1.21 // indirect
220220
github.com/pin/tftp/v3 v3.1.0 // indirect
221221
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
222222
github.com/pkg/errors v0.9.1 // indirect
223-
github.com/planetscale/vtprotobuf v0.6.0 // indirect
223+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
224224
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
225225
github.com/prometheus/client_model v0.6.1 // indirect
226226
github.com/prometheus/common v0.55.0 // indirect
227227
github.com/prometheus/procfs v0.15.1 // indirect
228-
github.com/rs/xid v1.5.0 // indirect
228+
github.com/rs/xid v1.6.0 // indirect
229229
github.com/ryanuber/go-glob v1.0.0 // indirect
230230
github.com/sagikazarmark/locafero v0.4.0 // indirect
231231
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
232232
github.com/sassoftware/relic v7.2.1+incompatible // indirect
233-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28 // indirect
233+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect
234234
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
235235
github.com/segmentio/ksuid v1.0.4 // indirect
236236
github.com/shibumi/go-pathspec v1.3.0 // indirect
237237
github.com/siderolabs/crypto v0.4.4 // indirect
238-
github.com/siderolabs/go-api-signature v0.3.3 // indirect
238+
github.com/siderolabs/go-api-signature v0.3.5 // indirect
239239
github.com/siderolabs/go-blockdevice v0.4.7 // indirect
240+
github.com/siderolabs/go-blockdevice/v2 v2.0.1 // indirect
240241
github.com/siderolabs/go-circular v0.2.0 // indirect
241242
github.com/siderolabs/go-cmd v0.1.1 // indirect
242243
github.com/siderolabs/go-copy v0.1.0 // indirect
243244
github.com/siderolabs/go-procfs v0.1.2 // indirect
244245
github.com/siderolabs/go-retry v0.3.3 // indirect
245-
github.com/siderolabs/go-smbios v0.3.2 // indirect
246+
github.com/siderolabs/go-smbios v0.3.3 // indirect
246247
github.com/siderolabs/go-tail v0.1.1 // indirect
247-
github.com/siderolabs/kms-client v0.1.0 // indirect
248248
github.com/siderolabs/net v0.4.0 // indirect
249249
github.com/siderolabs/protoenc v0.2.1 // indirect
250250
github.com/sigstore/fulcio v1.5.1 // indirect
@@ -259,6 +259,7 @@ require (
259259
github.com/spf13/cobra v1.8.1 // indirect
260260
github.com/spf13/pflag v1.0.5 // indirect
261261
github.com/spf13/viper v1.19.0 // indirect
262+
github.com/stoewer/go-strcase v1.3.0 // indirect
262263
github.com/subosito/gotenv v1.6.0 // indirect
263264
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
264265
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
@@ -284,30 +285,30 @@ require (
284285
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
285286
golang.org/x/crypto v0.26.0 // indirect
286287
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
287-
golang.org/x/mod v0.19.0 // indirect
288+
golang.org/x/mod v0.20.0 // indirect
288289
golang.org/x/oauth2 v0.22.0 // indirect
289290
golang.org/x/term v0.23.0 // indirect
290291
golang.org/x/text v0.17.0 // indirect
291-
golang.org/x/time v0.5.0 // indirect
292+
golang.org/x/time v0.6.0 // indirect
292293
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect
293-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
294-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
295-
google.golang.org/grpc v1.65.0 // indirect
294+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
295+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
296+
google.golang.org/grpc v1.66.0 // indirect
296297
google.golang.org/protobuf v1.34.2 // indirect
297298
gopkg.in/inf.v0 v0.9.1 // indirect
298299
gopkg.in/ini.v1 v1.67.0 // indirect
299300
gopkg.in/yaml.v2 v2.4.0 // indirect
300-
k8s.io/api v0.31.0-rc.1 // indirect
301-
k8s.io/apimachinery v0.31.0-rc.1 // indirect
302-
k8s.io/client-go v0.31.0-rc.1 // indirect
301+
k8s.io/api v0.31.0 // indirect
302+
k8s.io/apimachinery v0.31.0 // indirect
303+
k8s.io/client-go v0.31.0 // indirect
303304
k8s.io/klog/v2 v2.130.1 // indirect
304-
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
305+
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
305306
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
306307
rsc.io/qr v0.2.0 // indirect
307308
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
308309
sigs.k8s.io/release-utils v0.8.4 // indirect
309310
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
310311
sigs.k8s.io/yaml v1.4.0 // indirect
311-
tags.cncf.io/container-device-interface v0.7.2 // indirect
312-
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
312+
tags.cncf.io/container-device-interface v0.8.0 // indirect
313+
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
313314
)

0 commit comments

Comments
 (0)