Skip to content

Commit

Permalink
add support for external certs
Browse files Browse the repository at this point in the history
Signed-off-by: Kuromesi <[email protected]>
  • Loading branch information
Kuromesi committed Jul 11, 2024
1 parent bfb70a1 commit ac55d29
Show file tree
Hide file tree
Showing 2 changed files with 132 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/webhook/util/controller/webhook_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ func (c *Controller) sync() error {
certWriter, err = writer.NewFSCertWriter(writer.FSCertWriterOptions{
Path: webhookutil.GetCertDir(),
})
} else if certWriterType == writer.ExternalCertWriter {
certWriter, err = writer.NewExternalCertWriter(writer.ExternalCertWriterOptions{
Clientset: c.kubeClient,
Secret: &types.NamespacedName{Namespace: webhookutil.GetNamespace(), Name: webhookutil.GetSecretName()},
})
} else {
certWriter, err = writer.NewSecretCertWriter(writer.SecretCertWriterOptions{
Clientset: c.kubeClient,
Expand All @@ -254,7 +259,6 @@ func (c *Controller) sync() error {
if err := writer.WriteCertsToDir(webhookutil.GetCertDir(), certs); err != nil {
return fmt.Errorf("failed to write certs to dir: %v", err)
}

if err := configuration.Ensure(c.kubeClient, c.handlers, certs.CACert); err != nil {
return fmt.Errorf("failed to ensure configuration: %v", err)
}
Expand Down
127 changes: 127 additions & 0 deletions pkg/webhook/util/writer/external.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/*
Copyright 2020 The Kruise Authors.
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package writer

import (
"context"
"errors"
"fmt"

corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes"

"github.com/openkruise/kruise/pkg/webhook/util/generator"
)

const (
ExternalCertWriter = "external"
ExternalCACert = "ca.crt"
ExternalCAKey = "ca.key"
ExternalServerCert = "tls.crt"
ExternalServerKey = "tls.key"
)

// externalCertWriter provisions the certificate by reading from the k8s secrets.
type externalCertWriter struct {
*ExternalCertWriterOptions

// dnsName is the DNS name that the certificate is for.
dnsName string
}

// ExternalCertWriterOptions is options for constructing a externalCertWriter.
type ExternalCertWriterOptions struct {
// client talks to a kubernetes cluster for creating the secret.
Clientset clientset.Interface
// secret points the secret that contains certificates that written by the CertWriter.
Secret *types.NamespacedName
}

var _ CertWriter = &externalCertWriter{}

func (ops *ExternalCertWriterOptions) validate() error {
if ops.Clientset == nil {
return errors.New("client must be set in externalCertWriterOptions")
}
if ops.Secret == nil {
return errors.New("secret must be set in externalCertWriterOptions")
}
return nil
}

// NewExternalCertWriter constructs a CertWriter that persists the certificate in a k8s secret.
func NewExternalCertWriter(ops ExternalCertWriterOptions) (CertWriter, error) {
err := ops.validate()
if err != nil {
return nil, err
}
return &externalCertWriter{ExternalCertWriterOptions: &ops}, nil
}

// EnsureCert read and validate certs from k8s secret.
func (s *externalCertWriter) EnsureCert(dnsName string) (*generator.Artifacts, bool, error) {
// Create or refresh the certs based on clientConfig
s.dnsName = dnsName
certs, err := s.read()
if err != nil {
return nil, false, err
}
valid := validCert(certs, dnsName)
if !valid {
return nil, false, fmt.Errorf("cert is invalid or expired in secret %s/%s", s.Secret.Namespace, s.Secret.Name)
}
return certs, true, nil
}

var _ certReadWriter = &externalCertWriter{}

func (s *externalCertWriter) write() (*generator.Artifacts, error) {
return nil, nil
}

func (s *externalCertWriter) overwrite(resourceVersion string) (*generator.Artifacts, error) {
return nil, nil
}

func (s *externalCertWriter) read() (*generator.Artifacts, error) {
secret, err := s.Clientset.CoreV1().Secrets(s.Secret.Namespace).Get(context.TODO(), s.Secret.Name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
return nil, notFoundError{err}
}
if err != nil {
return nil, err
}
certs := externalSecretToCerts(secret)
return certs, nil
}

func externalSecretToCerts(secret *corev1.Secret) *generator.Artifacts {
ret := &generator.Artifacts{
ResourceVersion: secret.ResourceVersion,
}
if secret.Data != nil {
ret.CACert = secret.Data[ExternalCACert]
ret.CAKey = secret.Data[ExternalCAKey]
ret.Cert = secret.Data[ExternalServerCert]
ret.Key = secret.Data[ExternalServerKey]
}
return ret
}

0 comments on commit ac55d29

Please sign in to comment.