Merge branch 'main' into fix-metrics-filtered-out-by-namespace-filter

kyma-project · Jan 30, 2025 · eaeb764 · eaeb764
2 parents 175e041 + 7bfdf6f
commit eaeb764
Show file tree

Hide file tree

Showing 43 changed files with 992 additions and 206 deletions.
diff --git a/.env b/.env
@@ -16,7 +16,7 @@ ENV_GORELEASER_VERSION=v1.23.0
 
 ## Default Docker Images
 DEFAULT_FLUENTBIT_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f"
-DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.2"
-DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.116.0-main"
+DEFAULT_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4"
+DEFAULT_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main"
 DEFAULT_SELFMONITOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175"
 DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -49,6 +49,10 @@ updates:
       interval: "daily"
     commit-message:
       prefix: "chore"
+    groups:
+      otel:
+        patterns:
+          - "go.opentelemetry.io/otel/*"
     labels:
       - "area/dependency"
       - "kind/chore"
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.4-alpine3.21 AS builder
+FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.5-alpine3.21 AS builder
 
 WORKDIR /telemetry-manager-workspace
 # Copy the Go Modules manifests

diff --git a/config/crd/bases/operator.kyma-project.io_telemetries.yaml b/config/crd/bases/operator.kyma-project.io_telemetries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: telemetries.operator.kyma-project.io
 spec:
   group: operator.kyma-project.io

diff --git a/config/crd/bases/telemetry.kyma-project.io_logparsers.yaml b/config/crd/bases/telemetry.kyma-project.io_logparsers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: logparsers.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/crd/bases/telemetry.kyma-project.io_logpipelines.yaml b/config/crd/bases/telemetry.kyma-project.io_logpipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: logpipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml b/config/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: metricpipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/crd/bases/telemetry.kyma-project.io_tracepipelines.yaml b/config/crd/bases/telemetry.kyma-project.io_tracepipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: tracepipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -34,13 +34,6 @@ resources:
 - ../networking
 
 patchesStrategicMerge:
-# Protect the /metrics endpoint by putting it behind auth.
-# If you want your controller-manager to expose the /metrics
-# endpoint w/o any authn/z, please comment the following line.
-# - manager_auth_proxy_patch.yaml
-
-
-
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
 #- manager_webhook_patch.yaml

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
diff --git a/config/development/crd/bases/operator.kyma-project.io_telemetries.yaml b/config/development/crd/bases/operator.kyma-project.io_telemetries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: telemetries.operator.kyma-project.io
 spec:
   group: operator.kyma-project.io

diff --git a/config/development/crd/bases/telemetry.kyma-project.io_logparsers.yaml b/config/development/crd/bases/telemetry.kyma-project.io_logparsers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: logparsers.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/development/crd/bases/telemetry.kyma-project.io_logpipelines.yaml b/config/development/crd/bases/telemetry.kyma-project.io_logpipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: logpipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/development/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml b/config/development/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: metricpipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/development/crd/bases/telemetry.kyma-project.io_tracepipelines.yaml b/config/development/crd/bases/telemetry.kyma-project.io_tracepipelines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: tracepipelines.telemetry.kyma-project.io
 spec:
   group: telemetry.kyma-project.io

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -10,10 +10,3 @@ resources:
 - role_binding.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-# Comment the following 4 lines if you want to disable
-# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
-# which protects your /metrics endpoint.
-# - auth_proxy_service.yaml
-# - auth_proxy_role.yaml
-# - auth_proxy_role_binding.yaml
-# - auth_proxy_client_clusterrole.yaml