Skip to content

Commit 0b03059

Browse files
NHingerlNHingerl
committed
2 parents 6e67a16 + 8d9d348 commit 0b03059

File tree

197 files changed

+4444
-5713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+4444
-5713
lines changed

‎.env‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ ENV_GARDENER_MIN_NODES=1
99
ENV_GARDENER_MAX_NODES=2
1010

1111
## Dependencies
12-
ENV_ISTIO_VERSION=1.20.0
12+
ENV_ISTIO_VERSION=1.20.1
1313
ENV_GORELEASER_VERSION=v1.23.0
1414

1515
## Default Docker Images
1616
DEFAULT_FLUENTBIT_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250528-dfa5b526"
17-
DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:4.0.3"
18-
DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.128.0-main"
17+
18+
DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:4.0.4"
19+
DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.129.0-main"
1920

2021
DEFAULT_SELFMONITOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.4.1-be41b59"
21-
DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.128.0"
22+
DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.129.0"

‎.github/workflows/build-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8080

8181
- name: Send slack message on failure
82-
uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
82+
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # v2.1.1
8383
with:
8484
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
8585
webhook-type: incoming-webhook

‎.github/workflows/gardener-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
path: junit-report*.xml
123123

124124
- name: Send slack message on failure
125-
uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
125+
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # v2.1.1
126126
if: failure()
127127
with:
128128
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}

‎.github/workflows/pr-integration.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ on:
3131
- "!config/busola/**"
3232
- "!**_test.go"
3333
- "!docs/**"
34-
- "test/e2e/*.go"
35-
- "test/e2e-migrated/*.go"
36-
- "test/integration/istio/*.go"
34+
- "test/e2e/**.go"
35+
- "test/e2e-migrated/**.go"
36+
- "test/integration/istio/**.go"
3737
- ".github/workflows/pr-integration.yml"
3838
- ".github/template/**"
3939
- ".env"
@@ -57,9 +57,7 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
ginkgo-labels:
60-
- "metrics && set_a"
61-
- "metrics && set_b"
62-
- "metrics && set_c"
60+
- "metrics"
6361
- traces
6462
- telemetry
6563
- misc
@@ -307,8 +305,16 @@ jobs:
307305
mode: release
308306
- name: max-pipeline-otel
309307
mode: release
310-
- name: metrics
308+
- name: max-pipeline-metrics
311309
mode: release
310+
- name: metrics-set-a
311+
mode: release
312+
- name: metrics-set-b
313+
mode: release
314+
- name: metrics-set-c
315+
mode: release
316+
- name: metrics-experimental
317+
mode: experimental
312318
runs-on: ubuntu-latest
313319
steps:
314320
- name: Checkout repo
@@ -320,7 +326,6 @@ jobs:
320326
experimental: ${{ matrix.labels.mode == 'experimental' }}
321327
github-token: ${{ secrets.GITHUB_TOKEN }}
322328

323-
324329
- name: Deploy Test Prerequisites
325330
uses: "./.github/template/deploy-test-prerequisites"
326331

‎.github/workflows/pr-upgrade.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
shell: bash
7777
run: |
7878
go test -v -timeout=10m -run=TestUpgrade/before_upgrade ./test/e2e-migrated/upgrade/...
79+
# TODO(TeodorSAP): Replace with the following lines after 1.44 release:
80+
# go test -v -timeout=10m -run=TestLogsUpgrade/before_upgrade ./test/e2e-migrated/upgrade/...
81+
# go test -v -timeout=10m -run=TestMetricsUpgrade/before_upgrade ./test/e2e-migrated/upgrade/...
7982

8083
- name: Switch back to current revision
8184
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -114,7 +117,9 @@ jobs:
114117
- name: Run vanilla go tests on current revision
115118
shell: bash
116119
run: |
117-
go test -v -timeout=10m -run=TestUpgrade/after_upgrade ./test/e2e-migrated/upgrade/...
120+
go test -v -timeout=10m -run=TestLogsUpgrade/after_upgrade ./test/e2e-migrated/upgrade/...
121+
# TODO(TeodorSAP): Add the following line after 1.44 release:
122+
# go test -v -timeout=10m -run=TestMetricsUpgrade/after_upgrade ./test/e2e-migrated/upgrade/...
118123

119124
- name: Finalize test
120125
uses: "./.github/template/finalize-test"

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.24.4-alpine3.21 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.24.5-alpine3.22 AS builder
33

