Skip to content

Commit

Permalink
fix: suppress spurious Kubernetes API server cert updates
Browse files Browse the repository at this point in the history
With the last changes, `kube-apiserver` certificates are generated based
on the assigned `NodeAdresses`, machine configuration, etc. Whenver the
certificate is regenerated, `kube-apiserver` is reloaded to pick up the
new cert.

With Virtual IP enabled, Virtual IP address is included into the
certificate from the beginning as it is specified in the machine
configuration, but as virtual IP moves between the nodes this causes
`NodeAddresses` update, which triggers the controller, generates new
certs and reloads `kube-apiserver` at bad time (right after VIP got
moved). Even though the cert generated is identical to the previous one,
the API server reload makes it unavailable for 30-90 seconds.

This change extracts `CertSANs` as a separate resource so that its
updates are suppressed if the CertSANs sources change, but the final
list stays the same, and in turn prevents final certificate from being
updated.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Sep 8, 2021
1 parent ff90b57 commit c3b2429
Show file tree
Hide file tree
Showing 13 changed files with 799 additions and 183 deletions.
62 changes: 0 additions & 62 deletions internal/app/machined/pkg/controllers/secrets/altnames.go

This file was deleted.

68 changes: 23 additions & 45 deletions internal/app/machined/pkg/controllers/secrets/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ func (ctrl *APIController) Run(ctx context.Context, r controller.Runtime, logger
if err = ctrl.teardownAll(ctx, r); err != nil {
return err
}

// reset inputs back to what they were initially
if err = r.UpdateInputs(ctrl.Inputs()); err != nil {
return err
}
}
}

Expand All @@ -134,15 +139,9 @@ func (ctrl *APIController) reconcile(ctx context.Context, r controller.Runtime,
Kind: controller.InputWeak,
},
{
Namespace: network.NamespaceName,
Type: network.HostnameStatusType,
ID: pointer.ToString(network.HostnameID),
Kind: controller.InputWeak,
},
{
Namespace: network.NamespaceName,
Type: network.NodeAddressType,
ID: pointer.ToString(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)),
Namespace: secrets.NamespaceName,
Type: secrets.CertSANType,
ID: pointer.ToString(secrets.CertSANAPIID),
Kind: controller.InputWeak,
},
{
Expand Down Expand Up @@ -229,28 +228,16 @@ func (ctrl *APIController) reconcile(ctx context.Context, r controller.Runtime,

rootSpec := rootResource.(*secrets.Root).OSSpec()

hostnameResource, err := r.Get(ctx, resource.NewMetadata(network.NamespaceName, network.HostnameStatusType, network.HostnameID, resource.VersionUndefined))
certSANResource, err := r.Get(ctx, resource.NewMetadata(secrets.NamespaceName, secrets.CertSANType, secrets.CertSANAPIID, resource.VersionUndefined))
if err != nil {
if state.IsNotFoundError(err) {
continue
}

return err
return fmt.Errorf("error getting certSANs: %w", err)
}

hostnameStatus := hostnameResource.(*network.HostnameStatus).TypedSpec()

addressesResource, err := r.Get(ctx,
resource.NewMetadata(network.NamespaceName, network.NodeAddressType, network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s), resource.VersionUndefined))
if err != nil {
if state.IsNotFoundError(err) {
continue
}

return err
}

nodeAddresses := addressesResource.(*network.NodeAddress).TypedSpec()
certSANs := certSANResource.(*secrets.CertSAN).TypedSpec()

var endpointsStr []string

Expand All @@ -277,37 +264,28 @@ func (ctrl *APIController) reconcile(ctx context.Context, r controller.Runtime,
}
}

var altNames AltNames

for _, ip := range append(rootSpec.CertSANIPs, nodeAddresses.IPs()...) {
altNames.AppendIPs(ip.IPAddr().IP)
}

altNames.AppendDNSNames(rootSpec.CertSANDNSNames...)
altNames.AppendDNSNames(hostnameStatus.Hostname, hostnameStatus.FQDN())

