diff --git a/config/config-tracing.yaml b/config/config-tracing.yaml
index f65862304b4..1dcefba4cbe 100644
--- a/config/config-tracing.yaml
+++ b/config/config-tracing.yaml
@@ -42,3 +42,5 @@ data:
# API endpoint to send the traces to
# (optional): The default value is given below
endpoint: "http://jaeger-collector.jaeger.svc.cluster.local:14268/api/traces"
+ # (optional) Name of the k8s secret which contains basic auth credentials
+ credentialsSecret: "jaeger-creds"
diff --git a/config/controller.yaml b/config/controller.yaml
index e90cc9c398f..dad4866396b 100644
--- a/config/controller.yaml
+++ b/config/controller.yaml
@@ -110,13 +110,6 @@ spec:
value: /etc/ssl/certs
- name: METRICS_DOMAIN
value: tekton.dev/pipeline
- # The following variables can be uncommented with correct values to enable Jaeger tracing
- #- name: OTEL_EXPORTER_JAEGER_ENDPOINT
- # value: http://jaeger-collector.jaeger:14268/api/traces
- #- name: OTEL_EXPORTER_JAEGER_USER
- # value: username
- #- name: OTEL_EXPORTER_JAEGER_PASSWORD
- # value: password
securityContext:
allowPrivilegeEscalation: false
capabilities:
diff --git a/docs/developers/tracing.md b/docs/developers/tracing.md
index 5a4b90a576f..45d61520f4d 100644
--- a/docs/developers/tracing.md
+++ b/docs/developers/tracing.md
@@ -30,8 +30,4 @@ The configmap `config/config-tracing.yaml` contains the configuration for tracin
* enabled: Set this to true to enable tracing
* endpoint: API endpoint for jaeger collector to send the traces. By default the endpoint is configured to be `http://jaeger-collector.jaeger.svc.cluster.local:14268/api/traces`.
-
-Tekton pipelines controller also supports the following additional environment variables to be able to connect to jaeger:
-
-* `OTEL_EXPORTER_JAEGER_USER` is the username to be sent as authentication to the collector endpoint.
-* `OTEL_EXPORTER_JAEGER_PASSWORD` is the password to be sent as authentication to the collector endpoint.
+* credentialsSecret: Name of the secret which contains `username` and `password` to authenticate against the endpoint
diff --git a/pkg/apis/config/tracing.go b/pkg/apis/config/tracing.go
index d8685b758b2..715a5b0d8e7 100644
--- a/pkg/apis/config/tracing.go
+++ b/pkg/apis/config/tracing.go
@@ -30,6 +30,9 @@ const (
// tracingEndpintKey is the configmap key for tracing api endpoint
tracingEndpointKey = "endpoint"
+ // tracingCredentialsSecretKey is the name of the secret which contains credentials for tracing endpoint
+ tracingCredentialsSecretKey = "credentialsSecret"
+
// DefaultEndpoint is the default destination for sending traces
DefaultEndpoint = "http://jaeger-collector.jaeger.svc.cluster.local:14268/api/traces"
)
@@ -40,8 +43,9 @@ var DefaultTracing, _ = newTracingFromMap(map[string]string{})
// Tracing holds the configurations for tracing
// +k8s:deepcopy-gen=true
type Tracing struct {
- Enabled bool
- Endpoint string
+ Enabled bool
+ Endpoint string
+ CredentialsSecret string
}
// Equals returns true if two Configs are identical
@@ -55,7 +59,8 @@ func (cfg *Tracing) Equals(other *Tracing) bool {
}
return other.Enabled == cfg.Enabled &&
- other.Endpoint == cfg.Endpoint
+ other.Endpoint == cfg.Endpoint &&
+ other.CredentialsSecret == cfg.CredentialsSecret
}
// GetTracingConfigName returns the name of the configmap containing all
@@ -78,6 +83,10 @@ func newTracingFromMap(config map[string]string) (*Tracing, error) {
t.Endpoint = endpoint
}
+ if secret, ok := config[tracingCredentialsSecretKey]; ok {
+ t.CredentialsSecret = secret
+ }
+
if enabled, ok := config[tracingEnabledKey]; ok {
e, err := strconv.ParseBool(enabled)
if err != nil {
diff --git a/pkg/apis/config/tracing_test.go b/pkg/apis/config/tracing_test.go
index 4c09e292159..1cd64120589 100644
--- a/pkg/apis/config/tracing_test.go
+++ b/pkg/apis/config/tracing_test.go
@@ -60,3 +60,90 @@ func TestNewTracingFromConfigMap(t *testing.T) {
})
}
}
+
+func TestTracingEquals(t *testing.T) {
+ testCases := []struct {
+ name string
+ left *config.Tracing
+ right *config.Tracing
+ expected bool
+ }{
+ {
+ name: "left and right nil",
+ left: nil,
+ right: nil,
+ expected: true,
+ },
+ {
+ name: "left nil",
+ left: nil,
+ right: &config.Tracing{},
+ expected: false,
+ },
+ {
+ name: "right nil",
+ left: &config.Tracing{},
+ right: nil,
+ expected: false,
+ },
+ {
+ name: "right and right default",
+ left: &config.Tracing{},
+ right: &config.Tracing{},
+ expected: true,
+ },
+ {
+ name: "different enabled",
+ left: &config.Tracing{
+ Enabled: true,
+ },
+ right: &config.Tracing{
+ Enabled: false,
+ },
+ expected: false,
+ },
+ {
+ name: "different endpoint",
+ left: &config.Tracing{
+ Endpoint: "a",
+ },
+ right: &config.Tracing{
+ Endpoint: "b",
+ },
+ expected: false,
+ },
+ {
+ name: "different credentialsSecret",
+ left: &config.Tracing{
+ CredentialsSecret: "a",
+ },
+ right: &config.Tracing{
+ CredentialsSecret: "b",
+ },
+ expected: false,
+ },
+ {
+ name: "same all fields",
+ left: &config.Tracing{
+ Enabled: true,
+ Endpoint: "a",
+ CredentialsSecret: "b",
+ },
+ right: &config.Tracing{
+ Enabled: true,
+ Endpoint: "a",
+ CredentialsSecret: "b",
+ },
+ expected: true,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ actual := tc.left.Equals(tc.right)
+ if actual != tc.expected {
+ t.Errorf("Comparison failed expected: %t, actual: %t", tc.expected, actual)
+ }
+ })
+ }
+}
diff --git a/pkg/reconciler/pipelinerun/controller.go b/pkg/reconciler/pipelinerun/controller.go
index 38d4ed19e2d..5df3f698548 100644
--- a/pkg/reconciler/pipelinerun/controller.go
+++ b/pkg/reconciler/pipelinerun/controller.go
@@ -38,6 +38,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/utils/clock"
kubeclient "knative.dev/pkg/client/injection/kube/client"
+ secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/logging"
@@ -59,9 +60,10 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock) func(contex
pipelineRunInformer := pipelineruninformer.Get(ctx)
resolutionInformer := resolutioninformer.Get(ctx)
verificationpolicyInformer := verificationpolicyinformer.Get(ctx)
- tracerProvider := tracing.New(TracerProviderName)
+ secretinformer := secretinformer.Get(ctx)
+ tracerProvider := tracing.New(TracerProviderName, logger.Named("tracing"))
//nolint:contextcheck // OnStore methods does not support context as a parameter
- configStore := config.NewStore(logger.Named("config-store"), pipelinerunmetrics.MetricsOnStore(logger), tracerProvider.OnStore(logger))
+ configStore := config.NewStore(logger.Named("config-store"), pipelinerunmetrics.MetricsOnStore(logger), tracerProvider.OnStore(secretinformer.Lister()))
configStore.WatchConfigs(cmw)
c := &Reconciler{
@@ -86,6 +88,10 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock) func(contex
}
})
+ if _, err := secretinformer.Informer().AddEventHandler(controller.HandleAll(tracerProvider.Handler)); err != nil {
+ logging.FromContext(ctx).Panicf("Couldn't register Secret informer event handler: %w", err)
+ }
+
if _, err := pipelineRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
logging.FromContext(ctx).Panicf("Couldn't register PipelineRun informer event handler: %w", err)
}
diff --git a/pkg/reconciler/pipelinerun/pipelinerun_test.go b/pkg/reconciler/pipelinerun/pipelinerun_test.go
index 55b048c22ba..50de7d2b5a2 100644
--- a/pkg/reconciler/pipelinerun/pipelinerun_test.go
+++ b/pkg/reconciler/pipelinerun/pipelinerun_test.go
@@ -16735,7 +16735,7 @@ func Test_runNextSchedulableTask(t *testing.T) {
Clock: clock.NewFakePassiveClock(time.Now()),
KubeClientSet: testAssets.Clients.Kube,
PipelineClientSet: testAssets.Clients.Pipeline,
- tracerProvider: tracing.New("pipelinerun"),
+ tracerProvider: tracing.New("pipelinerun", logging.FromContext(ctx)),
}
err := c.runNextSchedulableTask(ctx, tc.pr, tc.pipelineRunFacts)
if (err != nil) != tc.wantErr {
diff --git a/pkg/reconciler/taskrun/controller.go b/pkg/reconciler/taskrun/controller.go
index 81609775320..451c78f9795 100644
--- a/pkg/reconciler/taskrun/controller.go
+++ b/pkg/reconciler/taskrun/controller.go
@@ -40,6 +40,7 @@ import (
kubeclient "knative.dev/pkg/client/injection/kube/client"
limitrangeinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange"
filteredpodinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/filtered"
+ secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/logging"
@@ -61,10 +62,11 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock) func(contex
limitrangeInformer := limitrangeinformer.Get(ctx)
verificationpolicyInformer := verificationpolicyinformer.Get(ctx)
resolutionInformer := resolutioninformer.Get(ctx)
+ secretinformer := secretinformer.Get(ctx)
spireClient := spire.GetControllerAPIClient(ctx)
- tracerProvider := tracing.New(TracerProviderName)
+ tracerProvider := tracing.New(TracerProviderName, logger.Named("tracing"))
//nolint:contextcheck // OnStore methods does not support context as a parameter
- configStore := config.NewStore(logger.Named("config-store"), taskrunmetrics.MetricsOnStore(logger), spire.OnStore(ctx, logger), tracerProvider.OnStore(logger))
+ configStore := config.NewStore(logger.Named("config-store"), taskrunmetrics.MetricsOnStore(logger), spire.OnStore(ctx, logger), tracerProvider.OnStore(secretinformer.Lister()))
configStore.WatchConfigs(cmw)
entrypointCache, err := pod.NewEntrypointCache(kubeclientset)
@@ -96,6 +98,10 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock) func(contex
}
})
+ if _, err := secretinformer.Informer().AddEventHandler(controller.HandleAll(tracerProvider.Handler)); err != nil {
+ logging.FromContext(ctx).Panicf("Couldn't register Secret informer event handler: %w", err)
+ }
+
if _, err := taskRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
logging.FromContext(ctx).Panicf("Couldn't register TaskRun informer event handler: %w", err)
}
diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go
index 9985ca11b91..ed21a4aef85 100644
--- a/pkg/tracing/tracing.go
+++ b/pkg/tracing/tracing.go
@@ -28,12 +28,18 @@ import (
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
+ corev1 "k8s.io/api/core/v1"
+ listerv1 "k8s.io/client-go/listers/core/v1"
+ "knative.dev/pkg/system"
)
type tracerProvider struct {
service string
provider trace.TracerProvider
cfg *config.Tracing
+ username string
+ password string
+ logger *zap.SugaredLogger
}
func init() {
@@ -41,42 +47,48 @@ func init() {
}
// New returns a new instance of tracerProvider for the given service
-func New(service string) *tracerProvider {
+func New(service string, logger *zap.SugaredLogger) *tracerProvider {
return &tracerProvider{
service: service,
provider: trace.NewNoopTracerProvider(),
+ logger: logger,
}
}
// OnStore configures tracerProvider dynamically
-func (t *tracerProvider) OnStore(logger *zap.SugaredLogger) func(name string, value interface{}) {
+func (t *tracerProvider) OnStore(lister listerv1.SecretLister) func(name string, value interface{}) {
return func(name string, value interface{}) {
- if name == config.GetTracingConfigName() {
- cfg, ok := value.(*config.Tracing)
- if !ok {
- logger.Error("Failed to do type assertion for extracting TRACING config")
- return
- }
+ if name != config.GetTracingConfigName() {
+ return
+ }
- if cfg.Equals(t.cfg) {
- logger.Info("Tracing config unchanged", cfg, t.cfg)
- return
- }
- t.cfg = cfg
+ cfg, ok := value.(*config.Tracing)
+ if !ok {
+ t.logger.Error("tracing configmap is in invalid format. value: %v", value)
+ return
+ }
+
+ if cfg.Equals(t.cfg) {
+ t.logger.Info("tracing config unchanged", cfg, t.cfg)
+ return
+ }
+ t.cfg = cfg
- tp, err := createTracerProvider(t.service, cfg)
+ if lister != nil && cfg.CredentialsSecret != "" {
+ sec, err := lister.Secrets(system.Namespace()).Get(cfg.CredentialsSecret)
if err != nil {
- logger.Errorf("Unable to initialize tracing with error : %v", err.Error())
+ t.logger.Errorf("unable to initialize tracing with error : %v", err.Error())
return
}
- logger.Info("Initialized Tracer Provider")
- if p, ok := t.provider.(*tracesdk.TracerProvider); ok {
- if err := p.Shutdown(context.Background()); err != nil {
- logger.Errorf("Unable to shutdown tracingprovider with error : %v", err.Error())
- }
- }
- t.provider = tp
+ creds := sec.Data
+ t.username = string(creds["username"])
+ t.password = string(creds["password"])
+ } else {
+ t.username = ""
+ t.password = ""
}
+
+ t.reinitialize()
}
}
@@ -84,13 +96,61 @@ func (t *tracerProvider) Tracer(name string, options ...trace.TracerOption) trac
return t.provider.Tracer(name, options...)
}
-func createTracerProvider(service string, cfg *config.Tracing) (trace.TracerProvider, error) {
+// Handler is called by the informer when the secret is updated
+func (t *tracerProvider) Handler(obj interface{}) {
+ secret, ok := obj.(*corev1.Secret)
+ if !ok {
+ t.logger.Error("Failed to do type assertion for Secret")
+ return
+ }
+ t.OnSecret(secret)
+}
+
+func (t *tracerProvider) OnSecret(secret *corev1.Secret) {
+ if secret.Name != t.cfg.CredentialsSecret {
+ return
+ }
+
+ creds := secret.Data
+ username := string(creds["username"])
+ password := string(creds["password"])
+
+ if t.username == username && t.password == password {
+ // No change in credentials, no need to reinitialize
+ return
+ }
+ t.username = username
+ t.password = password
+
+ t.logger.Debugf("tracing credentials updated, reinitializing tracingprovider with secret: %v", secret.Name)
+
+ t.reinitialize()
+}
+
+func (t *tracerProvider) reinitialize() {
+ tp, err := createTracerProvider(t.service, t.cfg, t.username, t.password)
+ if err != nil {
+ t.logger.Errorf("unable to initialize tracing with error : %v", err.Error())
+ return
+ }
+ t.logger.Info("initialized Tracer Provider")
+ if p, ok := t.provider.(*tracesdk.TracerProvider); ok {
+ if err := p.Shutdown(context.Background()); err != nil {
+ t.logger.Errorf("unable to shutdown tracingprovider with error : %v", err.Error())
+ }
+ }
+ t.provider = tp
+}
+
+func createTracerProvider(service string, cfg *config.Tracing, user, pass string) (trace.TracerProvider, error) {
if !cfg.Enabled {
return trace.NewNoopTracerProvider(), nil
}
exp, err := jaeger.New(jaeger.WithCollectorEndpoint(
jaeger.WithEndpoint(cfg.Endpoint),
+ jaeger.WithUsername(user),
+ jaeger.WithPassword(pass),
))
if err != nil {
return nil, err
diff --git a/pkg/tracing/tracing_test.go b/pkg/tracing/tracing_test.go
index 1f2cdfde0fe..a81451e0f31 100644
--- a/pkg/tracing/tracing_test.go
+++ b/pkg/tracing/tracing_test.go
@@ -14,19 +14,25 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package tracing_test
+package tracing
import (
"context"
"testing"
"github.com/tektoncd/pipeline/pkg/apis/config"
- "github.com/tektoncd/pipeline/pkg/tracing"
+ ttesting "github.com/tektoncd/pipeline/pkg/reconciler/testing"
+ "github.com/tektoncd/pipeline/test"
"go.uber.org/zap"
+ corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake"
+ fakesecretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake"
+ _ "knative.dev/pkg/system/testing"
)
func TestNewTracerProvider(t *testing.T) {
- tp := tracing.New("test-serice")
+ tp := New("test-service", zap.NewNop().Sugar())
tracer := tp.Tracer("tracer")
_, span := tracer.Start(context.TODO(), "example")
@@ -39,13 +45,13 @@ func TestNewTracerProvider(t *testing.T) {
}
func TestOnStore(t *testing.T) {
- tp := tracing.New("test-service")
+ tp := New("test-service", zap.NewNop().Sugar())
cfg := &config.Tracing{
Enabled: false,
}
- tp.OnStore(zap.NewExample().Sugar())("config-tracing", cfg)
+ tp.OnStore(nil)("config-tracing", cfg)
tracer := tp.Tracer("tracer")
_, span := tracer.Start(context.TODO(), "example")
@@ -57,15 +63,53 @@ func TestOnStore(t *testing.T) {
}
}
+func TestOnStoreWithSecret(t *testing.T) {
+ ctx, _ := ttesting.SetupFakeContext(t)
+
+ tp := New("test-service", zap.NewNop().Sugar())
+
+ cfg := &config.Tracing{
+ Enabled: true,
+ CredentialsSecret: "tracing-sec",
+ }
+
+ client := fakekubeclient.Get(ctx)
+ informer := fakesecretinformer.Get(ctx)
+
+ client.PrependReactor("*", "secrets", test.AddToInformer(t, informer.Informer().GetIndexer()))
+
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "tracing-sec",
+ // system.Namespace() will return `knative-testing`
+ // Set inside the imported knative testing package
+ Namespace: "knative-testing",
+ },
+ Data: map[string][]byte{
+ "username": []byte("user"),
+ "password": []byte("pass"),
+ },
+ }
+ if _, err := client.CoreV1().Secrets("knative-testing").Create(ctx, secret, metav1.CreateOptions{}); err != nil {
+ t.Errorf("Unable to create secret for tracing,err : %v", err.Error())
+ }
+
+ tp.OnStore(informer.Lister())("config-tracing", cfg)
+
+ if tp.username != "user" || tp.password != "pass" {
+ t.Errorf("Tracing provider is not initialized with correct credentials")
+ }
+}
+
func TestOnStoreWithEnabled(t *testing.T) {
- tp := tracing.New("test-service")
+ tp := New("test-service", zap.NewNop().Sugar())
cfg := &config.Tracing{
Enabled: true,
Endpoint: "test-endpoint",
}
- tp.OnStore(zap.NewExample().Sugar())("config-tracing", cfg)
+ tp.OnStore(nil)("config-tracing", cfg)
tracer := tp.Tracer("tracer")
_, span := tracer.Start(context.TODO(), "example")
@@ -74,3 +118,124 @@ func TestOnStoreWithEnabled(t *testing.T) {
t.Fatalf("Span is not recording with tracing enabled")
}
}
+
+func TestOnSecretWithSecretName(t *testing.T) {
+ tp := New("test-service", zap.NewNop().Sugar())
+
+ cfg := &config.Tracing{
+ Enabled: true,
+ CredentialsSecret: "jaeger",
+ }
+
+ tp.OnStore(nil)("config-tracing", cfg)
+
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "jaeger",
+ },
+ Data: map[string][]byte{
+ "username": []byte("user"),
+ "password": []byte("pass"),
+ },
+ }
+
+ tp.OnSecret(secret)
+
+ if tp.username != "user" || tp.password != "pass" {
+ t.Errorf("Tracing provider is not updated with correct credentials")
+ }
+}
+
+// If OnSecret was called without changing the credentials, do not initialize again
+func TestOnSecretWithSameCreds(t *testing.T) {
+ tp := New("test-service", zap.NewNop().Sugar())
+
+ cfg := &config.Tracing{
+ Enabled: true,
+ CredentialsSecret: "jaeger",
+ }
+
+ tp.OnStore(nil)("config-tracing", cfg)
+
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "jaeger",
+ },
+ Data: map[string][]byte{
+ "username": []byte("user"),
+ "password": []byte("pass"),
+ },
+ }
+
+ tp.OnSecret(secret)
+
+ p := tp.provider
+
+ tp.OnSecret(secret)
+
+ if p != tp.provider {
+ t.Errorf("Tracerprovider was reinitialized when the credentials were not changed")
+ }
+}
+
+func TestOnSecretWithWrongName(t *testing.T) {
+ tp := New("test-service", zap.NewNop().Sugar())
+
+ cfg := &config.Tracing{
+ Enabled: true,
+ CredentialsSecret: "jaeger",
+ }
+
+ tp.OnStore(nil)("config-tracing", cfg)
+
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "somethingelse",
+ },
+ Data: map[string][]byte{
+ "username": []byte("user"),
+ "password": []byte("pass"),
+ },
+ }
+
+ tp.OnSecret(secret)
+
+ if tp.username == "user" || tp.password == "pass" {
+ t.Errorf("Tracing provider is updated with incorrect credentials")
+ }
+}
+
+func TestHandlerSecretUpdate(t *testing.T) {
+ tp := New("test-service", zap.NewNop().Sugar())
+
+ cfg := &config.Tracing{
+ Enabled: true,
+ CredentialsSecret: "jaeger",
+ }
+
+ tp.OnStore(nil)("config-tracing", cfg)
+
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "somethingelse",
+ },
+ Data: map[string][]byte{
+ "username": []byte("user"),
+ "password": []byte("pass"),
+ },
+ }
+
+ tp.Handler(secret)
+
+ if tp.username == "user" || tp.password == "pass" {
+ t.Errorf("Tracing provider is updated with incorrect credentials")
+ }
+
+ secret.Data["password"] = []byte("pass1")
+
+ tp.Handler(secret)
+
+ if tp.username == "user" || tp.password == "pass1" {
+ t.Errorf("Tracing provider is not updated when secret is updated")
+ }
+}
diff --git a/test/controller.go b/test/controller.go
index 72af3b8f312..93a3840ae86 100644
--- a/test/controller.go
+++ b/test/controller.go
@@ -61,6 +61,7 @@ import (
fakeconfigmapinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake"
fakelimitrangeinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake"
fakefilteredpodinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/filtered/fake"
+ fakesecretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake"
fakeserviceaccountinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake"
"knative.dev/pkg/controller"
"knative.dev/pkg/system"
@@ -84,6 +85,7 @@ type Data struct {
ResolutionRequests []*resolutionv1alpha1.ResolutionRequest
ExpectedCloudEventCount int
VerificationPolicies []*v1alpha1.VerificationPolicy
+ Secrets []*corev1.Secret
}
// Clients holds references to clients which are useful for reconciler tests.
@@ -110,6 +112,7 @@ type Informers struct {
LimitRange coreinformers.LimitRangeInformer
ResolutionRequest resolutioninformersv1alpha1.ResolutionRequestInformer
VerificationPolicy informersv1alpha1.VerificationPolicyInformer
+ Secret coreinformers.SecretInformer
}
// Assets holds references to the controller, logs, clients, and informers.
@@ -196,6 +199,7 @@ func SeedTestData(t *testing.T, ctx context.Context, d Data) (Clients, Informers
LimitRange: fakelimitrangeinformer.Get(ctx),
ResolutionRequest: fakeresolutionrequestinformer.Get(ctx),
VerificationPolicy: fakeverificationpolicyinformer.Get(ctx),
+ Secret: fakesecretinformer.Get(ctx),
}
// Attach reactors that add resource mutations to the appropriate
@@ -292,6 +296,14 @@ func SeedTestData(t *testing.T, ctx context.Context, d Data) (Clients, Informers
t.Fatal(err)
}
}
+
+ c.Kube.PrependReactor("*", "secrets", AddToInformer(t, i.Secret.Informer().GetIndexer()))
+ for _, s := range d.Secrets {
+ s := s.DeepCopy() // Avoid assumptions that the informer's copy is modified.
+ if _, err := c.Kube.CoreV1().Secrets(s.Namespace).Create(ctx, s, metav1.CreateOptions{}); err != nil {
+ t.Fatal(err)
+ }
+ }
c.Pipeline.ClearActions()
c.Kube.ClearActions()
c.ResolutionRequests.ClearActions()
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go
new file mode 100644
index 00000000000..b876df855b9
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Knative 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.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+ context "context"
+
+ secret "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
+ fake "knative.dev/pkg/client/injection/kube/informers/factory/fake"
+ controller "knative.dev/pkg/controller"
+ injection "knative.dev/pkg/injection"
+)
+
+var Get = secret.Get
+
+func init() {
+ injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+ f := fake.Get(ctx)
+ inf := f.Core().V1().Secrets()
+ return context.WithValue(ctx, secret.Key{}, inf), inf.Informer()
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go
new file mode 100644
index 00000000000..22ddeb56426
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go
@@ -0,0 +1,52 @@
+/*
+Copyright 2022 The Knative 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.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package secret
+
+import (
+ context "context"
+
+ v1 "k8s.io/client-go/informers/core/v1"
+ factory "knative.dev/pkg/client/injection/kube/informers/factory"
+ controller "knative.dev/pkg/controller"
+ injection "knative.dev/pkg/injection"
+ logging "knative.dev/pkg/logging"
+)
+
+func init() {
+ injection.Default.RegisterInformer(withInformer)
+}
+
+// Key is used for associating the Informer inside the context.Context.
+type Key struct{}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+ f := factory.Get(ctx)
+ inf := f.Core().V1().Secrets()
+ return context.WithValue(ctx, Key{}, inf), inf.Informer()
+}
+
+// Get extracts the typed informer from the context.
+func Get(ctx context.Context) v1.SecretInformer {
+ untyped := ctx.Value(Key{})
+ if untyped == nil {
+ logging.FromContext(ctx).Panic(
+ "Unable to fetch k8s.io/client-go/informers/core/v1.SecretInformer from context.")
+ }
+ return untyped.(v1.SecretInformer)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1d568b1ed11..f74373ef5e7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1789,6 +1789,8 @@ knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange
knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake
knative.dev/pkg/client/injection/kube/informers/core/v1/pod/filtered
knative.dev/pkg/client/injection/kube/informers/core/v1/pod/filtered/fake
+knative.dev/pkg/client/injection/kube/informers/core/v1/secret
+knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake
knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount
knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake
knative.dev/pkg/client/injection/kube/informers/factory