From 6129ce38c579e74d4eac9f90fde45b9183461461 Mon Sep 17 00:00:00 2001 From: Christoph Kleineweber Date: Tue, 11 Jun 2024 09:26:40 +0200 Subject: [PATCH] chore: Update images for telemetry-manager 1.17.1 (#1167) --- .env | 2 +- config/manager/kustomization.yaml | 2 +- .../otelcollector/config/metric/agent/processors_test.go | 6 +++--- .../config/metric/agent/set_instrumentation_scope_test.go | 6 +++--- .../config/metric/agent/testdata/config_istio_enabled.yaml | 6 +++--- .../metric/agent/testdata/config_istio_not_enabled.yaml | 4 ++-- internal/version/version.go | 2 +- sec-scanners-config.yaml | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 648c52d40..b69f3354f 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ ### Default Environment Variables ## General ENV_K3S_K8S_VERSION=1.28.3 # refers to the version of kubernetes used in K3s -ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.0 # Image URL to use all building/pushing image targets +ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.1 # Image URL to use all building/pushing image targets ## Gardener ENV_GARDENER_K8S_VERSION=1.28 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4e39e3c6b..9aafea203 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -8,4 +8,4 @@ kind: Kustomization images: - name: controller newName: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager - newTag: 1.17.0 + newTag: 1.17.1 diff --git a/internal/otelcollector/config/metric/agent/processors_test.go b/internal/otelcollector/config/metric/agent/processors_test.go index b5cdd57c0..c4dd35727 100644 --- a/internal/otelcollector/config/metric/agent/processors_test.go +++ b/internal/otelcollector/config/metric/agent/processors_test.go @@ -71,7 +71,7 @@ func TestProcessors(t *testing.T) { require.Len(t, collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements, 1) require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Context) require.Len(t, collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements, 2) - require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[0]) + require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[0]) require.Equal(t, "set(name, \"io.kyma-project.telemetry/runtime\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[1]) }) @@ -84,7 +84,7 @@ func TestProcessors(t *testing.T) { require.Len(t, collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements, 1) require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Context) require.Len(t, collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements, 2) - require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[0]) + require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[0]) require.Equal(t, "set(name, \"io.kyma-project.telemetry/prometheus\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[1]) }) @@ -97,7 +97,7 @@ func TestProcessors(t *testing.T) { require.Len(t, collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements, 1) require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Context) require.Len(t, collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements, 2) - require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[0]) + require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[0]) require.Equal(t, "set(name, \"io.kyma-project.telemetry/istio\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[1]) }) diff --git a/internal/otelcollector/config/metric/agent/set_instrumentation_scope_test.go b/internal/otelcollector/config/metric/agent/set_instrumentation_scope_test.go index 7c35eeb99..c5e1dc0d3 100644 --- a/internal/otelcollector/config/metric/agent/set_instrumentation_scope_test.go +++ b/internal/otelcollector/config/metric/agent/set_instrumentation_scope_test.go @@ -20,7 +20,7 @@ func TestTransformedInstrumentationScope(t *testing.T) { MetricStatements: []config.TransformProcessorStatements{{ Context: "scope", Statements: []string{ - "set(version, \"1.17.0\") where name == \"otelcol/kubeletstatsreceiver\"", + "set(version, \"1.17.1\") where name == \"otelcol/kubeletstatsreceiver\"", "set(name, \"io.kyma-project.telemetry/runtime\") where name == \"otelcol/kubeletstatsreceiver\"", }, }}, @@ -33,7 +33,7 @@ func TestTransformedInstrumentationScope(t *testing.T) { MetricStatements: []config.TransformProcessorStatements{{ Context: "scope", Statements: []string{ - "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", + "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", "set(name, \"io.kyma-project.telemetry/prometheus\") where name == \"otelcol/prometheusreceiver\"", }, }}, @@ -46,7 +46,7 @@ func TestTransformedInstrumentationScope(t *testing.T) { MetricStatements: []config.TransformProcessorStatements{{ Context: "scope", Statements: []string{ - "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", + "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", "set(name, \"io.kyma-project.telemetry/istio\") where name == \"otelcol/prometheusreceiver\"", }, }}, diff --git a/internal/otelcollector/config/metric/agent/testdata/config_istio_enabled.yaml b/internal/otelcollector/config/metric/agent/testdata/config_istio_enabled.yaml index 067b987af..1f13823dd 100644 --- a/internal/otelcollector/config/metric/agent/testdata/config_istio_enabled.yaml +++ b/internal/otelcollector/config/metric/agent/testdata/config_istio_enabled.yaml @@ -308,21 +308,21 @@ processors: metric_statements: - context: scope statements: - - set(version, "1.17.0") where name == "otelcol/kubeletstatsreceiver" + - set(version, "1.17.1") where name == "otelcol/kubeletstatsreceiver" - set(name, "io.kyma-project.telemetry/runtime") where name == "otelcol/kubeletstatsreceiver" transform/set-instrumentation-scope-prometheus: error_mode: ignore metric_statements: - context: scope statements: - - set(version, "1.17.0") where name == "otelcol/prometheusreceiver" + - set(version, "1.17.1") where name == "otelcol/prometheusreceiver" - set(name, "io.kyma-project.telemetry/prometheus") where name == "otelcol/prometheusreceiver" transform/set-instrumentation-scope-istio: error_mode: ignore metric_statements: - context: scope statements: - - set(version, "1.17.0") where name == "otelcol/prometheusreceiver" + - set(version, "1.17.1") where name == "otelcol/prometheusreceiver" - set(name, "io.kyma-project.telemetry/istio") where name == "otelcol/prometheusreceiver" exporters: otlp: diff --git a/internal/otelcollector/config/metric/agent/testdata/config_istio_not_enabled.yaml b/internal/otelcollector/config/metric/agent/testdata/config_istio_not_enabled.yaml index 219e9ed6c..5200206e4 100644 --- a/internal/otelcollector/config/metric/agent/testdata/config_istio_not_enabled.yaml +++ b/internal/otelcollector/config/metric/agent/testdata/config_istio_not_enabled.yaml @@ -168,14 +168,14 @@ processors: metric_statements: - context: scope statements: - - set(version, "1.17.0") where name == "otelcol/kubeletstatsreceiver" + - set(version, "1.17.1") where name == "otelcol/kubeletstatsreceiver" - set(name, "io.kyma-project.telemetry/runtime") where name == "otelcol/kubeletstatsreceiver" transform/set-instrumentation-scope-prometheus: error_mode: ignore metric_statements: - context: scope statements: - - set(version, "1.17.0") where name == "otelcol/prometheusreceiver" + - set(version, "1.17.1") where name == "otelcol/prometheusreceiver" - set(name, "io.kyma-project.telemetry/prometheus") where name == "otelcol/prometheusreceiver" exporters: otlp: diff --git a/internal/version/version.go b/internal/version/version.go index bff630a31..202ffc567 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -1,3 +1,3 @@ package version -var Version = "1.17.0" +var Version = "1.17.1" diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 71b798e27..042c213a0 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,6 +1,6 @@ module-name: telemetry protecode: - - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.0 + - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.1 - europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.102.1-fbfb6cdc - europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:3.0.4-5d3fb7b6 - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240404-fd3588ce