Skip to content

Commit c3e4182

Browse files
smirasmira
committed
refactor: use COSI runtime with new controller runtime DB
See cosi-project/runtime#336 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent c1ee244 commit c3e4182

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+247
-256
lines changed

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,14 @@ WORKDIR /src/internal/app/machined
347347
ARG GO_BUILDFLAGS
348348
ARG GO_LDFLAGS
349349
ARG GOAMD64
350-
RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 GOAMD64=${GOAMD64} go build ${GO_BUILDFLAGS} -tags tcell_minimal -ldflags "${GO_LDFLAGS}" -o /machined
350+
RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 GOAMD64=${GOAMD64} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /machined
351351
RUN chmod +x /machined
352352

353353
FROM base AS machined-build-arm64
354354
WORKDIR /src/internal/app/machined
355355
ARG GO_BUILDFLAGS
356356
ARG GO_LDFLAGS
357-
RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -tags tcell_minimal -ldflags "${GO_LDFLAGS}" -o /machined
357+
RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /machined
358358
RUN chmod +x /machined
359359

360360
FROM machined-build-${TARGETARCH} AS machined-build

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ IMAGER_ARGS ?=
7878

7979
CGO_ENABLED ?= 0
8080
GO_BUILDFLAGS ?=
81+
GO_BUILDTAGS ?= tcell_minimal
8182
GO_LDFLAGS ?=
8283
GOAMD64 ?= v2
8384

@@ -92,11 +93,13 @@ INSTALLER_ARCH = targetarch
9293
endif
9394

9495
ifneq (, $(filter $(WITH_DEBUG), t true TRUE y yes 1))
95-
GO_BUILDFLAGS += -tags sidero.debug
96+
GO_BUILDTAGS := $(GO_BUILDTAGS),sidero.debug
9697
else
9798
GO_LDFLAGS += -s -w
9899
endif
99100

101+
GO_BUILDFLAGS += -tags "$(GO_BUILDTAGS)"
102+
100103
, := ,
101104
space := $(subst ,, )
102105
BUILD := docker buildx build

