Skip to content

Wire certwatcher for dynamic client TLS cert reloading #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cahillsf wants to merge 1 commit into
base: v2.2-dd
Choose a base branch
from
Open

Wire certwatcher for dynamic client TLS cert reloading #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions cmd/crossplane/core/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package core
import (
"context"
"crypto/tls"
"crypto/x509"
"fmt"
"io"
"os"
Expand All @@ -40,6 +41,7 @@ import (
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/certwatcher"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
Expand Down Expand Up @@ -307,6 +309,32 @@ func (c *startCommand) Run(s *runtime.Scheme, log logging.Logger) error { //noli
return errors.Wrap(err, "cannot load client TLS certificates")
}

clientCertWatcher, err := certwatcher.New(
filepath.Join(c.TLSClientCertsDir, c.TLSClientCertFileName),
filepath.Join(c.TLSClientCertsDir, c.TLSClientKeyFileName),
)
if err != nil {
return errors.Wrap(err, "cannot create client certificate watcher")
}
clienttls.GetClientCertificate = func(_ *tls.CertificateRequestInfo) (*tls.Certificate, error) {
return clientCertWatcher.GetCertificate(nil)
}
caPath := filepath.Join(c.TLSClientCertsDir, c.TLSClientCACertFileName)
clientCertWatcher.RegisterCallback(func(_ tls.Certificate) {
ca, err := os.ReadFile(filepath.Clean(caPath))
if err != nil {
log.Debug("Cannot reload CA certificate", "error", err)
return
}
pool := x509.NewCertPool()
if pool.AppendCertsFromPEM(ca) {
clienttls.RootCAs = pool
}
})
if err := mgr.Add(clientCertWatcher); err != nil {
return errors.Wrap(err, "cannot add client certificate watcher to manager")
}

pfrm := xfn.NewPrometheusMetrics()
metrics.Registry.MustRegister(pfrm)

Expand Down