Skip to content

Commit

Permalink
chore: Update to golang 1.23.6 (#1811)
Browse files Browse the repository at this point in the history
  • Loading branch information
a-thaler authored Feb 7, 2025
1 parent aa7f238 commit ca64f97
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 24 deletions.
7 changes: 3 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
DEFAULT_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.118.0"
12 changes: 0 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/user/integration/sample-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/user/integration/sample-app/go.mod
Original file line number Diff line number Diff line change
@@ -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
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.23.4
go 1.23.0

require (
github.com/go-logr/logr v1.4.2
Expand Down
2 changes: 1 addition & 1 deletion internal/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sec-scanners-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/testkit/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

0 comments on commit ca64f97

Please sign in to comment.