‎go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/containernetworking/cni v1.1.2
4242
github.com/containernetworking/plugins v1.3.0
4343
github.com/coreos/go-iptables v0.7.0
44-
github.com/cosi-project/runtime v0.3.11
44+
github.com/cosi-project/runtime v0.3.13
4545
github.com/docker/distribution v2.8.2+incompatible
4646
github.com/docker/docker v24.0.6+incompatible
4747
github.com/docker/go-connections v0.4.0
@@ -217,11 +217,8 @@ require (
217217
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
218218
github.com/hashicorp/errwrap v1.1.0 // indirect
219219
github.com/hashicorp/go-envparse v0.1.0
220-
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
221-
github.com/hashicorp/go-memdb v1.3.4 // indirect
222220
github.com/hashicorp/go-safetemp v1.0.0 // indirect
223221
github.com/hashicorp/go-version v1.6.0 // indirect
224-
github.com/hashicorp/golang-lru v0.5.4 // indirect
225222
github.com/hashicorp/hcl v1.0.0 // indirect
226223
github.com/hexops/gotextdiff v1.0.3 // indirect
227224
github.com/imdario/mergo v0.3.13 // indirect

‎go.sum

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V
164164
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
165165
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
166166
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
167-
github.com/cosi-project/runtime v0.3.11 h1:Kz4Wk/HwqWkLA3opFJWnJ0bF0LHLr4sWoPDcONrU26M=
168-
github.com/cosi-project/runtime v0.3.11/go.mod h1:kLIIwnTlUnVPhZZN82esCuyvD23eNJkOcnjWE7i+qBk=
167+
github.com/cosi-project/runtime v0.3.13 h1:879ECFAi0tTD0BiLv39iKqipKxU9tspKb411UhktdTg=
168+
github.com/cosi-project/runtime v0.3.13/go.mod h1:O3/3pjghhExoXuRlbZskjVCuvkFqqswf3hE1kP0rvZQ=
169169
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
170170
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
171171
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -386,24 +386,14 @@ github.com/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdm
386386
github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc=
387387
github.com/hashicorp/go-getter/v2 v2.2.1 h1:2JXqPZs1Jej67RtdTi0YZaEB2hEFB3fkBA4cPYKQwFQ=
388388
github.com/hashicorp/go-getter/v2 v2.2.1/go.mod h1:EcJx6oZE8hmGuRR1l38QrfnyiujQbwsEAn11eHv6l2M=
389-
github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
390-
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
391-
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
392-
github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c=
393-
github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
394389
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
395390
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
396391
github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
397392
github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
398-
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
399-
github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
400-
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
401393
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
402394
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
403395
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
404396
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
405-
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
406-
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
407397
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
408398
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
409399
github.com/hetznercloud/hcloud-go/v2 v2.2.0 h1:UzuqXXoy9+mMS2GKV9ZKF5BqvFkOJwW0XiSwEqGNxn0=

‎internal/app/machined/pkg/controllers/cluster/discovery_service.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/cosi-project/runtime/pkg/state"
2020
"github.com/siderolabs/discovery-api/api/v1alpha1/client/pb"
2121
discoveryclient "github.com/siderolabs/discovery-client/pkg/client"
22+
"github.com/siderolabs/gen/optional"
2223
"github.com/siderolabs/gen/xslices"
23-
"github.com/siderolabs/go-pointer"
2424
"go.uber.org/zap"
2525

2626
"github.com/siderolabs/talos/pkg/machinery/config/machine"
@@ -52,13 +52,13 @@ func (ctrl *DiscoveryServiceController) Inputs() []controller.Input {
5252
{
5353
Namespace: config.NamespaceName,
5454
Type: cluster.ConfigType,
55-
ID: pointer.To(cluster.ConfigID),
55+
ID: optional.Some(cluster.ConfigID),
5656
Kind: controller.InputWeak,
5757
},
5858
{
5959
Namespace: cluster.NamespaceName,
6060
Type: cluster.IdentityType,
61-
ID: pointer.To(cluster.LocalIdentity),
61+
ID: optional.Some(cluster.LocalIdentity),
6262
Kind: controller.InputWeak,
6363
},
6464
{
@@ -69,7 +69,7 @@ func (ctrl *DiscoveryServiceController) Inputs() []controller.Input {
6969
{
7070
Namespace: runtime.NamespaceName,
7171
Type: runtime.MachineStatusType,
72-
ID: pointer.To(runtime.MachineStatusID),
72+
ID: optional.Some(runtime.MachineStatusID),
7373
Kind: controller.InputWeak,
7474
},
7575
}
@@ -192,7 +192,7 @@ func (ctrl *DiscoveryServiceController) Run(ctx context.Context, r controller.Ru
192192
controller.Input{
193193
Namespace: cluster.NamespaceName,
194194
Type: cluster.AffiliateType,
195-
ID: pointer.To(ctrl.localAffiliateID),
195+
ID: optional.Some(ctrl.localAffiliateID),
196196
Kind: controller.InputWeak,
197197
},
198198
)); err != nil {

‎internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cosi-project/runtime/pkg/resource"
1313
"github.com/cosi-project/runtime/pkg/safe"
1414
"github.com/cosi-project/runtime/pkg/state"
15-
"github.com/siderolabs/go-pointer"
15+
"github.com/siderolabs/gen/optional"
1616
"go.uber.org/zap"
1717

1818
"github.com/siderolabs/talos/internal/pkg/discovery/registry"
@@ -38,13 +38,13 @@ func (ctrl *KubernetesPullController) Inputs() []controller.Input {
3838
{
3939
Namespace: config.NamespaceName,
4040
Type: cluster.ConfigType,
41-
ID: pointer.To(cluster.ConfigID),
41+
ID: optional.Some(cluster.ConfigID),
4242
Kind: controller.InputWeak,
4343
},
4444
{
4545
Namespace: k8s.NamespaceName,
4646
Type: k8s.NodenameType,
47-
ID: pointer.To(k8s.NodenameID),
47+
ID: optional.Some(k8s.NodenameID),
4848
Kind: controller.InputWeak,
4949
},
5050
}

‎internal/app/machined/pkg/controllers/cluster/kubernetes_push.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cosi-project/runtime/pkg/resource"
1313
"github.com/cosi-project/runtime/pkg/safe"
1414
"github.com/cosi-project/runtime/pkg/state"
15-
"github.com/siderolabs/go-pointer"
15+
"github.com/siderolabs/gen/optional"
1616
"go.uber.org/zap"
1717

1818
"github.com/siderolabs/talos/internal/pkg/discovery/registry"
@@ -40,13 +40,13 @@ func (ctrl *KubernetesPushController) Inputs() []controller.Input {
4040
{
4141
Namespace: config.NamespaceName,
4242
Type: cluster.ConfigType,
43-
ID: pointer.To(cluster.ConfigID),
43+
ID: optional.Some(cluster.ConfigID),
4444
Kind: controller.InputWeak,
4545
},
4646
{
4747
Namespace: cluster.NamespaceName,
4848
Type: cluster.IdentityType,
49-
ID: pointer.To(cluster.LocalIdentity),
49+
ID: optional.Some(cluster.LocalIdentity),
5050
Kind: controller.InputWeak,
5151
},
5252
}
@@ -109,7 +109,7 @@ func (ctrl *KubernetesPushController) Run(ctx context.Context, r controller.Runt
109109
controller.Input{
110110
Namespace: cluster.NamespaceName,
111111
Type: cluster.AffiliateType,
112-
ID: pointer.To(ctrl.localAffiliateID),
112+
ID: optional.Some(ctrl.localAffiliateID),
113113
Kind: controller.InputWeak,
114114
},
115115
)); err != nil {

‎internal/app/machined/pkg/controllers/cluster/local_affiliate.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/cosi-project/runtime/pkg/resource"
1515
"github.com/cosi-project/runtime/pkg/safe"
1616
"github.com/cosi-project/runtime/pkg/state"
17+
"github.com/siderolabs/gen/optional"
1718
"github.com/siderolabs/gen/xslices"
18-
"github.com/siderolabs/go-pointer"
1919
"github.com/siderolabs/net"
2020
"go.uber.org/zap"
2121

@@ -42,25 +42,25 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input {
4242
{
4343
Namespace: config.NamespaceName,
4444
Type: cluster.ConfigType,
45-
ID: pointer.To(cluster.ConfigID),
45+
ID: optional.Some(cluster.ConfigID),
4646
Kind: controller.InputWeak,
4747
},
4848
{
4949
Namespace: cluster.NamespaceName,
5050
Type: cluster.IdentityType,
51-
ID: pointer.To(cluster.LocalIdentity),
51+
ID: optional.Some(cluster.LocalIdentity),
5252
Kind: controller.InputWeak,
5353
},
5454
{
5555
Namespace: network.NamespaceName,
5656
Type: network.HostnameStatusType,
57-
ID: pointer.To(network.HostnameID),
57+
ID: optional.Some(network.HostnameID),
5858
Kind: controller.InputWeak,
5959
},
6060
{
6161
Namespace: k8s.NamespaceName,
6262
Type: k8s.NodenameType,
63-
ID: pointer.To(k8s.NodenameID),
63+
ID: optional.Some(k8s.NodenameID),
6464
Kind: controller.InputWeak,
6565
},
6666
{
@@ -71,19 +71,19 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input {
7171
{
7272
Namespace: kubespan.NamespaceName,
7373
Type: kubespan.IdentityType,
74-
ID: pointer.To(kubespan.LocalIdentity),
74+
ID: optional.Some(kubespan.LocalIdentity),
7575
Kind: controller.InputWeak,
7676
},
7777
{
7878
Namespace: config.NamespaceName,
7979
Type: kubespan.ConfigType,
80-
ID: pointer.To(kubespan.ConfigID),
80+
ID: optional.Some(kubespan.ConfigID),
8181
Kind: controller.InputWeak,
8282
},
8383
{
8484
Namespace: config.NamespaceName,
8585
Type: config.MachineTypeType,
86-
ID: pointer.To(config.MachineTypeID),
86+
ID: optional.Some(config.MachineTypeID),
8787
Kind: controller.InputWeak,
8888
},
8989
{
@@ -94,7 +94,7 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input {
9494
{
9595
Namespace: k8s.ControlPlaneNamespaceName,
9696
Type: k8s.APIServerConfigType,
97-
ID: pointer.To(k8s.APIServerConfigID),
97+
ID: optional.Some(k8s.APIServerConfigID),
9898
Kind: controller.InputWeak,
9999
},
100100
}

‎internal/app/machined/pkg/controllers/cluster/node_identity.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cosi-project/runtime/pkg/controller"
1313
"github.com/cosi-project/runtime/pkg/resource"
1414
"github.com/cosi-project/runtime/pkg/state"
15-
"github.com/siderolabs/go-pointer"
15+
"github.com/siderolabs/gen/optional"
1616
"go.uber.org/zap"
1717

1818
clusteradapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/cluster"
@@ -44,7 +44,7 @@ func (ctrl *NodeIdentityController) Inputs() []controller.Input {
4444
{
4545
Namespace: v1alpha1.NamespaceName,
4646
Type: runtimeres.MountStatusType,
47-
ID: pointer.To(constants.StatePartitionLabel),
47+
ID: optional.Some(constants.StatePartitionLabel),
4848
Kind: controller.InputWeak,
4949
},
5050
}

‎internal/app/machined/pkg/controllers/config/acquire.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/cosi-project/runtime/pkg/controller"
1818
"github.com/cosi-project/runtime/pkg/safe"
1919
"github.com/cosi-project/runtime/pkg/state"
20-
"github.com/siderolabs/go-pointer"
20+
"github.com/siderolabs/gen/optional"
2121
"go.uber.org/zap"
2222

2323
talosruntime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
@@ -77,7 +77,7 @@ func (ctrl *AcquireController) Inputs() []controller.Input {
7777
{
7878
Namespace: configresource.NamespaceName,
7979
Type: configresource.MachineConfigType,
80-
ID: pointer.To(configresource.MaintenanceID),
80+
ID: optional.Some(configresource.MaintenanceID),
8181
Kind: controller.InputWeak,
8282
},
8383
{

0 commit comments

Comments
 (0)