44
ARG TARGETOS
55
ARG TARGETARCH

‎apis/telemetry/v1alpha1/logpipeline_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ type LogPipelineFilter struct {
124124
}
125125

126126
// LogPipelineOutput describes a Fluent Bit output configuration section.
127-
// +kubebuilder:validation:XValidation:rule="has(self.otlp) == has(oldSelf.otlp)", message="Switching to or away from OTLP output is not supported"
127+
// +kubebuilder:validation:XValidation:rule="has(self.otlp) == has(oldSelf.otlp)", message="Switching to or away from OTLP output is not supported. Please re-create the LogPipeline instead"
128128
// +kubebuilder:validation:XValidation:rule="(!has(self.custom) && !has(self.http)) || !(has(self.custom) && has(self.http))", message="Exactly one output must be defined"
129129
// +kubebuilder:validation:XValidation:rule="(!has(self.custom) && !has(self.otlp)) || ! (has(self.custom) && has(self.otlp))", message="Exactly one output must be defined"
130130
// +kubebuilder:validation:XValidation:rule="(!has(self.http) && !has(self.otlp)) || ! (has(self.http) && has(self.otlp))", message="Exactly one output must be defined"

‎apis/telemetry/v1beta1/logpipeline_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ type LogPipelineFilter struct {
133133
}
134134

135135
// Output describes a Fluent Bit output configuration section.
136-
// +kubebuilder:validation:XValidation:rule="has(self.otlp) == has(oldSelf.otlp)", message="Switching to or away from OTLP output is not supported"
136+
// +kubebuilder:validation:XValidation:rule="has(self.otlp) == has(oldSelf.otlp)", message="Switching to or away from OTLP output is not supported. Please re-create the LogPipeline instead"
137137
// +kubebuilder:validation:XValidation:rule="(!has(self.custom) && !has(self.http)) || !(has(self.custom) && has(self.http))", message="Exactly one output must be defined"
138138
// +kubebuilder:validation:XValidation:rule="(!has(self.custom) && !has(self.otlp)) || ! (has(self.custom) && has(self.otlp))", message="Exactly one output must be defined"
139139
// +kubebuilder:validation:XValidation:rule="(!has(self.http) && !has(self.otlp)) || ! (has(self.http) && has(self.otlp))", message="Exactly one output must be defined"

‎config/crd/bases/telemetry.kyma-project.io_logpipelines.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ spec:
609609
rule: ((!has(self.path) || size(self.path) <= 0) && (has(self.protocol) && self.protocol == 'grpc')) || (has(self.protocol) && self.protocol == 'http')
610610
type: object
611611
x-kubernetes-validations:
612-
- message: Switching to or away from OTLP output is not supported
612+
- message: Switching to or away from OTLP output is not supported. Please re-create the LogPipeline instead
613613
rule: has(self.otlp) == has(oldSelf.otlp)
614614
- message: Exactly one output must be defined
615615
rule: (!has(self.custom) && !has(self.http)) || !(has(self.custom) && has(self.http))

‎config/development/crd/bases/telemetry.kyma-project.io_logpipelines.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ spec:
609609
rule: ((!has(self.path) || size(self.path) <= 0) && (has(self.protocol) && self.protocol == 'grpc')) || (has(self.protocol) && self.protocol == 'http')
610610
type: object
611611
x-kubernetes-validations:
612-
- message: Switching to or away from OTLP output is not supported
612+
- message: Switching to or away from OTLP output is not supported. Please re-create the LogPipeline instead
613613
rule: has(self.otlp) == has(oldSelf.otlp)
614614
- message: Exactly one output must be defined
615615
rule: (!has(self.custom) && !has(self.http)) || !(has(self.custom) && has(self.http))
@@ -1323,7 +1323,7 @@ spec:
13231323
rule: ((!has(self.path) || size(self.path) <= 0) && (has(self.protocol) && self.protocol == 'grpc')) || (has(self.protocol) && self.protocol == 'http')
13241324
type: object
13251325
x-kubernetes-validations:
1326-
- message: Switching to or away from OTLP output is not supported
1326+
- message: Switching to or away from OTLP output is not supported. Please re-create the LogPipeline instead
13271327
rule: has(self.otlp) == has(oldSelf.otlp)
13281328
- message: Exactly one output must be defined
13291329
rule: (!has(self.custom) && !has(self.http)) || !(has(self.custom) && has(self.http))

0 commit comments

Comments
 (0)