-
Notifications
You must be signed in to change notification settings - Fork 549
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: write etcd PKI files in a controller
Instead of writing PKI "once" around the startup time, keep writing PKI files as the certificates get updated. `etcd` is able to reload certificates, so we should keep updating them e.g. if the hostname/IPs change over time. Signed-off-by: Andrey Smirnov <[email protected]>
- Loading branch information
Showing
17 changed files
with
345 additions
and
136 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // 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 etcd provides controllers which manage etcd resources. | ||
| package etcd |
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,148 @@ | ||
| // 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 etcd | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/cosi-project/runtime/pkg/controller" | ||
| "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/talos-systems/crypto/x509" | ||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/talos-systems/talos/pkg/filetree" | ||
| "github.com/talos-systems/talos/pkg/machinery/constants" | ||
| "github.com/talos-systems/talos/pkg/machinery/resources/etcd" | ||
| "github.com/talos-systems/talos/pkg/machinery/resources/secrets" | ||
| ) | ||
|
|
||
| // PKIController renders manifests based on templates and config/secrets. | ||
| type PKIController struct{} | ||
|
|
||
| // Name implements controller.Controller interface. | ||
| func (ctrl *PKIController) Name() string { | ||
| return "etcd.PKIController" | ||
| } | ||
|
|
||
| // Inputs implements controller.Controller interface. | ||
| func (ctrl *PKIController) Inputs() []controller.Input { | ||
| return []controller.Input{ | ||
| { | ||
| Namespace: secrets.NamespaceName, | ||
| Type: secrets.EtcdRootType, | ||
| ID: pointer.To(secrets.EtcdRootID), | ||
| Kind: controller.InputWeak, | ||
| }, | ||
| { | ||
| Namespace: secrets.NamespaceName, | ||
| Type: secrets.EtcdType, | ||
| ID: pointer.To(secrets.EtcdID), | ||
| Kind: controller.InputWeak, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // Outputs implements controller.Controller interface. | ||
| func (ctrl *PKIController) Outputs() []controller.Output { | ||
| return []controller.Output{ | ||
| { | ||
| Type: etcd.PKIStatusType, | ||
| Kind: controller.OutputExclusive, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // Run implements controller.Controller interface. | ||
| // | ||
| //nolint:gocyclo | ||
| func (ctrl *PKIController) Run(ctx context.Context, r controller.Runtime, logger *zap.Logger) error { | ||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return nil | ||
| case <-r.EventCh(): | ||
| } | ||
|
|
||
| rootScrts, err := safe.ReaderGet[*secrets.EtcdRoot](ctx, r, resource.NewMetadata(secrets.NamespaceName, secrets.EtcdRootType, secrets.EtcdRootID, resource.VersionUndefined)) | ||
| if err != nil { | ||
| if state.IsNotFoundError(err) { | ||
| continue | ||
| } | ||
|
|
||
| return fmt.Errorf("error getting root secrets: %w", err) | ||
| } | ||
|
|
||
| scrts, err := safe.ReaderGet[*secrets.Etcd](ctx, r, resource.NewMetadata(secrets.NamespaceName, secrets.EtcdType, secrets.EtcdID, resource.VersionUndefined)) | ||
| if err != nil { | ||
| if state.IsNotFoundError(err) { | ||
| continue | ||
| } | ||
|
|
||
| return fmt.Errorf("error getting secrets: %w", err) | ||
| } | ||
|
|
||
| if err = os.MkdirAll(constants.EtcdPKIPath, 0o700); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err = os.WriteFile(constants.KubernetesEtcdCACert, rootScrts.TypedSpec().EtcdCA.Crt, 0o400); err != nil { | ||
| return fmt.Errorf("failed to write CA certificate: %w", err) | ||
| } | ||
|
|
||
| if err = os.WriteFile(constants.KubernetesEtcdCAKey, rootScrts.TypedSpec().EtcdCA.Key, 0o400); err != nil { | ||
| return fmt.Errorf("failed to write CA key: %w", err) | ||
| } | ||
|
|
||
| etcdCerts := scrts.TypedSpec() | ||
|
|
||
| for _, keypair := range []struct { | ||
| getter func() *x509.PEMEncodedCertificateAndKey | ||
| keyPath string | ||
| certPath string | ||
| }{ | ||
| { | ||
| getter: func() *x509.PEMEncodedCertificateAndKey { return etcdCerts.Etcd }, | ||
| keyPath: constants.KubernetesEtcdKey, | ||
| certPath: constants.KubernetesEtcdCert, | ||
| }, | ||
| { | ||
| getter: func() *x509.PEMEncodedCertificateAndKey { return etcdCerts.EtcdPeer }, | ||
| keyPath: constants.KubernetesEtcdPeerKey, | ||
| certPath: constants.KubernetesEtcdPeerCert, | ||
| }, | ||
| { | ||
| getter: func() *x509.PEMEncodedCertificateAndKey { return etcdCerts.EtcdAdmin }, | ||
| keyPath: constants.KubernetesEtcdAdminKey, | ||
| certPath: constants.KubernetesEtcdAdminCert, | ||
| }, | ||
| } { | ||
| if err = os.WriteFile(keypair.keyPath, keypair.getter().Key, 0o400); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err = os.WriteFile(keypair.certPath, keypair.getter().Crt, 0o400); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if err = filetree.ChownRecursive(constants.EtcdPKIPath, constants.EtcdUserID, constants.EtcdUserID); err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| if err = safe.WriterModify(ctx, r, etcd.NewPKIStatus(etcd.NamespaceName, etcd.PKIID), func(status *etcd.PKIStatus) error { | ||
| status.TypedSpec().Ready = true | ||
| status.TypedSpec().Version = scrts.Metadata().Version().String() | ||
|
|
||
| return nil | ||
| }); err != nil { | ||
| return fmt.Errorf("error updating PKI status: %w", err) | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.