From c3e418200032be376aa30f6db133f2dcbf8b67c2 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 9 Oct 2023 15:02:00 +0400 Subject: [PATCH] refactor: use COSI runtime with new controller runtime DB See https://github.com/cosi-project/runtime/pull/336 Signed-off-by: Andrey Smirnov --- Dockerfile | 4 ++-- Makefile | 5 ++++- go.mod | 5 +---- go.sum | 14 ++------------ .../controllers/cluster/discovery_service.go | 10 +++++----- .../pkg/controllers/cluster/kubernetes_pull.go | 6 +++--- .../pkg/controllers/cluster/kubernetes_push.go | 8 ++++---- .../pkg/controllers/cluster/local_affiliate.go | 18 +++++++++--------- .../pkg/controllers/cluster/node_identity.go | 4 ++-- .../machined/pkg/controllers/config/acquire.go | 4 ++-- .../pkg/controllers/config/machine_type.go | 4 ++-- .../pkg/controllers/cri/seccomp_profile.go | 4 ++-- .../controllers/cri/seccomp_profile_file.go | 4 ++-- .../pkg/controllers/etcd/advertised_peer.go | 8 ++++---- .../machined/pkg/controllers/etcd/member.go | 4 ++-- .../app/machined/pkg/controllers/etcd/pki.go | 6 +++--- .../app/machined/pkg/controllers/etcd/spec.go | 8 ++++---- .../controllers/files/cri_registry_config.go | 4 ++-- .../pkg/controllers/k8s/address_filter.go | 4 ++-- .../k8s/control_plane_static_pod.go | 7 ++++--- .../machined/pkg/controllers/k8s/endpoint.go | 8 ++++---- .../pkg/controllers/k8s/extra_manifest.go | 4 ++-- .../pkg/controllers/k8s/kubelet_config.go | 3 +-- .../pkg/controllers/k8s/kubelet_service.go | 9 ++++----- .../pkg/controllers/k8s/kubelet_spec.go | 7 ++++--- .../pkg/controllers/k8s/kubelet_static_pod.go | 10 +++++----- .../machined/pkg/controllers/k8s/kubeprism.go | 4 ++-- .../machined/pkg/controllers/k8s/manifest.go | 4 ++-- .../pkg/controllers/k8s/manifest_apply.go | 6 +++--- .../machined/pkg/controllers/k8s/node_apply.go | 8 ++++---- .../pkg/controllers/k8s/node_cordoned_spec.go | 4 ++-- .../pkg/controllers/k8s/node_label_spec.go | 4 ++-- .../pkg/controllers/k8s/node_status.go | 4 ++-- .../pkg/controllers/k8s/node_taint_spec.go | 4 ++-- .../app/machined/pkg/controllers/k8s/nodeip.go | 6 +++--- .../machined/pkg/controllers/k8s/nodename.go | 6 +++--- .../k8s/render_secrets_static_pod.go | 12 ++++++------ .../pkg/controllers/k8s/static_endpoint.go | 4 ++-- .../pkg/controllers/k8s/static_pod_config.go | 4 ++-- .../pkg/controllers/kubeaccess/endpoint.go | 6 +++--- .../controllers/kubeaccess/serviceaccount.go | 8 ++++---- .../pkg/controllers/kubespan/identity.go | 8 ++++---- .../pkg/controllers/kubespan/manager.go | 6 +++--- .../pkg/controllers/kubespan/peer_spec.go | 6 +++--- .../pkg/controllers/network/address_event.go | 6 +++--- .../pkg/controllers/network/device_config.go | 4 ++-- .../pkg/controllers/network/etcfile.go | 10 +++++----- .../pkg/controllers/network/hostname_config.go | 8 ++++---- .../pkg/controllers/network/platform_config.go | 4 ++-- .../pkg/controllers/network/resolver_config.go | 4 ++-- .../machined/pkg/controllers/network/status.go | 4 ++-- .../controllers/network/timeserver_config.go | 4 ++-- .../pkg/controllers/network/utils/utils.go | 4 ++-- .../pkg/controllers/runtime/cri_image_gc.go | 8 ++++---- .../runtime/drop_upgrade_fallback.go | 4 ++-- .../pkg/controllers/runtime/events_sink.go | 4 ++-- .../controllers/runtime/events_sink_config.go | 4 ++-- .../runtime/kernel_module_config.go | 4 ++-- .../controllers/runtime/kernel_param_config.go | 4 ++-- .../pkg/controllers/runtime/kmsg_log.go | 4 ++-- .../pkg/controllers/runtime/kmsg_log_config.go | 4 ++-- .../pkg/controllers/runtime/machine_status.go | 10 +++++----- .../runtime/machine_status_publisher.go | 4 ++-- .../controllers/runtime/maintenance_config.go | 6 +++--- .../controllers/runtime/maintenance_service.go | 8 ++++---- .../machined/pkg/controllers/runtime/utils.go | 4 ++-- .../machined/pkg/controllers/secrets/api.go | 14 +++++++------- .../pkg/controllers/secrets/api_cert_sans.go | 8 ++++---- .../machined/pkg/controllers/secrets/etcd.go | 12 ++++++------ .../pkg/controllers/secrets/kubernetes.go | 6 +++--- .../secrets/kubernetes_cert_sans.go | 8 ++++---- .../secrets/kubernetes_dynamic_certs.go | 10 +++++----- .../pkg/controllers/secrets/maintenance.go | 8 ++++---- .../secrets/maintenance_cert_sans.go | 6 +++--- .../machined/pkg/controllers/secrets/trustd.go | 14 +++++++------- .../pkg/controllers/siderolink/config.go | 4 ++-- .../pkg/controllers/siderolink/manager.go | 5 +++-- .../app/machined/pkg/controllers/time/sync.go | 6 +++--- .../machined/pkg/controllers/v1alpha1/utils.go | 4 ++-- pkg/machinery/go.mod | 2 +- pkg/machinery/go.sum | 4 ++-- 81 files changed, 247 insertions(+), 256 deletions(-) diff --git a/Dockerfile b/Dockerfile index bbc3f89b6..6e02c82b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -347,14 +347,14 @@ WORKDIR /src/internal/app/machined ARG GO_BUILDFLAGS ARG GO_LDFLAGS ARG GOAMD64 -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 GOAMD64=${GOAMD64} go build ${GO_BUILDFLAGS} -tags tcell_minimal -ldflags "${GO_LDFLAGS}" -o /machined +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 GOAMD64=${GOAMD64} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /machined RUN chmod +x /machined FROM base AS machined-build-arm64 WORKDIR /src/internal/app/machined ARG GO_BUILDFLAGS ARG GO_LDFLAGS -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -tags tcell_minimal -ldflags "${GO_LDFLAGS}" -o /machined +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /machined RUN chmod +x /machined FROM machined-build-${TARGETARCH} AS machined-build diff --git a/Makefile b/Makefile index ac741d634..554bdd7a4 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,7 @@ IMAGER_ARGS ?= CGO_ENABLED ?= 0 GO_BUILDFLAGS ?= +GO_BUILDTAGS ?= tcell_minimal GO_LDFLAGS ?= GOAMD64 ?= v2 @@ -92,11 +93,13 @@ INSTALLER_ARCH = targetarch endif ifneq (, $(filter $(WITH_DEBUG), t true TRUE y yes 1)) -GO_BUILDFLAGS += -tags sidero.debug +GO_BUILDTAGS := $(GO_BUILDTAGS),sidero.debug else GO_LDFLAGS += -s -w endif +GO_BUILDFLAGS += -tags "$(GO_BUILDTAGS)" + , := , space := $(subst ,, ) BUILD := docker buildx build diff --git a/go.mod b/go.mod index 9dd5782c0..567fd44de 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 github.com/coreos/go-iptables v0.7.0 - github.com/cosi-project/runtime v0.3.11 + github.com/cosi-project/runtime v0.3.13 github.com/docker/distribution v2.8.2+incompatible github.com/docker/docker v24.0.6+incompatible github.com/docker/go-connections v0.4.0 @@ -217,11 +217,8 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-envparse v0.1.0 - github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-memdb v1.3.4 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/imdario/mergo v0.3.13 // indirect diff --git a/go.sum b/go.sum index 814d3c366..1db5644c1 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cosi-project/runtime v0.3.11 h1:Kz4Wk/HwqWkLA3opFJWnJ0bF0LHLr4sWoPDcONrU26M= -github.com/cosi-project/runtime v0.3.11/go.mod h1:kLIIwnTlUnVPhZZN82esCuyvD23eNJkOcnjWE7i+qBk= +github.com/cosi-project/runtime v0.3.13 h1:879ECFAi0tTD0BiLv39iKqipKxU9tspKb411UhktdTg= +github.com/cosi-project/runtime v0.3.13/go.mod h1:O3/3pjghhExoXuRlbZskjVCuvkFqqswf3hE1kP0rvZQ= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= 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 github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= github.com/hashicorp/go-getter/v2 v2.2.1 h1:2JXqPZs1Jej67RtdTi0YZaEB2hEFB3fkBA4cPYKQwFQ= github.com/hashicorp/go-getter/v2 v2.2.1/go.mod h1:EcJx6oZE8hmGuRR1l38QrfnyiujQbwsEAn11eHv6l2M= -github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= -github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hetznercloud/hcloud-go/v2 v2.2.0 h1:UzuqXXoy9+mMS2GKV9ZKF5BqvFkOJwW0XiSwEqGNxn0= diff --git a/internal/app/machined/pkg/controllers/cluster/discovery_service.go b/internal/app/machined/pkg/controllers/cluster/discovery_service.go index aac5da450..6963af516 100644 --- a/internal/app/machined/pkg/controllers/cluster/discovery_service.go +++ b/internal/app/machined/pkg/controllers/cluster/discovery_service.go @@ -19,8 +19,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/discovery-api/api/v1alpha1/client/pb" discoveryclient "github.com/siderolabs/discovery-client/pkg/client" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/config/machine" @@ -52,13 +52,13 @@ func (ctrl *DiscoveryServiceController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: cluster.ConfigType, - ID: pointer.To(cluster.ConfigID), + ID: optional.Some(cluster.ConfigID), Kind: controller.InputWeak, }, { Namespace: cluster.NamespaceName, Type: cluster.IdentityType, - ID: pointer.To(cluster.LocalIdentity), + ID: optional.Some(cluster.LocalIdentity), Kind: controller.InputWeak, }, { @@ -69,7 +69,7 @@ func (ctrl *DiscoveryServiceController) Inputs() []controller.Input { { Namespace: runtime.NamespaceName, Type: runtime.MachineStatusType, - ID: pointer.To(runtime.MachineStatusID), + ID: optional.Some(runtime.MachineStatusID), Kind: controller.InputWeak, }, } @@ -192,7 +192,7 @@ func (ctrl *DiscoveryServiceController) Run(ctx context.Context, r controller.Ru controller.Input{ Namespace: cluster.NamespaceName, Type: cluster.AffiliateType, - ID: pointer.To(ctrl.localAffiliateID), + ID: optional.Some(ctrl.localAffiliateID), Kind: controller.InputWeak, }, )); err != nil { diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go index 0e09319d8..6a33b1293 100644 --- a/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go +++ b/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/internal/pkg/discovery/registry" @@ -38,13 +38,13 @@ func (ctrl *KubernetesPullController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: cluster.ConfigType, - ID: pointer.To(cluster.ConfigID), + ID: optional.Some(cluster.ConfigID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go index 8341d3f40..b4fecbf2e 100644 --- a/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go +++ b/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/internal/pkg/discovery/registry" @@ -40,13 +40,13 @@ func (ctrl *KubernetesPushController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: cluster.ConfigType, - ID: pointer.To(cluster.ConfigID), + ID: optional.Some(cluster.ConfigID), Kind: controller.InputWeak, }, { Namespace: cluster.NamespaceName, Type: cluster.IdentityType, - ID: pointer.To(cluster.LocalIdentity), + ID: optional.Some(cluster.LocalIdentity), Kind: controller.InputWeak, }, } @@ -109,7 +109,7 @@ func (ctrl *KubernetesPushController) Run(ctx context.Context, r controller.Runt controller.Input{ Namespace: cluster.NamespaceName, Type: cluster.AffiliateType, - ID: pointer.To(ctrl.localAffiliateID), + ID: optional.Some(ctrl.localAffiliateID), Kind: controller.InputWeak, }, )); err != nil { diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go index 96570f294..06474fd0f 100644 --- a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go +++ b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go @@ -14,8 +14,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "github.com/siderolabs/net" "go.uber.org/zap" @@ -42,25 +42,25 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: cluster.ConfigType, - ID: pointer.To(cluster.ConfigID), + ID: optional.Some(cluster.ConfigID), Kind: controller.InputWeak, }, { Namespace: cluster.NamespaceName, Type: cluster.IdentityType, - ID: pointer.To(cluster.LocalIdentity), + ID: optional.Some(cluster.LocalIdentity), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, { @@ -71,19 +71,19 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input { { Namespace: kubespan.NamespaceName, Type: kubespan.IdentityType, - ID: pointer.To(kubespan.LocalIdentity), + ID: optional.Some(kubespan.LocalIdentity), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: kubespan.ConfigType, - ID: pointer.To(kubespan.ConfigID), + ID: optional.Some(kubespan.ConfigID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, { @@ -94,7 +94,7 @@ func (ctrl *LocalAffiliateController) Inputs() []controller.Input { { Namespace: k8s.ControlPlaneNamespaceName, Type: k8s.APIServerConfigType, - ID: pointer.To(k8s.APIServerConfigID), + ID: optional.Some(k8s.APIServerConfigID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/cluster/node_identity.go b/internal/app/machined/pkg/controllers/cluster/node_identity.go index 8f8b92274..59d0a0b7d 100644 --- a/internal/app/machined/pkg/controllers/cluster/node_identity.go +++ b/internal/app/machined/pkg/controllers/cluster/node_identity.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" clusteradapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/cluster" @@ -44,7 +44,7 @@ func (ctrl *NodeIdentityController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: runtimeres.MountStatusType, - ID: pointer.To(constants.StatePartitionLabel), + ID: optional.Some(constants.StatePartitionLabel), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/config/acquire.go b/internal/app/machined/pkg/controllers/config/acquire.go index 9e39b8492..b245c8a73 100644 --- a/internal/app/machined/pkg/controllers/config/acquire.go +++ b/internal/app/machined/pkg/controllers/config/acquire.go @@ -17,7 +17,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" talosruntime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -77,7 +77,7 @@ func (ctrl *AcquireController) Inputs() []controller.Input { { Namespace: configresource.NamespaceName, Type: configresource.MachineConfigType, - ID: pointer.To(configresource.MaintenanceID), + ID: optional.Some(configresource.MaintenanceID), Kind: controller.InputWeak, }, { diff --git a/internal/app/machined/pkg/controllers/config/machine_type.go b/internal/app/machined/pkg/controllers/config/machine_type.go index 5d7044ba5..e3321d382 100644 --- a/internal/app/machined/pkg/controllers/config/machine_type.go +++ b/internal/app/machined/pkg/controllers/config/machine_type.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/config/machine" @@ -33,7 +33,7 @@ func (ctrl *MachineTypeController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/cri/seccomp_profile.go b/internal/app/machined/pkg/controllers/cri/seccomp_profile.go index 8da0ae7d0..7d42dc826 100644 --- a/internal/app/machined/pkg/controllers/cri/seccomp_profile.go +++ b/internal/app/machined/pkg/controllers/cri/seccomp_profile.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -32,7 +32,7 @@ func (ctrl *SeccompProfileController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go b/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go index ec935b354..d73547121 100644 --- a/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go +++ b/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go @@ -18,7 +18,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" runtimetalos "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -57,7 +57,7 @@ func (ctrl *SeccompProfileFileController) Run(ctx context.Context, r controller. { Namespace: runtimeres.NamespaceName, Type: runtimeres.MountStatusType, - ID: pointer.To(constants.EphemeralPartitionLabel), + ID: optional.Some(constants.EphemeralPartitionLabel), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/etcd/advertised_peer.go b/internal/app/machined/pkg/controllers/etcd/advertised_peer.go index d3a84c059..4541ab221 100644 --- a/internal/app/machined/pkg/controllers/etcd/advertised_peer.go +++ b/internal/app/machined/pkg/controllers/etcd/advertised_peer.go @@ -15,8 +15,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" @@ -41,19 +41,19 @@ func (ctrl *AdvertisedPeerController) Inputs() []controller.Input { { Namespace: etcd.NamespaceName, Type: etcd.SpecType, - ID: pointer.To(etcd.SpecID), + ID: optional.Some(etcd.SpecID), Kind: controller.InputWeak, }, { Namespace: etcd.NamespaceName, Type: etcd.PKIStatusType, - ID: pointer.To(etcd.PKIID), + ID: optional.Some(etcd.PKIID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To("etcd"), + ID: optional.Some("etcd"), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/etcd/member.go b/internal/app/machined/pkg/controllers/etcd/member.go index a6665e60c..c628780bb 100644 --- a/internal/app/machined/pkg/controllers/etcd/member.go +++ b/internal/app/machined/pkg/controllers/etcd/member.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" pkgetcd "github.com/siderolabs/talos/internal/pkg/etcd" @@ -38,7 +38,7 @@ func (ctrl *MemberController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To(etcdServiceID), + ID: optional.Some(etcdServiceID), Kind: controller.InputStrong, }, } diff --git a/internal/app/machined/pkg/controllers/etcd/pki.go b/internal/app/machined/pkg/controllers/etcd/pki.go index eea133e19..98f240fab 100644 --- a/internal/app/machined/pkg/controllers/etcd/pki.go +++ b/internal/app/machined/pkg/controllers/etcd/pki.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/filetree" @@ -37,13 +37,13 @@ func (ctrl *PKIController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.EtcdRootType, - ID: pointer.To(secrets.EtcdRootID), + ID: optional.Some(secrets.EtcdRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.EtcdType, - ID: pointer.To(secrets.EtcdID), + ID: optional.Some(secrets.EtcdID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/etcd/spec.go b/internal/app/machined/pkg/controllers/etcd/spec.go index 7c7c34cb1..508cc8d07 100644 --- a/internal/app/machined/pkg/controllers/etcd/spec.go +++ b/internal/app/machined/pkg/controllers/etcd/spec.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "github.com/siderolabs/net" "go.uber.org/zap" @@ -37,19 +37,19 @@ func (ctrl *SpecController) Inputs() []controller.Input { { Namespace: etcd.NamespaceName, Type: etcd.ConfigType, - ID: pointer.To(etcd.ConfigID), + ID: optional.Some(etcd.ConfigID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s)), + ID: optional.Some(network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s)), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/files/cri_registry_config.go b/internal/app/machined/pkg/controllers/files/cri_registry_config.go index e50cc09d1..ccb15abe3 100644 --- a/internal/app/machined/pkg/controllers/files/cri_registry_config.go +++ b/internal/app/machined/pkg/controllers/files/cri_registry_config.go @@ -16,8 +16,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "golang.org/x/sys/unix" @@ -43,7 +43,7 @@ func (ctrl *CRIRegistryConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/address_filter.go b/internal/app/machined/pkg/controllers/k8s/address_filter.go index b1484d0c1..de94ab3e0 100644 --- a/internal/app/machined/pkg/controllers/k8s/address_filter.go +++ b/internal/app/machined/pkg/controllers/k8s/address_filter.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -36,7 +36,7 @@ func (ctrl *AddressFilterController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go index e8bf180b4..3460dc88b 100644 --- a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go @@ -16,6 +16,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/gen/maps" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/go-pointer" "go.uber.org/zap" @@ -63,19 +64,19 @@ func (ctrl *ControlPlaneStaticPodController) Inputs() []controller.Input { { Namespace: k8s.ControlPlaneNamespaceName, Type: k8s.SecretsStatusType, - ID: pointer.To(k8s.StaticPodSecretsStaticPodID), + ID: optional.Some(k8s.StaticPodSecretsStaticPodID), Kind: controller.InputWeak, }, { Namespace: k8s.ControlPlaneNamespaceName, Type: k8s.ConfigStatusType, - ID: pointer.To(k8s.ConfigStatusStaticPodID), + ID: optional.Some(k8s.ConfigStatusStaticPodID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To("etcd"), + ID: optional.Some("etcd"), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/endpoint.go b/internal/app/machined/pkg/controllers/k8s/endpoint.go index 9f1f691a3..831c6b88f 100644 --- a/internal/app/machined/pkg/controllers/k8s/endpoint.go +++ b/internal/app/machined/pkg/controllers/k8s/endpoint.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -66,7 +66,7 @@ func (ctrl *EndpointController) Run(ctx context.Context, r controller.Runtime, l { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, }); err != nil { @@ -148,13 +148,13 @@ func (ctrl *EndpointController) watchEndpointsOnControlPlane(ctx context.Context { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesType, - ID: pointer.To(secrets.KubernetesID), + ID: optional.Some(secrets.KubernetesID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/k8s/extra_manifest.go b/internal/app/machined/pkg/controllers/k8s/extra_manifest.go index 3c07cda02..9d80df3c5 100644 --- a/internal/app/machined/pkg/controllers/k8s/extra_manifest.go +++ b/internal/app/machined/pkg/controllers/k8s/extra_manifest.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/go-multierror" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" k8sadapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/k8s" @@ -45,7 +45,7 @@ func (ctrl *ExtraManifestController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_config.go b/internal/app/machined/pkg/controllers/k8s/kubelet_config.go index 92a6a8eaa..84771ebd6 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_config.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_config.go @@ -16,7 +16,6 @@ import ( "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xerrors" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -86,7 +85,7 @@ func NewKubeletConfigController() *KubeletConfigController { controller.Input{ Namespace: k8s.NamespaceName, Type: k8s.StaticPodServerStatusType, - ID: pointer.To(k8s.StaticPodServerStatusResourceID), + ID: optional.Some(k8s.StaticPodServerStatusResourceID), Kind: controller.InputWeak, }, ), diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_service.go b/internal/app/machined/pkg/controllers/k8s/kubelet_service.go index c2fc7250f..4086e9b52 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_service.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_service.go @@ -23,7 +23,6 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/gen/optional" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer/json" @@ -78,13 +77,13 @@ func (ctrl *KubeletServiceController) Run(ctx context.Context, r controller.Runt { Namespace: files.NamespaceName, Type: files.EtcFileStatusType, - ID: pointer.To("machine-id"), + ID: optional.Some("machine-id"), Kind: controller.InputWeak, }, { Namespace: runtimeres.NamespaceName, Type: runtimeres.MountStatusType, - ID: pointer.To(constants.EphemeralPartitionLabel), + ID: optional.Some(constants.EphemeralPartitionLabel), Kind: controller.InputWeak, }, }); err != nil { @@ -128,13 +127,13 @@ func (ctrl *KubeletServiceController) Run(ctx context.Context, r controller.Runt { Namespace: k8s.NamespaceName, Type: k8s.KubeletSpecType, - ID: pointer.To(k8s.KubeletID), + ID: optional.Some(k8s.KubeletID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubeletType, - ID: pointer.To(secrets.KubeletID), + ID: optional.Some(secrets.KubeletID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go b/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go index c19975778..0e963f1f1 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go @@ -15,6 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/hashicorp/go-multierror" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/go-kubernetes/kubernetes/compatibility" "github.com/siderolabs/go-pointer" @@ -46,19 +47,19 @@ func (ctrl *KubeletSpecController) Inputs() []controller.Input { { Namespace: k8s.NamespaceName, Type: k8s.KubeletConfigType, - ID: pointer.To(k8s.KubeletID), + ID: optional.Some(k8s.KubeletID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodeIPType, - ID: pointer.To(k8s.KubeletID), + ID: optional.Some(k8s.KubeletID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go index 995fdb790..d821962d6 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" k8sadapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/k8s" @@ -37,25 +37,25 @@ func (ctrl *KubeletStaticPodController) Inputs() []controller.Input { { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To("kubelet"), + ID: optional.Some("kubelet"), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesDynamicCertsType, - ID: pointer.To(secrets.KubernetesDynamicCertsID), + ID: optional.Some(secrets.KubernetesDynamicCertsID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/kubeprism.go b/internal/app/machined/pkg/controllers/k8s/kubeprism.go index 26dad0fce..7f24592c7 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubeprism.go +++ b/internal/app/machined/pkg/controllers/k8s/kubeprism.go @@ -14,10 +14,10 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/go-loadbalancer/controlplane" "github.com/siderolabs/go-loadbalancer/upstream" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -45,7 +45,7 @@ func (ctrl *KubePrismController) Inputs() []controller.Input { { Namespace: k8s.NamespaceName, Type: k8s.KubePrismConfigType, - ID: pointer.To(k8s.KubePrismConfigID), + ID: optional.Some(k8s.KubePrismConfigID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/manifest.go b/internal/app/machined/pkg/controllers/k8s/manifest.go index f04e36bb6..3b23638fe 100644 --- a/internal/app/machined/pkg/controllers/k8s/manifest.go +++ b/internal/app/machined/pkg/controllers/k8s/manifest.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" k8sadapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/k8s" @@ -43,7 +43,7 @@ func (ctrl *ManifestController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/manifest_apply.go b/internal/app/machined/pkg/controllers/k8s/manifest_apply.go index 01b3e5040..404a9ec80 100644 --- a/internal/app/machined/pkg/controllers/k8s/manifest_apply.go +++ b/internal/app/machined/pkg/controllers/k8s/manifest_apply.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "github.com/hashicorp/go-multierror" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "go.uber.org/zap/zapcore" corev1 "k8s.io/api/core/v1" @@ -54,7 +54,7 @@ func (ctrl *ManifestApplyController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesType, - ID: pointer.To(secrets.KubernetesID), + ID: optional.Some(secrets.KubernetesID), Kind: controller.InputWeak, }, { @@ -65,7 +65,7 @@ func (ctrl *ManifestApplyController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To("etcd"), + ID: optional.Some("etcd"), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/node_apply.go b/internal/app/machined/pkg/controllers/k8s/node_apply.go index 08f047bd9..445343c09 100644 --- a/internal/app/machined/pkg/controllers/k8s/node_apply.go +++ b/internal/app/machined/pkg/controllers/k8s/node_apply.go @@ -16,8 +16,8 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/gen/maps" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "github.com/siderolabs/go-retry/retry" "go.uber.org/zap" v1 "k8s.io/api/core/v1" @@ -67,19 +67,19 @@ func (ctrl *NodeApplyController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/node_cordoned_spec.go b/internal/app/machined/pkg/controllers/k8s/node_cordoned_spec.go index 5ee2fabb8..ab932a8ec 100644 --- a/internal/app/machined/pkg/controllers/k8s/node_cordoned_spec.go +++ b/internal/app/machined/pkg/controllers/k8s/node_cordoned_spec.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/k8s" @@ -32,7 +32,7 @@ func (ctrl *NodeCordonedSpecController) Inputs() []controller.Input { { Namespace: runtime.NamespaceName, Type: runtime.MachineStatusType, - ID: pointer.To(runtime.MachineStatusID), + ID: optional.Some(runtime.MachineStatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/node_label_spec.go b/internal/app/machined/pkg/controllers/k8s/node_label_spec.go index 57dcae8b8..9392e82eb 100644 --- a/internal/app/machined/pkg/controllers/k8s/node_label_spec.go +++ b/internal/app/machined/pkg/controllers/k8s/node_label_spec.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -33,7 +33,7 @@ func (ctrl *NodeLabelSpecController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/node_status.go b/internal/app/machined/pkg/controllers/k8s/node_status.go index 65f4f2747..3e3b78973 100644 --- a/internal/app/machined/pkg/controllers/k8s/node_status.go +++ b/internal/app/machined/pkg/controllers/k8s/node_status.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -38,7 +38,7 @@ func (ctrl *NodeStatusController) Inputs() []controller.Input { { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/node_taint_spec.go b/internal/app/machined/pkg/controllers/k8s/node_taint_spec.go index b967c531b..f8f35286d 100644 --- a/internal/app/machined/pkg/controllers/k8s/node_taint_spec.go +++ b/internal/app/machined/pkg/controllers/k8s/node_taint_spec.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" v1 "k8s.io/api/core/v1" @@ -34,7 +34,7 @@ func (ctrl *NodeTaintSpecController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/nodeip.go b/internal/app/machined/pkg/controllers/k8s/nodeip.go index 6dcc1130a..a16167533 100644 --- a/internal/app/machined/pkg/controllers/k8s/nodeip.go +++ b/internal/app/machined/pkg/controllers/k8s/nodeip.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "github.com/siderolabs/net" "go.uber.org/zap" @@ -36,13 +36,13 @@ func (ctrl *NodeIPController) Inputs() []controller.Input { { Namespace: k8s.NamespaceName, Type: k8s.NodeIPConfigType, - ID: pointer.To(k8s.KubeletID), + ID: optional.Some(k8s.KubeletID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s)), + ID: optional.Some(network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s)), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/nodename.go b/internal/app/machined/pkg/controllers/k8s/nodename.go index 35b4b1bf9..006ac22ab 100644 --- a/internal/app/machined/pkg/controllers/k8s/nodename.go +++ b/internal/app/machined/pkg/controllers/k8s/nodename.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/k8s/internal/nodename" @@ -34,13 +34,13 @@ func (ctrl *NodenameController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go index d8d70de1f..010544326 100644 --- a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go @@ -17,7 +17,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -39,31 +39,31 @@ func (ctrl *RenderSecretsStaticPodController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.EtcdRootType, - ID: pointer.To(secrets.EtcdRootID), + ID: optional.Some(secrets.EtcdRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesType, - ID: pointer.To(secrets.KubernetesID), + ID: optional.Some(secrets.KubernetesID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesDynamicCertsType, - ID: pointer.To(secrets.KubernetesDynamicCertsID), + ID: optional.Some(secrets.KubernetesDynamicCertsID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.EtcdType, - ID: pointer.To(secrets.EtcdID), + ID: optional.Some(secrets.EtcdID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/static_endpoint.go b/internal/app/machined/pkg/controllers/k8s/static_endpoint.go index 2255987e8..8497d192a 100644 --- a/internal/app/machined/pkg/controllers/k8s/static_endpoint.go +++ b/internal/app/machined/pkg/controllers/k8s/static_endpoint.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -35,7 +35,7 @@ func (ctrl *StaticEndpointController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/k8s/static_pod_config.go b/internal/app/machined/pkg/controllers/k8s/static_pod_config.go index fca74cbc7..182f29636 100644 --- a/internal/app/machined/pkg/controllers/k8s/static_pod_config.go +++ b/internal/app/machined/pkg/controllers/k8s/static_pod_config.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -35,7 +35,7 @@ func (ctrl *StaticPodConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go b/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go index f9b4e9dcb..0bc011e84 100644 --- a/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go +++ b/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -44,13 +44,13 @@ func (ctrl *EndpointController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: kubeaccess.ConfigType, - ID: pointer.To(kubeaccess.ConfigID), + ID: optional.Some(kubeaccess.ConfigID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesType, - ID: pointer.To(secrets.KubernetesID), + ID: optional.Some(secrets.KubernetesID), Kind: controller.InputWeak, }, { diff --git a/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go b/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go index ae510a62f..489ed9875 100644 --- a/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go +++ b/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -42,19 +42,19 @@ func (ctrl *CRDController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: kubeaccess.ConfigType, - ID: pointer.To(kubeaccess.ConfigID), + ID: optional.Some(kubeaccess.ConfigID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.KubernetesType, - ID: pointer.To(secrets.KubernetesID), + ID: optional.Some(secrets.KubernetesID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.OSRootType, - ID: pointer.To(secrets.OSRootID), + ID: optional.Some(secrets.OSRootID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/kubespan/identity.go b/internal/app/machined/pkg/controllers/kubespan/identity.go index 786f6168b..1443e94f8 100644 --- a/internal/app/machined/pkg/controllers/kubespan/identity.go +++ b/internal/app/machined/pkg/controllers/kubespan/identity.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" kubespanadapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/kubespan" @@ -42,19 +42,19 @@ func (ctrl *IdentityController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: kubespan.ConfigType, - ID: pointer.To(kubespan.ConfigID), + ID: optional.Some(kubespan.ConfigID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HardwareAddrType, - ID: pointer.To(network.FirstHardwareAddr), + ID: optional.Some(network.FirstHardwareAddr), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: runtimeres.MountStatusType, - ID: pointer.To(constants.StatePartitionLabel), + ID: optional.Some(constants.StatePartitionLabel), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/kubespan/manager.go b/internal/app/machined/pkg/controllers/kubespan/manager.go index 598cda75a..69003a44e 100644 --- a/internal/app/machined/pkg/controllers/kubespan/manager.go +++ b/internal/app/machined/pkg/controllers/kubespan/manager.go @@ -16,8 +16,8 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/value" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "go4.org/netipx" "golang.zx2c4.com/wireguard/wgctrl" @@ -70,7 +70,7 @@ func (ctrl *ManagerController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: kubespan.ConfigType, - ID: pointer.To(kubespan.ConfigID), + ID: optional.Some(kubespan.ConfigID), Kind: controller.InputWeak, }, { @@ -81,7 +81,7 @@ func (ctrl *ManagerController) Inputs() []controller.Input { { Namespace: kubespan.NamespaceName, Type: kubespan.IdentityType, - ID: pointer.To(kubespan.LocalIdentity), + ID: optional.Some(kubespan.LocalIdentity), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go index b9388bdfb..07d5960a9 100644 --- a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go +++ b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "go4.org/netipx" @@ -37,7 +37,7 @@ func (ctrl *PeerSpecController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: kubespan.ConfigType, - ID: pointer.To(kubespan.ConfigID), + ID: optional.Some(kubespan.ConfigID), Kind: controller.InputWeak, }, { @@ -48,7 +48,7 @@ func (ctrl *PeerSpecController) Inputs() []controller.Input { { Namespace: cluster.NamespaceName, Type: cluster.IdentityType, - ID: pointer.To(cluster.LocalIdentity), + ID: optional.Some(cluster.LocalIdentity), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/address_event.go b/internal/app/machined/pkg/controllers/network/address_event.go index 10914366c..e0daaf6a6 100644 --- a/internal/app/machined/pkg/controllers/network/address_event.go +++ b/internal/app/machined/pkg/controllers/network/address_event.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -38,7 +38,7 @@ func (ctrl *AddressEventController) Inputs() []controller.Input { Namespace: network.NamespaceName, Type: network.NodeAddressType, Kind: controller.InputWeak, - ID: pointer.To(network.FilteredNodeAddressID( + ID: optional.Some(network.FilteredNodeAddressID( network.NodeAddressCurrentID, k8s.NodeAddressFilterNoK8s)), }, @@ -46,7 +46,7 @@ func (ctrl *AddressEventController) Inputs() []controller.Input { Namespace: network.NamespaceName, Type: network.HostnameStatusType, Kind: controller.InputWeak, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), }, } } diff --git a/internal/app/machined/pkg/controllers/network/device_config.go b/internal/app/machined/pkg/controllers/network/device_config.go index 6c9d3262b..b2691cc85 100644 --- a/internal/app/machined/pkg/controllers/network/device_config.go +++ b/internal/app/machined/pkg/controllers/network/device_config.go @@ -12,8 +12,8 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" glob "github.com/ryanuber/go-glob" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" talosconfig "github.com/siderolabs/talos/pkg/machinery/config/config" @@ -46,7 +46,7 @@ func (ctrl *DeviceConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, { diff --git a/internal/app/machined/pkg/controllers/network/etcfile.go b/internal/app/machined/pkg/controllers/network/etcfile.go index d3f73bb88..52e3e1886 100644 --- a/internal/app/machined/pkg/controllers/network/etcfile.go +++ b/internal/app/machined/pkg/controllers/network/etcfile.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" talosconfig "github.com/siderolabs/talos/pkg/machinery/config" @@ -38,25 +38,25 @@ func (ctrl *EtcFileController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.ResolverStatusType, - ID: pointer.To(network.ResolverID), + ID: optional.Some(network.ResolverID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.NodeAddressDefaultID), + ID: optional.Some(network.NodeAddressDefaultID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/hostname_config.go b/internal/app/machined/pkg/controllers/network/hostname_config.go index 10942e6d7..56b63e178 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_config.go +++ b/internal/app/machined/pkg/controllers/network/hostname_config.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/martinlindhe/base36" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -41,19 +41,19 @@ func (ctrl *HostnameConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.NodeAddressDefaultID), + ID: optional.Some(network.NodeAddressDefaultID), Kind: controller.InputWeak, }, { Namespace: cluster.NamespaceName, Type: cluster.IdentityType, - ID: pointer.To(cluster.LocalIdentity), + ID: optional.Some(cluster.LocalIdentity), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/platform_config.go b/internal/app/machined/pkg/controllers/network/platform_config.go index 19d112640..72c93a386 100644 --- a/internal/app/machined/pkg/controllers/network/platform_config.go +++ b/internal/app/machined/pkg/controllers/network/platform_config.go @@ -18,7 +18,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "gopkg.in/yaml.v3" @@ -51,7 +51,7 @@ func (ctrl *PlatformConfigController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: runtimeres.MountStatusType, - ID: pointer.To(constants.StatePartitionLabel), + ID: optional.Some(constants.StatePartitionLabel), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/resolver_config.go b/internal/app/machined/pkg/controllers/network/resolver_config.go index 7948bda02..a65c51811 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_config.go +++ b/internal/app/machined/pkg/controllers/network/resolver_config.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -39,7 +39,7 @@ func (ctrl *ResolverConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/status.go b/internal/app/machined/pkg/controllers/network/status.go index bd7cad456..30c85b292 100644 --- a/internal/app/machined/pkg/controllers/network/status.go +++ b/internal/app/machined/pkg/controllers/network/status.go @@ -12,8 +12,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/value" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/files" @@ -34,7 +34,7 @@ func (ctrl *StatusController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.NodeAddressCurrentID), + ID: optional.Some(network.NodeAddressCurrentID), Kind: controller.InputWeak, }, { diff --git a/internal/app/machined/pkg/controllers/network/timeserver_config.go b/internal/app/machined/pkg/controllers/network/timeserver_config.go index 55c8d9ead..769549c34 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_config.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_config.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -39,7 +39,7 @@ func (ctrl *TimeServerConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/network/utils/utils.go b/internal/app/machined/pkg/controllers/network/utils/utils.go index 9c0e8e87f..af5bf2ed9 100644 --- a/internal/app/machined/pkg/controllers/network/utils/utils.go +++ b/internal/app/machined/pkg/controllers/network/utils/utils.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/talos/pkg/machinery/resources/network" ) @@ -25,7 +25,7 @@ func WaitForNetworkReady(ctx context.Context, r controller.Runtime, condition fu { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/runtime/cri_image_gc.go b/internal/app/machined/pkg/controllers/runtime/cri_image_gc.go index 9b858b5fa..fd545c15c 100644 --- a/internal/app/machined/pkg/controllers/runtime/cri_image_gc.go +++ b/internal/app/machined/pkg/controllers/runtime/cri_image_gc.go @@ -19,8 +19,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -58,19 +58,19 @@ func (ctrl *CRIImageGCController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To("cri"), + ID: optional.Some("cri"), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.KubeletSpecType, - ID: pointer.To(k8s.KubeletID), + ID: optional.Some(k8s.KubeletID), Kind: controller.InputWeak, }, { Namespace: etcd.NamespaceName, Type: etcd.SpecType, - ID: pointer.To(etcd.SpecID), + ID: optional.Some(etcd.SpecID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/drop_upgrade_fallback.go b/internal/app/machined/pkg/controllers/runtime/drop_upgrade_fallback.go index aa6766de8..0dc963761 100644 --- a/internal/app/machined/pkg/controllers/runtime/drop_upgrade_fallback.go +++ b/internal/app/machined/pkg/controllers/runtime/drop_upgrade_fallback.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" machineruntime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -40,7 +40,7 @@ func (ctrl *DropUpgradeFallbackController) Inputs() []controller.Input { { Namespace: runtime.NamespaceName, Type: runtime.MachineStatusType, - ID: pointer.To(runtime.MachineStatusID), + ID: optional.Some(runtime.MachineStatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/events_sink.go b/internal/app/machined/pkg/controllers/runtime/events_sink.go index 517276e71..c5084d6a5 100644 --- a/internal/app/machined/pkg/controllers/runtime/events_sink.go +++ b/internal/app/machined/pkg/controllers/runtime/events_sink.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/rs/xid" "github.com/siderolabs/gen/channel" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/siderolink/api/events" "go.uber.org/zap" "google.golang.org/grpc" @@ -76,7 +76,7 @@ func (ctrl *EventsSinkController) Run(ctx context.Context, r controller.Runtime, { Namespace: runtime.NamespaceName, Type: runtime.EventSinkConfigType, - ID: pointer.To(runtime.EventSinkConfigID), + ID: optional.Some(runtime.EventSinkConfigID), Kind: controller.InputWeak, }, }, diff --git a/internal/app/machined/pkg/controllers/runtime/events_sink_config.go b/internal/app/machined/pkg/controllers/runtime/events_sink_config.go index a7bb55906..19f3e572b 100644 --- a/internal/app/machined/pkg/controllers/runtime/events_sink_config.go +++ b/internal/app/machined/pkg/controllers/runtime/events_sink_config.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -36,7 +36,7 @@ func (ctrl *EventsSinkConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go b/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go index 1c8ca6914..49fad76b5 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -32,7 +32,7 @@ func (ctrl *KernelModuleConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), }, } } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go index 4351f9670..faf15c40b 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/kernel" @@ -35,7 +35,7 @@ func (ctrl *KernelParamConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), }, } } diff --git a/internal/app/machined/pkg/controllers/runtime/kmsg_log.go b/internal/app/machined/pkg/controllers/runtime/kmsg_log.go index 5714baa9e..6c386bda9 100644 --- a/internal/app/machined/pkg/controllers/runtime/kmsg_log.go +++ b/internal/app/machined/pkg/controllers/runtime/kmsg_log.go @@ -14,9 +14,9 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/go-kmsg" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -67,7 +67,7 @@ func (ctrl *KmsgLogDeliveryController) Run(ctx context.Context, r controller.Run { Namespace: runtime.NamespaceName, Type: runtime.KmsgLogConfigType, - ID: pointer.To(runtime.KmsgLogConfigID), + ID: optional.Some(runtime.KmsgLogConfigID), Kind: controller.InputWeak, }, }, diff --git a/internal/app/machined/pkg/controllers/runtime/kmsg_log_config.go b/internal/app/machined/pkg/controllers/runtime/kmsg_log_config.go index 8df9b89c0..a8c9a103d 100644 --- a/internal/app/machined/pkg/controllers/runtime/kmsg_log_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kmsg_log_config.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -39,7 +39,7 @@ func (ctrl *KmsgLogConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/machine_status.go b/internal/app/machined/pkg/controllers/runtime/machine_status.go index c696bee9b..19596d36b 100644 --- a/internal/app/machined/pkg/controllers/runtime/machine_status.go +++ b/internal/app/machined/pkg/controllers/runtime/machine_status.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" v1 "k8s.io/api/core/v1" @@ -54,13 +54,13 @@ func (ctrl *MachineStatusController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: time.StatusType, - ID: pointer.To(time.StatusID), + ID: optional.Some(time.StatusID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, { @@ -76,13 +76,13 @@ func (ctrl *MachineStatusController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, { Namespace: k8s.NamespaceName, Type: k8s.NodenameType, - ID: pointer.To(k8s.NodenameID), + ID: optional.Some(k8s.NodenameID), Kind: controller.InputWeak, }, { diff --git a/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go b/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go index a377111b5..6165cc9ae 100644 --- a/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go +++ b/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go @@ -11,8 +11,8 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" v1alpha1runtime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -36,7 +36,7 @@ func (ctrl *MachineStatusPublisherController) Inputs() []controller.Input { { Namespace: runtime.NamespaceName, Type: runtime.MachineStatusType, - ID: pointer.To(runtime.MachineStatusID), + ID: optional.Some(runtime.MachineStatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/maintenance_config.go b/internal/app/machined/pkg/controllers/runtime/maintenance_config.go index 3d2d1619c..d19ea3125 100644 --- a/internal/app/machined/pkg/controllers/runtime/maintenance_config.go +++ b/internal/app/machined/pkg/controllers/runtime/maintenance_config.go @@ -12,8 +12,8 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -38,12 +38,12 @@ func (ctrl *MaintenanceConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: siderolink.ConfigType, - ID: pointer.To(siderolink.ConfigID), + ID: optional.Some(siderolink.ConfigID), }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.NodeAddressCurrentID), + ID: optional.Some(network.NodeAddressCurrentID), }, } } diff --git a/internal/app/machined/pkg/controllers/runtime/maintenance_service.go b/internal/app/machined/pkg/controllers/runtime/maintenance_service.go index af63d1557..40a76dfa9 100644 --- a/internal/app/machined/pkg/controllers/runtime/maintenance_service.go +++ b/internal/app/machined/pkg/controllers/runtime/maintenance_service.go @@ -18,9 +18,9 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/go-debug" - "github.com/siderolabs/go-pointer" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -48,19 +48,19 @@ func (ctrl *MaintenanceServiceController) Inputs() []controller.Input { { Namespace: runtime.NamespaceName, Type: runtime.MaintenanceServiceRequestType, - ID: pointer.To(runtime.MaintenanceServiceRequestID), + ID: optional.Some(runtime.MaintenanceServiceRequestID), Kind: controller.InputStrong, }, { Namespace: runtime.NamespaceName, Type: runtime.MaintenanceServiceConfigType, - ID: pointer.To(runtime.MaintenanceServiceConfigID), + ID: optional.Some(runtime.MaintenanceServiceConfigID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.MaintenanceServiceCertsType, - ID: pointer.To(secrets.MaintenanceServiceCertsID), + ID: optional.Some(secrets.MaintenanceServiceCertsID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/runtime/utils.go b/internal/app/machined/pkg/controllers/runtime/utils.go index aa1b8582c..06c0db47c 100644 --- a/internal/app/machined/pkg/controllers/runtime/utils.go +++ b/internal/app/machined/pkg/controllers/runtime/utils.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/talos/pkg/machinery/resources/runtime" ) @@ -24,7 +24,7 @@ func WaitForDevicesReady(ctx context.Context, r controller.Runtime, nextInputs [ { Namespace: runtime.NamespaceName, Type: runtime.DevicesStatusType, - ID: pointer.To(runtime.DevicesID), + ID: optional.Some(runtime.DevicesID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/secrets/api.go b/internal/app/machined/pkg/controllers/secrets/api.go index c885b8036..ea515baaa 100644 --- a/internal/app/machined/pkg/controllers/secrets/api.go +++ b/internal/app/machined/pkg/controllers/secrets/api.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/grpc/gen" @@ -43,13 +43,13 @@ func (ctrl *APIController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, } @@ -137,19 +137,19 @@ func (ctrl *APIController) reconcile(ctx context.Context, r controller.Runtime, { Namespace: secrets.NamespaceName, Type: secrets.OSRootType, - ID: pointer.To(secrets.OSRootID), + ID: optional.Some(secrets.OSRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.CertSANType, - ID: pointer.To(secrets.CertSANAPIID), + ID: optional.Some(secrets.CertSANAPIID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, // time status isn't fetched, but the fact that it is in dependencies means @@ -157,7 +157,7 @@ func (ctrl *APIController) reconcile(ctx context.Context, r controller.Runtime, { Namespace: v1alpha1.NamespaceName, Type: timeresource.StatusType, - ID: pointer.To(timeresource.StatusID), + ID: optional.Some(timeresource.StatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go index 49ca95e92..40c398526 100644 --- a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/k8s" @@ -35,19 +35,19 @@ func (ctrl *APICertSANsController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.OSRootType, - ID: pointer.To(secrets.OSRootID), + ID: optional.Some(secrets.OSRootID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), + ID: optional.Some(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/etcd.go b/internal/app/machined/pkg/controllers/secrets/etcd.go index 00a2ed8c1..41c9aebf2 100644 --- a/internal/app/machined/pkg/controllers/secrets/etcd.go +++ b/internal/app/machined/pkg/controllers/secrets/etcd.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/internal/pkg/etcd" @@ -37,31 +37,31 @@ func (ctrl *EtcdController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.EtcdRootType, - ID: pointer.To(secrets.EtcdRootID), + ID: optional.Some(secrets.EtcdRootID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: time.StatusType, - ID: pointer.To(time.StatusID), + ID: optional.Some(time.StatusID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), + ID: optional.Some(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes.go b/internal/app/machined/pkg/controllers/secrets/kubernetes.go index 6013bf2ff..756583950 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes.go @@ -16,7 +16,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/kubeconfig" @@ -46,13 +46,13 @@ func (ctrl *KubernetesController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: timeresource.StatusType, - ID: pointer.To(timeresource.StatusID), + ID: optional.Some(timeresource.StatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go index d2776e393..2b1c61485 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/k8s" @@ -35,19 +35,19 @@ func (ctrl *KubernetesCertSANsController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), + ID: optional.Some(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_dynamic_certs.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_dynamic_certs.go index eeb7756cf..ffa950d6e 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_dynamic_certs.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_dynamic_certs.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -57,7 +57,7 @@ func (ctrl *KubernetesDynamicCertsController) Run(ctx context.Context, r control { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, }); err != nil { @@ -90,19 +90,19 @@ func (ctrl *KubernetesDynamicCertsController) Run(ctx context.Context, r control { Namespace: secrets.NamespaceName, Type: secrets.KubernetesRootType, - ID: pointer.To(secrets.KubernetesRootID), + ID: optional.Some(secrets.KubernetesRootID), Kind: controller.InputWeak, }, { Namespace: v1alpha1.NamespaceName, Type: timeresource.StatusType, - ID: pointer.To(timeresource.StatusID), + ID: optional.Some(timeresource.StatusID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.CertSANType, - ID: pointer.To(secrets.CertSANKubernetesID), + ID: optional.Some(secrets.CertSANKubernetesID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/internal/app/machined/pkg/controllers/secrets/maintenance.go b/internal/app/machined/pkg/controllers/secrets/maintenance.go index 932ebcb70..e3e13bda4 100644 --- a/internal/app/machined/pkg/controllers/secrets/maintenance.go +++ b/internal/app/machined/pkg/controllers/secrets/maintenance.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/secrets" @@ -36,13 +36,13 @@ func (ctrl *MaintenanceController) Inputs() []controller.Input { { Namespace: secrets.NamespaceName, Type: secrets.MaintenanceRootType, - ID: pointer.To(secrets.MaintenanceRootID), + ID: optional.Some(secrets.MaintenanceRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.CertSANType, - ID: pointer.To(secrets.CertSANMaintenanceID), + ID: optional.Some(secrets.CertSANMaintenanceID), Kind: controller.InputWeak, }, // time status isn't fetched, but the fact that it is in dependencies means @@ -50,7 +50,7 @@ func (ctrl *MaintenanceController) Inputs() []controller.Input { { Namespace: v1alpha1.NamespaceName, Type: timeresource.StatusType, - ID: pointer.To(timeresource.StatusID), + ID: optional.Some(timeresource.StatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/maintenance_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/maintenance_cert_sans.go index 644b6aa4f..60efebe35 100644 --- a/internal/app/machined/pkg/controllers/secrets/maintenance_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/maintenance_cert_sans.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/constants" @@ -35,13 +35,13 @@ func (ctrl *MaintenanceCertSANsController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.HostnameStatusType, - ID: pointer.To(network.HostnameID), + ID: optional.Some(network.HostnameID), Kind: controller.InputWeak, }, { Namespace: network.NamespaceName, Type: network.NodeAddressType, - ID: pointer.To(network.NodeAddressAccumulativeID), + ID: optional.Some(network.NodeAddressAccumulativeID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/secrets/trustd.go b/internal/app/machined/pkg/controllers/secrets/trustd.go index a4cd002b6..5cb542604 100644 --- a/internal/app/machined/pkg/controllers/secrets/trustd.go +++ b/internal/app/machined/pkg/controllers/secrets/trustd.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/crypto/x509" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" "github.com/siderolabs/talos/pkg/machinery/resources/config" @@ -40,13 +40,13 @@ func (ctrl *TrustdController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.StatusType, - ID: pointer.To(network.StatusID), + ID: optional.Some(network.StatusID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, } @@ -125,19 +125,19 @@ func (ctrl *TrustdController) reconcile(ctx context.Context, r controller.Runtim { Namespace: secrets.NamespaceName, Type: secrets.OSRootType, - ID: pointer.To(secrets.OSRootID), + ID: optional.Some(secrets.OSRootID), Kind: controller.InputWeak, }, { Namespace: secrets.NamespaceName, Type: secrets.CertSANType, - ID: pointer.To(secrets.CertSANAPIID), + ID: optional.Some(secrets.CertSANAPIID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineTypeType, - ID: pointer.To(config.MachineTypeID), + ID: optional.Some(config.MachineTypeID), Kind: controller.InputWeak, }, // time status isn't fetched, but the fact that it is in dependencies means @@ -145,7 +145,7 @@ func (ctrl *TrustdController) reconcile(ctx context.Context, r controller.Runtim { Namespace: v1alpha1.NamespaceName, Type: timeresource.StatusType, - ID: pointer.To(timeresource.StatusID), + ID: optional.Some(timeresource.StatusID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/siderolink/config.go b/internal/app/machined/pkg/controllers/siderolink/config.go index 8fc2c1b36..e817c3d66 100644 --- a/internal/app/machined/pkg/controllers/siderolink/config.go +++ b/internal/app/machined/pkg/controllers/siderolink/config.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-procfs/procfs" "go.uber.org/zap" @@ -36,7 +36,7 @@ func (ctrl *ConfigController) Inputs() []controller.Input { { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), Kind: controller.InputWeak, }, } diff --git a/internal/app/machined/pkg/controllers/siderolink/manager.go b/internal/app/machined/pkg/controllers/siderolink/manager.go index fda8a55c2..63a627f69 100644 --- a/internal/app/machined/pkg/controllers/siderolink/manager.go +++ b/internal/app/machined/pkg/controllers/siderolink/manager.go @@ -18,6 +18,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/go-pointer" pb "github.com/siderolabs/siderolink/api/siderolink" "github.com/siderolabs/siderolink/pkg/wireguard" @@ -80,13 +81,13 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo { Namespace: config.NamespaceName, Type: siderolink.ConfigType, - ID: pointer.To(siderolink.ConfigID), + ID: optional.Some(siderolink.ConfigID), Kind: controller.InputWeak, }, { Namespace: hardware.NamespaceName, Type: hardware.SystemInformationType, - ID: pointer.To(hardware.SystemInformationID), + ID: optional.Some(hardware.SystemInformationID), Kind: controller.InputWeak, }, }, diff --git a/internal/app/machined/pkg/controllers/time/sync.go b/internal/app/machined/pkg/controllers/time/sync.go index 305f9494f..344992065 100644 --- a/internal/app/machined/pkg/controllers/time/sync.go +++ b/internal/app/machined/pkg/controllers/time/sync.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "go.uber.org/zap" v1alpha1runtime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" @@ -43,13 +43,13 @@ func (ctrl *SyncController) Inputs() []controller.Input { { Namespace: network.NamespaceName, Type: network.TimeServerStatusType, - ID: pointer.To(network.TimeServerID), + ID: optional.Some(network.TimeServerID), Kind: controller.InputWeak, }, { Namespace: config.NamespaceName, Type: config.MachineConfigType, - ID: pointer.To(config.V1Alpha1ID), + ID: optional.Some(config.V1Alpha1ID), }, } } diff --git a/internal/app/machined/pkg/controllers/v1alpha1/utils.go b/internal/app/machined/pkg/controllers/v1alpha1/utils.go index d754319bc..ed75fc61c 100644 --- a/internal/app/machined/pkg/controllers/v1alpha1/utils.go +++ b/internal/app/machined/pkg/controllers/v1alpha1/utils.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/safe" "github.com/cosi-project/runtime/pkg/state" - "github.com/siderolabs/go-pointer" + "github.com/siderolabs/gen/optional" "github.com/siderolabs/talos/pkg/machinery/resources/v1alpha1" ) @@ -24,7 +24,7 @@ func WaitForServiceHealthy(ctx context.Context, r controller.Runtime, serviceID { Namespace: v1alpha1.NamespaceName, Type: v1alpha1.ServiceType, - ID: pointer.To(serviceID), + ID: optional.Some(serviceID), Kind: controller.InputWeak, }, }); err != nil { diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index a50b9ef4d..fb0b4153d 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -9,7 +9,7 @@ replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20220527175918-f17b require ( github.com/blang/semver/v4 v4.0.0 github.com/containerd/go-cni v1.1.9 - github.com/cosi-project/runtime v0.3.11 + github.com/cosi-project/runtime v0.3.13 github.com/dustin/go-humanize v1.0.1 github.com/evanphx/json-patch v5.7.0+incompatible github.com/ghodss/yaml v1.0.0 diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index 347122f6c..c35aab5c3 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -22,8 +22,8 @@ github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9 github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ= github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -github.com/cosi-project/runtime v0.3.11 h1:Kz4Wk/HwqWkLA3opFJWnJ0bF0LHLr4sWoPDcONrU26M= -github.com/cosi-project/runtime v0.3.11/go.mod h1:kLIIwnTlUnVPhZZN82esCuyvD23eNJkOcnjWE7i+qBk= +github.com/cosi-project/runtime v0.3.13 h1:879ECFAi0tTD0BiLv39iKqipKxU9tspKb411UhktdTg= +github.com/cosi-project/runtime v0.3.13/go.mod h1:O3/3pjghhExoXuRlbZskjVCuvkFqqswf3hE1kP0rvZQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=