Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 10 additions & 22 deletions apis/telemetry/v1alpha1/logpipeline_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
)

var v1alpha1LogPipeline = &LogPipeline{
ObjectMeta: metav1.ObjectMeta{
Name: "log-pipeline-test",
},
Name: "log-pipeline-test",
Spec: LogPipelineSpec{
Input: LogPipelineInput{
Application: &LogPipelineApplicationInput{
Expand Down Expand Up @@ -111,17 +109,13 @@ var v1alpha1LogPipeline = &LogPipeline{
},
Headers: []Header{
{
Name: "header1",
ValueType: ValueType{
Value: "value1",
},
Name: "header1",
Value: "value1",
Prefix: "prefix1",
},
{
Name: "header2",
ValueType: ValueType{
Value: "value2",
},
Name: "header2",
Value: "value2",
Prefix: "prefix2",
},
},
Expand Down Expand Up @@ -155,9 +149,7 @@ var v1alpha1LogPipeline = &LogPipeline{
}

var v1beta1LogPipeline = &telemetryv1beta1.LogPipeline{
ObjectMeta: metav1.ObjectMeta{
Name: "log-pipeline-test",
},
Name: "log-pipeline-test",
Spec: telemetryv1beta1.LogPipelineSpec{
Input: telemetryv1beta1.LogPipelineInput{
Runtime: &telemetryv1beta1.LogPipelineRuntimeInput{
Expand Down Expand Up @@ -250,17 +242,13 @@ var v1beta1LogPipeline = &telemetryv1beta1.LogPipeline{
}},
Headers: []telemetryv1beta1.Header{
{
Name: "header1",
ValueType: telemetryv1beta1.ValueType{
Value: "value1",
},
Name: "header1",
Value: "value1",
Prefix: "prefix1",
},
{
Name: "header2",
ValueType: telemetryv1beta1.ValueType{
Value: "value2",
},
Name: "header2",
Value: "value2",
Prefix: "prefix2",
},
},
Expand Down
64 changes: 28 additions & 36 deletions apis/telemetry/v1alpha1/metricpipeline_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ import (
)

var v1alpha1MetricPipeline = &MetricPipeline{
ObjectMeta: metav1.ObjectMeta{
Name: "full-pipeline",
Namespace: "default",
},
Name: "full-pipeline",
Namespace: "default",
Spec: MetricPipelineSpec{
Input: MetricPipelineInput{
Runtime: &MetricPipelineRuntimeInput{
Expand Down Expand Up @@ -82,20 +80,18 @@ var v1alpha1MetricPipeline = &MetricPipeline{
},
Output: MetricPipelineOutput{
OTLP: &MetricPipelineOTLPOutput{
OTLPOutput: OTLPOutput{
Endpoint: ValueType{
Value: "otlp-collector:4317",
},
TLS: &OTLPTLS{
Insecure: true,
InsecureSkipVerify: true,
CA: &ValueType{Value: "ca-cert"},
Cert: &ValueType{Value: "cert"},
Key: &ValueType{Value: "key"},
},
Headers: []Header{
{Name: "header1", ValueType: ValueType{Value: "value1"}, Prefix: "myPrefix"},
},
Endpoint: ValueType{
Value: "otlp-collector:4317",
},
TLS: &OTLPTLS{
Insecure: true,
InsecureSkipVerify: true,
CA: &ValueType{Value: "ca-cert"},
Cert: &ValueType{Value: "cert"},
Key: &ValueType{Value: "key"},
},
Headers: []Header{
{Name: "header1", Value: "value1", Prefix: "myPrefix"},
},
Temporality: new(telemetryv1beta1.TemporalityDelta),
},
Expand All @@ -114,10 +110,8 @@ var v1alpha1MetricPipeline = &MetricPipeline{
}

var v1beta1MetricPipeline = &telemetryv1beta1.MetricPipeline{
ObjectMeta: metav1.ObjectMeta{
Name: "full-pipeline",
Namespace: "default",
},
Name: "full-pipeline",
Namespace: "default",
Spec: telemetryv1beta1.MetricPipelineSpec{
Input: telemetryv1beta1.MetricPipelineInput{
Runtime: &telemetryv1beta1.MetricPipelineRuntimeInput{
Expand Down Expand Up @@ -186,20 +180,18 @@ var v1beta1MetricPipeline = &telemetryv1beta1.MetricPipeline{
},
Output: telemetryv1beta1.MetricPipelineOutput{
OTLP: &telemetryv1beta1.MetricPipelineOTLPOutput{
OTLPOutput: telemetryv1beta1.OTLPOutput{
Endpoint: telemetryv1beta1.ValueType{
Value: "otlp-collector:4317",
},
TLS: &telemetryv1beta1.OutputTLS{
Insecure: true,
InsecureSkipVerify: true,
CA: &telemetryv1beta1.ValueType{Value: "ca-cert"},
Cert: &telemetryv1beta1.ValueType{Value: "cert"},
Key: &telemetryv1beta1.ValueType{Value: "key"},
},
Headers: []telemetryv1beta1.Header{
{Name: "header1", ValueType: telemetryv1beta1.ValueType{Value: "value1"}, Prefix: "myPrefix"},
},
Endpoint: telemetryv1beta1.ValueType{
Value: "otlp-collector:4317",
},
TLS: &telemetryv1beta1.OutputTLS{
Insecure: true,
InsecureSkipVerify: true,
CA: &telemetryv1beta1.ValueType{Value: "ca-cert"},
Cert: &telemetryv1beta1.ValueType{Value: "cert"},
Key: &telemetryv1beta1.ValueType{Value: "key"},
},
Headers: []telemetryv1beta1.Header{
{Name: "header1", Value: "value1", Prefix: "myPrefix"},
},
Temporality: new(telemetryv1beta1.TemporalityDelta),
},
Expand Down
6 changes: 2 additions & 4 deletions controllers/operator/telemetry_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,8 @@ func (r *TelemetryController) createTelemetryRequests(ctx context.Context) []rec
var requests []reconcile.Request
for _, t := range telemetries.Items {
requests = append(requests, reconcile.Request{
NamespacedName: client.ObjectKey{
Name: t.Name,
Namespace: t.Namespace,
},
Name: t.Name,
Namespace: t.Namespace,
})
}

Expand Down
8 changes: 2 additions & 6 deletions controllers/telemetry/logpipeline_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,7 @@ func (r *LogPipelineController) mapOTLPGatewayChanges(ctx context.Context, objec
// Only reconcile pipelines with OTLP input (gateway-based)
if pipeline.Spec.Input.OTLP != nil {
requests = append(requests, reconcile.Request{
NamespacedName: types.NamespacedName{
Name: pipeline.Name,
},
Name: pipeline.Name,
})
}
}
Expand Down Expand Up @@ -490,9 +488,7 @@ func (r *LogPipelineController) enqueueAllPipelines(ctx context.Context) []recon
requests := make([]reconcile.Request, len(pipelineList.Items))
for i := range pipelineList.Items {
requests[i] = reconcile.Request{
NamespacedName: types.NamespacedName{
Name: pipelineList.Items[i].Name,
},
Name: pipelineList.Items[i].Name,
}
}

Expand Down
4 changes: 1 addition & 3 deletions controllers/telemetry/metricpipeline_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,7 @@ func (r *MetricPipelineController) enqueueAllPipelines(ctx context.Context) []re
requests := make([]reconcile.Request, len(pipelineList.Items))
for i := range pipelineList.Items {
requests[i] = reconcile.Request{
NamespacedName: types.NamespacedName{
Name: pipelineList.Items[i].Name,
},
Name: pipelineList.Items[i].Name,
}
}

Expand Down
7 changes: 2 additions & 5 deletions controllers/telemetry/otlpgateway_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/types"
autoscalingvpav1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
"k8s.io/client-go/discovery"
"k8s.io/client-go/rest"
Expand Down Expand Up @@ -242,10 +241,8 @@ func (r *OTLPGatewayController) mapNodeChanges(ctx context.Context, object clien
func (r *OTLPGatewayController) enqueueConfigMap() []reconcile.Request {
return []reconcile.Request{
{
NamespacedName: types.NamespacedName{
Name: names.OTLPGatewayCoordinationConfigMap,
Namespace: r.reconciler.Globals().TargetNamespace(),
},
Name: names.OTLPGatewayCoordinationConfigMap,
Namespace: r.reconciler.Globals().TargetNamespace(),
},
}
}
4 changes: 1 addition & 3 deletions controllers/telemetry/tracepipeline_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,7 @@ func (r *TracePipelineController) enqueueAllPipelines(ctx context.Context) []rec
requests := make([]reconcile.Request, len(pipelineList.Items))
for i := range pipelineList.Items {
requests[i] = reconcile.Request{
NamespacedName: types.NamespacedName{
Name: pipelineList.Items[i].Name,
},
Name: pipelineList.Items[i].Name,
}
}

Expand Down
2 changes: 1 addition & 1 deletion dependencies/chown/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/kyma-project/telemetry-manager/dependencies/chown

go 1.26.5
go 1.27.0
2 changes: 1 addition & 1 deletion dependencies/directory-size-exporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kyma-project/telemetry-manager/dependencies/directory-size-exporter

go 1.26.5
go 1.27.0

require (
github.com/prometheus/client_golang v1.24.1
Expand Down
2 changes: 1 addition & 1 deletion dependencies/fault-backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/kyma-project/telemetry-manager/dependencies/fault-backend

go 1.26.5
go 1.27.0
2 changes: 1 addition & 1 deletion dependencies/populateimages/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kyma-project/telemetry-manager/dependencies/populateimages

go 1.26.5
go 1.27.0

require (
github.com/joho/godotenv v1.5.1
Expand Down
17 changes: 7 additions & 10 deletions dependencies/sample-app/go.mod
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
module github.com/kyma-project/telemetry-manager/dependencies/sample-app

go 1.26.5
go 1.27.0

require (
github.com/go-logr/logr v1.4.4
github.com/prometheus/client_golang v1.24.1
github.com/prometheus/otlptranslator v1.0.0
github.com/stretchr/testify v1.12.1
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0
go.opentelemetry.io/otel v1.45.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.45.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.45.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.45.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.45.0
go.opentelemetry.io/otel/exporters/prometheus v0.67.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.45.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.45.0
go.opentelemetry.io/otel/metric v1.45.0
go.opentelemetry.io/otel/sdk v1.45.0
go.opentelemetry.io/otel/sdk/metric v1.45.0
)

require (
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
go.opentelemetry.io/otel/trace v1.45.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/go-logr/logr v1.4.4
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
Expand All @@ -36,11 +35,9 @@ require (
github.com/prometheus/common v0.70.1 // indirect
github.com/prometheus/procfs v0.21.1 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.45.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.45.0
go.opentelemetry.io/otel/trace v1.45.0
go.opentelemetry.io/proto/otlp v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
golang.org/x/net v0.57.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/text v0.40.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion dependencies/stdout-log-generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kyma-project/telemetry-manager/dependencies/stdout-log-generator

go 1.26.5
go 1.27.0

require (
github.com/prometheus/client_golang v1.24.1
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kyma-project/telemetry-manager

go 1.26.5
go 1.27.0

require (
github.com/caarlos0/env/v11 v11.4.1
Expand Down
25 changes: 8 additions & 17 deletions internal/configchecksum/checksum_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,36 @@ import (

"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

var (
secret1 = corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "secret1",
Namespace: "ns2",
},
Name: "secret1",
Namespace: "ns2",
Data: map[string][]byte{
"1": []byte("2"),
"3": []byte("4"),
},
}
secret2 = corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "secret2",
Namespace: "ns1",
},
Name: "secret2",
Namespace: "ns1",
Data: map[string][]byte{
"2": []byte("1"),
"4": []byte("3"),
},
}
configMap1 = corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "configMap1",
Namespace: "ns1",
},
Name: "configMap1",
Namespace: "ns1",
Data: map[string]string{
"a": "b",
"c": "d",
},
}
configMap2 = corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "configMap2",
Namespace: "ns1",
},
Name: "configMap2",
Namespace: "ns1",
Data: map[string]string{
"b": "a",
"d": "c",
Expand Down
Loading
Loading