7a812ac5ed
In the upstream dynamiccertificates package, we rely on two pieces of code: 1. DynamicServingCertificateController.newTLSContent which calls - clientCA.CurrentCABundleContent - servingCert.CurrentCertKeyContent 2. unionCAContent.VerifyOptions which calls - unionCAContent.CurrentCABundleContent This results in calls to our tlsServingCertDynamicCertProvider and impersonationSigningCertProvider. If we Unset these providers, we subtly break these consumers. At best this results in test slowness and flakes while we wait for reconcile loops to converge. At worst, it results in actual errors during runtime. For example, we previously would Unset the impersonationSigningCertProvider on any sync loop error (even a transient one caused by a network blip or a conflict between writes from different replicas of the concierge). This would cause us to transiently fail to issue new certificates from the token credential require API. It would also cause us to transiently fail to authenticate previously issued client certs (which results in occasional Unauthorized errors in CI). Signed-off-by: Monis Khan <mok@vmware.com>
48 lines
1.2 KiB
Go
48 lines
1.2 KiB
Go
// Copyright 2021 the Pinniped contributors. All Rights Reserved.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package testutil
|
|
|
|
import (
|
|
"context"
|
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/kubernetes"
|
|
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
|
)
|
|
|
|
func NewDeleteOptionsRecorder(client kubernetes.Interface, opts *[]metav1.DeleteOptions) kubernetes.Interface {
|
|
return &clientWrapper{
|
|
Interface: client,
|
|
opts: opts,
|
|
}
|
|
}
|
|
|
|
type clientWrapper struct {
|
|
kubernetes.Interface
|
|
opts *[]metav1.DeleteOptions
|
|
}
|
|
|
|
func (c *clientWrapper) CoreV1() corev1client.CoreV1Interface {
|
|
return &coreWrapper{CoreV1Interface: c.Interface.CoreV1(), opts: c.opts}
|
|
}
|
|
|
|
type coreWrapper struct {
|
|
corev1client.CoreV1Interface
|
|
opts *[]metav1.DeleteOptions
|
|
}
|
|
|
|
func (c *coreWrapper) Secrets(namespace string) corev1client.SecretInterface {
|
|
return &secretsWrapper{SecretInterface: c.CoreV1Interface.Secrets(namespace), opts: c.opts}
|
|
}
|
|
|
|
type secretsWrapper struct {
|
|
corev1client.SecretInterface
|
|
opts *[]metav1.DeleteOptions
|
|
}
|
|
|
|
func (s *secretsWrapper) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error {
|
|
*s.opts = append(*s.opts, opts)
|
|
return s.SecretInterface.Delete(ctx, name, opts)
|
|
}
|