diff --git a/Dockerfile b/Dockerfile index d7567d29..cb6662c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM --platform=$BUILDPLATFORM golang:1.23.3-bookworm@sha256:3f3b9daa3de608f3e869cd2ff8baf21555cf0fca9fd34251b8f340f9b7c30ec5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.5-bookworm@sha256:3149bc5043fa58cf127fd8db1fdd4e533b6aed5a40d663d4f4ae43d20386665f AS builder WORKDIR /app # Copy the Go Modules manifests diff --git a/go.mod b/go.mod index 777434f3..b4c0db3e 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,22 @@ module github.com/newrelic/k8s-agents-operator -go 1.23.3 +go 1.23.5 require ( github.com/go-logr/logr v1.4.2 + github.com/go-logr/zapr v1.3.0 github.com/google/go-cmp v0.6.0 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf github.com/stretchr/testify v1.10.0 go.opentelemetry.io/otel v1.32.0 + go.uber.org/zap v1.27.0 + gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 k8s.io/client-go v0.31.2 + k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 sigs.k8s.io/controller-runtime v0.19.1 ) @@ -30,7 +34,6 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect @@ -71,7 +74,6 @@ require ( go.opentelemetry.io/otel/trace v1.32.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect @@ -88,13 +90,11 @@ require ( google.golang.org/protobuf v1.36.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.31.1 // indirect k8s.io/apiserver v0.31.1 // indirect k8s.io/component-base v0.31.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect - k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/interop/github.com/golang/protobuf/go.mod b/interop/github.com/golang/protobuf/go.mod index 5ff59899..a1b1b0e9 100644 --- a/interop/github.com/golang/protobuf/go.mod +++ b/interop/github.com/golang/protobuf/go.mod @@ -1,5 +1,5 @@ module github.com/golang/protobuf -go 1.23.3 +go 1.23.5 require google.golang.org/protobuf v1.35.1 diff --git a/tools/go.mod b/tools/go.mod index 8c7ff6e2..eeb38dc2 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.23.0 +go 1.23.5 require ( github.com/arttor/helmify v0.4.17