-
Notifications
You must be signed in to change notification settings - Fork 550
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: split kubernetes/etcd resource generation into subresources
Fixes #3062 There's no user-visible change in this PR. It carefully separates generated secrets (e.g. certs) from source secrets from the config (e.g. CAs), so that certs are generated on config changes which actually affect cert input. And same way separates etcd and Kubernetes PKI, so if etcd CA got changed, only etcd certs will be regenerated. This should have noticeable impact with RSA-based PKI as it reduces number of times PKI gets generated. Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
- Loading branch information
Showing
14 changed files
with
662 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| package secrets | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/AlekSi/pointer" | ||
| "github.com/talos-systems/os-runtime/pkg/controller" | ||
| "github.com/talos-systems/os-runtime/pkg/resource" | ||
| "github.com/talos-systems/os-runtime/pkg/state" | ||
|
|
||
| "github.com/talos-systems/talos/internal/pkg/etcd" | ||
| "github.com/talos-systems/talos/pkg/resources/secrets" | ||
| "github.com/talos-systems/talos/pkg/resources/v1alpha1" | ||
| ) | ||
|
|
||
| // EtcdController manages secrets.Etcd based on configuration. | ||
| type EtcdController struct{} | ||
|
|
||
| // Name implements controller.Controller interface. | ||
| func (ctrl *EtcdController) Name() string { | ||
| return "secrets.EtcdController" | ||
| } | ||
|
|
||
| // ManagedResources implements controller.Controller interface. | ||
| func (ctrl *EtcdController) ManagedResources() (resource.Namespace, resource.Type) { | ||
| return secrets.NamespaceName, secrets.EtcdType | ||
| } | ||
|
|
||
| // Run implements controller.Controller interface. | ||
| // | ||
| //nolint: gocyclo, dupl | ||
| func (ctrl *EtcdController) Run(ctx context.Context, r controller.Runtime, logger *log.Logger) error { | ||
| if err := r.UpdateDependencies([]controller.Dependency{ | ||
| { | ||
| Namespace: secrets.NamespaceName, | ||
| Type: secrets.RootType, | ||
| ID: pointer.ToString(secrets.RootEtcdID), | ||
| Kind: controller.DependencyWeak, | ||
| }, | ||
| { | ||
| Namespace: v1alpha1.NamespaceName, | ||
| Type: v1alpha1.ServiceType, | ||
| ID: pointer.ToString("networkd"), | ||
| Kind: controller.DependencyWeak, | ||
| }, | ||
| { | ||
| Namespace: v1alpha1.NamespaceName, | ||
| Type: v1alpha1.TimeSyncType, | ||
| ID: pointer.ToString(v1alpha1.TimeSyncID), | ||
| Kind: controller.DependencyWeak, | ||
| }, | ||
| }); err != nil { | ||
| return fmt.Errorf("error setting up dependencies: %w", err) | ||
| } | ||
|
|
||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return nil | ||
| case <-r.EventCh(): | ||
| } | ||
|
|
||
| etcdRootRes, err := r.Get(ctx, resource.NewMetadata(secrets.NamespaceName, secrets.RootType, secrets.RootEtcdID, resource.VersionUndefined)) | ||
| if err != nil { | ||
| if state.IsNotFoundError(err) { | ||
| if err = ctrl.teardownAll(ctx, r); err != nil { | ||
| return fmt.Errorf("error destroying resources: %w", err) | ||
| } | ||
|
|
||
| continue | ||
| } | ||
|
|
||
| return fmt.Errorf("error getting etcd root secrets: %w", err) | ||
| } | ||
|
|
||
| etcdRoot := etcdRootRes.(*secrets.Root).EtcdSpec() | ||
|
|
||
| // wait for networkd to be healthy as it might change IPs/hostname | ||
| networkdResource, err := r.Get(ctx, resource.NewMetadata(v1alpha1.NamespaceName, v1alpha1.ServiceType, "networkd", resource.VersionUndefined)) | ||
| if err != nil { | ||
| if state.IsNotFoundError(err) { | ||
| continue | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| if !networkdResource.(*v1alpha1.Service).Healthy() { | ||
| continue | ||
| } | ||
|
|
||
| // wait for time sync as certs depend on current time | ||
| timeSyncResource, err := r.Get(ctx, resource.NewMetadata(v1alpha1.NamespaceName, v1alpha1.TimeSyncType, v1alpha1.TimeSyncID, resource.VersionUndefined)) | ||
| if err != nil { | ||
| if state.IsNotFoundError(err) { | ||
| continue | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| if !timeSyncResource.(*v1alpha1.TimeSync).Sync() { | ||
| continue | ||
| } | ||
|
|
||
| if err = r.Update(ctx, secrets.NewEtcd(), func(r resource.Resource) error { | ||
| return ctrl.updateSecrets(etcdRoot, r.(*secrets.Etcd).Certs()) | ||
| }); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (ctrl *EtcdController) updateSecrets(etcdRoot *secrets.RootEtcdSpec, etcdCerts *secrets.EtcdCertsSpec) error { | ||
| var err error | ||
|
|
||
| etcdCerts.EtcdPeer, err = etcd.GeneratePeerCert(etcdRoot.EtcdCA) | ||
| if err != nil { | ||
| return fmt.Errorf("error generating etcd certs: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (ctrl *EtcdController) teardownAll(ctx context.Context, r controller.Runtime) error { | ||
| list, err := r.List(ctx, resource.NewMetadata(secrets.NamespaceName, secrets.EtcdType, "", resource.VersionUndefined)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // TODO: change this to proper teardown sequence | ||
|
|
||
| for _, res := range list.Items { | ||
| if err = r.Destroy(ctx, res.Metadata()); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.