From ca64f97869126639ae41b2af09a50eadb29ae3c8 Mon Sep 17 00:00:00 2001 From: Andreas Thaler Date: Fri, 7 Feb 2025 09:34:00 +0100 Subject: [PATCH] chore: Update to golang 1.23.6 (#1811) --- .env | 7 +++---- .github/dependabot.yml | 12 ------------ Dockerfile | 2 +- docs/user/integration/sample-app/Dockerfile | 2 +- docs/user/integration/sample-app/go.mod | 2 +- go.mod | 2 +- internal/images/images.go | 2 +- internal/tools/go.mod | 2 +- sec-scanners-config.yaml | 2 +- test/testkit/images.go | 2 +- 10 files changed, 11 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 5a863d7c9..b4088f4c4 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ ### Default Environment Variables ## General -ENV_K3S_K8S_VERSION=1.30.5 # refers to the version of kubernetes used in K3s +ENV_K3S_K8S_VERSION=1.30.9 # refers to the version of kubernetes used in K3s ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main # Image URL to use all building/pushing image targets ## Gardener @@ -11,12 +11,11 @@ ENV_GARDENER_MAX_NODES=2 ## Dependencies ENV_ISTIO_VERSION=1.14.0 -ENV_K3D_VERSION=v5.4.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_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250206-00da07e7" 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" \ No newline at end of file +DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.118.0" diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6f70f8491..fb455c12c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,18 +1,6 @@ # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 updates: - - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "chore" - labels: - - "area/dependency" - - "kind/chore" - ignore: - - dependency-name: "kyma-project/prod/tpi/fluent-bit" - - package-ecosystem: "gomod" directory: "/" schedule: diff --git a/Dockerfile b/Dockerfile index 94e08b3cb..2a56bce77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.23.5-alpine3.21 AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.6-alpine3.21 AS builder WORKDIR /telemetry-manager-workspace # Copy the Go Modules manifests diff --git a/docs/user/integration/sample-app/Dockerfile b/docs/user/integration/sample-app/Dockerfile index f4d74001c..f43c28e33 100644 --- a/docs/user/integration/sample-app/Dockerfile +++ b/docs/user/integration/sample-app/Dockerfile @@ -1,5 +1,5 @@ # Build the app binary -FROM golang:1.23.5 AS builder +FROM golang:1.23.6 AS builder # Copy the project WORKDIR /app diff --git a/docs/user/integration/sample-app/go.mod b/docs/user/integration/sample-app/go.mod index fcbac9690..6d76c3a5f 100644 --- a/docs/user/integration/sample-app/go.mod +++ b/docs/user/integration/sample-app/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/telemetry-manager/docs/user/integration/sample-app -go 1.23 +go 1.23.0 require ( github.com/prometheus/client_golang v1.20.5 diff --git a/go.mod b/go.mod index 6c363f887..a1b2f729e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/telemetry-manager -go 1.23.4 +go 1.23.0 require ( github.com/go-logr/logr v1.4.2 diff --git a/internal/images/images.go b/internal/images/images.go index 6028515f9..7c9e52e34 100644 --- a/internal/images/images.go +++ b/internal/images/images.go @@ -4,7 +4,7 @@ package images const ( - DefaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f" + DefaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250206-00da07e7" DefaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4" DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main" DefaultSelfMonitorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175" diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 6716d299c..8a91f4e0c 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/telemetry-manager/internal/tools -go 1.23.4 +go 1.23.0 require ( github.com/bombsimon/wsl/v4 v4.5.0 diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 99dae7327..21c243f42 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -2,7 +2,7 @@ module-name: telemetry kind: kyma bdba: - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main -- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f +- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250206-00da07e7 - europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4 - europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main - europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175 diff --git a/test/testkit/images.go b/test/testkit/images.go index 9b6f54a3b..e154d8bdd 100644 --- a/test/testkit/images.go +++ b/test/testkit/images.go @@ -4,5 +4,5 @@ package testkit const ( - DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.116.0" + DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.118.0" )