if isControlplane {
if err := ctrl.generateControlPlane(ctx, r, logger, rootSpec, altNames, hostnameStatus.FQDN()); err != nil {
if err := ctrl.generateControlPlane(ctx, r, logger, rootSpec, certSANs); err != nil {
return err
}
} else {
if err := ctrl.generateJoin(ctx, r, logger, rootSpec, endpointsStr, altNames, hostnameStatus.FQDN()); err != nil {
if err := ctrl.generateJoin(ctx, r, logger, rootSpec, endpointsStr, certSANs); err != nil {
return err
}
}
}
}

func (ctrl *APIController) generateControlPlane(ctx context.Context, r controller.Runtime, logger *zap.Logger, rootSpec *secrets.RootOSSpec, altNames AltNames, fqdn string) error {
func (ctrl *APIController) generateControlPlane(ctx context.Context, r controller.Runtime, logger *zap.Logger, rootSpec *secrets.RootOSSpec, certSANs *secrets.CertSANSpec) error {
ca, err := x509.NewCertificateAuthorityFromCertificateAndKey(rootSpec.CA)
if err != nil {
return fmt.Errorf("failed to parse CA certificate: %w", err)
}

serverCert, err := x509.NewKeyPair(ca,
x509.IPAddresses(altNames.IPs),
x509.DNSNames(altNames.DNSNames),
x509.CommonName(fqdn),
x509.IPAddresses(certSANs.StdIPs()),
x509.DNSNames(certSANs.DNSNames),
x509.CommonName(certSANs.FQDN),
x509.NotAfter(time.Now().Add(x509.DefaultCertificateValidityDuration)),
x509.KeyUsage(stdlibx509.KeyUsageDigitalSignature|stdlibx509.KeyUsageKeyEncipherment),
x509.ExtKeyUsage([]stdlibx509.ExtKeyUsage{
Expand All @@ -319,7 +297,7 @@ func (ctrl *APIController) generateControlPlane(ctx context.Context, r controlle
}

clientCert, err := x509.NewKeyPair(ca,
x509.CommonName(fqdn),
x509.CommonName(certSANs.FQDN),
x509.Organization(string(role.Impersonator)),
x509.NotAfter(time.Now().Add(x509.DefaultCertificateValidityDuration)),
x509.KeyUsage(stdlibx509.KeyUsageDigitalSignature|stdlibx509.KeyUsageKeyEncipherment),
Expand Down Expand Up @@ -358,7 +336,7 @@ func (ctrl *APIController) generateControlPlane(ctx context.Context, r controlle
}

func (ctrl *APIController) generateJoin(ctx context.Context, r controller.Runtime, logger *zap.Logger,
rootSpec *secrets.RootOSSpec, endpointsStr []string, altNames AltNames, fqdn string) error {
rootSpec *secrets.RootOSSpec, endpointsStr []string, certSANs *secrets.CertSANSpec) error {
remoteGen, err := gen.NewRemoteGenerator(rootSpec.Token, endpointsStr)
if err != nil {
return fmt.Errorf("failed creating trustd client: %w", err)
Expand All @@ -367,9 +345,9 @@ func (ctrl *APIController) generateJoin(ctx context.Context, r controller.Runtim
defer remoteGen.Close() //nolint:errcheck

serverCSR, serverCert, err := x509.NewEd25519CSRAndIdentity(
x509.IPAddresses(altNames.IPs),
x509.DNSNames(altNames.DNSNames),
x509.CommonName(fqdn),
x509.IPAddresses(certSANs.StdIPs()),
x509.DNSNames(certSANs.DNSNames),
x509.CommonName(certSANs.FQDN),
)
if err != nil {
return fmt.Errorf("failed to generate API server CSR: %w", err)
Expand All @@ -383,7 +361,7 @@ func (ctrl *APIController) generateJoin(ctx context.Context, r controller.Runtim
}

clientCSR, clientCert, err := x509.NewEd25519CSRAndIdentity(
x509.CommonName(fqdn),
x509.CommonName(certSANs.FQDN),
x509.Organization(string(role.Impersonator)),
)
if err != nil {
Expand Down
150 changes: 150 additions & 0 deletions internal/app/machined/pkg/controllers/secrets/api_cert_sans.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
// 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"

"github.com/AlekSi/pointer"
"github.com/cosi-project/runtime/pkg/controller"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/state"
"go.uber.org/zap"

"github.com/talos-systems/talos/pkg/resources/k8s"
"github.com/talos-systems/talos/pkg/resources/network"
"github.com/talos-systems/talos/pkg/resources/secrets"
)

// APICertSANsController manages secrets.APICertSANs based on configuration.
type APICertSANsController struct{}

// Name implements controller.Controller interface.
func (ctrl *APICertSANsController) Name() string {
return "secrets.APICertSANsController"
}

// Inputs implements controller.Controller interface.
//
//nolint:dupl
func (ctrl *APICertSANsController) Inputs() []controller.Input {
return []controller.Input{
{
Namespace: secrets.NamespaceName,
Type: secrets.RootType,
ID: pointer.ToString(secrets.RootOSID),
Kind: controller.InputWeak,
},
{
Namespace: network.NamespaceName,
Type: network.HostnameStatusType,
ID: pointer.ToString(network.HostnameID),
Kind: controller.InputWeak,
},
{
Namespace: network.NamespaceName,
Type: network.NodeAddressType,
ID: pointer.ToString(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)),
Kind: controller.InputWeak,
},
}
}

// Outputs implements controller.Controller interface.
func (ctrl *APICertSANsController) Outputs() []controller.Output {
return []controller.Output{
{
Type: secrets.CertSANType,
Kind: controller.OutputShared,
},
}
}

// Run implements controller.Controller interface.
//
//nolint:gocyclo
func (ctrl *APICertSANsController) Run(ctx context.Context, r controller.Runtime, logger *zap.Logger) error {
for {
select {
case <-ctx.Done():
return nil
case <-r.EventCh():
}

apiRootRes, err := r.Get(ctx, resource.NewMetadata(secrets.NamespaceName, secrets.RootType, secrets.RootOSID, 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 root k8s secrets: %w", err)
}

apiRoot := apiRootRes.(*secrets.Root).OSSpec()

hostnameResource, err := r.Get(ctx, resource.NewMetadata(network.NamespaceName, network.HostnameStatusType, network.HostnameID, resource.VersionUndefined))
if err != nil {
if state.IsNotFoundError(err) {
continue
}

return err
}

hostnameStatus := hostnameResource.(*network.HostnameStatus).TypedSpec()

addressesResource, err := r.Get(ctx,
resource.NewMetadata(network.NamespaceName, network.NodeAddressType, network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s), resource.VersionUndefined))
if err != nil {
if state.IsNotFoundError(err) {
continue
}

return err
}

nodeAddresses := addressesResource.(*network.NodeAddress).TypedSpec()

if err = r.Modify(ctx, secrets.NewCertSAN(secrets.NamespaceName, secrets.CertSANAPIID), func(r resource.Resource) error {
spec := r.(*secrets.CertSAN).TypedSpec()

spec.AppendIPs(apiRoot.CertSANIPs...)
spec.AppendIPs(nodeAddresses.IPs()...)

spec.AppendDNSNames(apiRoot.CertSANDNSNames...)
spec.AppendDNSNames(hostnameStatus.Hostname, hostnameStatus.FQDN())

spec.FQDN = hostnameStatus.FQDN()

spec.Sort()

return nil
}); err != nil {
return err
}
}
}

func (ctrl *APICertSANsController) teardownAll(ctx context.Context, r controller.Runtime) error {
list, err := r.List(ctx, resource.NewMetadata(secrets.NamespaceName, secrets.CertSANType, "", resource.VersionUndefined))
if err != nil {
return err
}

for _, res := range list.Items {
if res.Metadata().Owner() == ctrl.Name() {
if err = r.Destroy(ctx, res.Metadata()); err != nil {
return err
}
}
}

return nil
}

0 comments on commit c3b2429

Please sign in to comment.