Thanks to visit codestin.com
Credit goes to github.com

Skip to content

EventTransform: Inject tracing configurations #8479

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

Merged
merged 1 commit into from
Feb 26, 2025
Merged

EventTransform: Inject tracing configurations #8479

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions pkg/reconciler/eventtransform/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
eventtransformeryinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1alpha1/eventtransform"
sinkbindinginformer "knative.dev/eventing/pkg/client/injection/informers/sources/v1/sinkbinding/filtered"
"knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1alpha1/eventtransform"
reconcilersource "knative.dev/eventing/pkg/reconciler/source"
)

const (
Expand Down Expand Up @@ -72,6 +73,10 @@ func NewController(
})
featureStore.WatchConfigs(cmw)

configWatcher := reconcilersource.WatchConfigurations(ctx, "eventtransform", cmw,
reconcilersource.WithTracing,
)

r := &Reconciler{
k8s: kubeclient.Get(ctx),
client: eventingclient.Get(ctx),
Expand All @@ -80,6 +85,7 @@ func NewController(
jsonataServiceLister: jsonataServiceInformer.Lister(),
jsonataEndpointLister: jsonataEndpointInformer.Lister(),
jsonataSinkBindingLister: jsonataSinkBindingInformer.Lister(),
configWatcher: configWatcher,
}

impl := eventtransform.NewImpl(ctx, r, func(impl *controller.Impl) controller.Options {
Expand Down
5 changes: 4 additions & 1 deletion pkg/reconciler/eventtransform/eventtransform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
sources "knative.dev/eventing/pkg/apis/sources/v1"
eventingclient "knative.dev/eventing/pkg/client/clientset/versioned"
sourceslisters "knative.dev/eventing/pkg/client/listers/sources/v1"
reconcilersource "knative.dev/eventing/pkg/reconciler/source"
)

type Reconciler struct {
Expand All @@ -51,6 +52,8 @@ type Reconciler struct {
jsonataServiceLister corelister.ServiceLister
jsonataEndpointLister corelister.EndpointsLister
jsonataSinkBindingLister sourceslisters.SinkBindingLister

configWatcher *reconcilersource.ConfigWatcher
}

func (r *Reconciler) ReconcileKind(ctx context.Context, transform *eventing.EventTransform) reconciler.Event {
Expand Down Expand Up @@ -144,7 +147,7 @@ func (r *Reconciler) reconcileJsonataTransformationService(ctx context.Context,
}

func (r *Reconciler) reconcileJsonataTransformationDeployment(ctx context.Context, expression *corev1.ConfigMap, transform *eventing.EventTransform) error {
expected := jsonataDeployment(ctx, expression, transform)
expected := jsonataDeployment(ctx, r.configWatcher, expression, transform)

curr, err := r.jsonataDeploymentsLister.Deployments(expected.GetNamespace()).Get(expected.GetName())
if apierrors.IsNotFound(err) {
Expand Down
16 changes: 10 additions & 6 deletions pkg/reconciler/eventtransform/resources_jsonata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (

eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1"
reconcilersource "knative.dev/eventing/pkg/reconciler/source"
)

const (
Expand Down Expand Up @@ -71,7 +72,7 @@ func jsonataExpressionConfigMap(_ context.Context, transform *eventing.EventTran
return expression
}

func jsonataDeployment(_ context.Context, expression *corev1.ConfigMap, transform *eventing.EventTransform) appsv1.Deployment {
func jsonataDeployment(_ context.Context, cw *reconcilersource.ConfigWatcher, expression *corev1.ConfigMap, transform *eventing.EventTransform) appsv1.Deployment {
image := os.Getenv("EVENT_TRANSFORM_JSONATA_IMAGE")
if image == "" {
panic("EVENT_TRANSFORM_JSONATA_IMAGE must be set")
Expand Down Expand Up @@ -106,12 +107,15 @@ func jsonataDeployment(_ context.Context, expression *corev1.ConfigMap, transfor
{
Name: "jsonata-event-transform",
Image: image,
Env: []corev1.EnvVar{
{
Name: "JSONATA_TRANSFORM_FILE_NAME",
Value: filepath.Join(JsonataExpressionPath, JsonataExpressionDataKey),
Env: append(
[]corev1.EnvVar{
{
Name: "JSONATA_TRANSFORM_FILE_NAME",
Value: filepath.Join(JsonataExpressionPath, JsonataExpressionDataKey),
},
},
},
cw.ToEnvVars()...,
),
VolumeMounts: []corev1.VolumeMount{
{
Name: expression.GetName(),
Expand Down
Loading