diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index c2a4918c9..18a59878e 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -110,10 +110,9 @@ jobs: # SHARD: ${{ matrix.SHARD }} # SHARDS: ${{ matrix.SHARDS }} - - name: Test Coverage - uses: vladopajic/go-test-coverage@604860ea57b67a2351b4b78071943beecb11ac17 # v2.11.4 - with: - profile: ./build/_test_coverage/coverage_e2e.out + # This is a workaround as the action does not support setting working directory + - name: Run coverage report + run: make test-e2e-coverage-report-ci - name: Archive Test Results if: always() diff --git a/.go-version b/.go-version index ca8ec414e..f9e8384bb 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.5 +1.24.1 diff --git a/.tool-versions b/.tool-versions index a174531d4..668a3884b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.23.5 +golang 1.24.1 diff --git a/Dockerfile b/Dockerfile index dd9a5532e..9632b4559 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.23.5-alpine3.20@sha256:def59a601e724ddac5139d447e8e9f7d0aeec25db287a9ee1615134bcda266e2 AS builder +FROM --platform=$BUILDPLATFORM golang:1.24.1-alpine3.20@sha256:3d9132b88a6317b846b55aa8e821821301906fe799932ecbc4f814468c6977a5 AS builder RUN apk add --update --no-cache ca-certificates make git curl diff --git a/Makefile b/Makefile index 2dab57389..26f9ae311 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ CONTROLLER_GEN_VERSION := 0.17.2 # renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver GOLANGCI_LINT_VERSION := 1.64.6 +# renovate: datasource=go depName=github.com/vladopajic/go-test-coverage/v2 versioning=semver +GO_TEST_COVERAGE_VERSION := 2.12.1 + # renovate: datasource=github-releases depName=norwoodj/helm-docs versioning=semver HELM_DOCS_VERSION = 1.14.2 @@ -63,6 +66,8 @@ ENVTEST_BINARY_ASSETS := ${ENVTEST_BIN_DIR}/bin GOLANGCI_LINT := ${BIN}/golangci-lint LINTER_FLAGS := --timeout 10m +GO_TEST_COVERAGE := ${BIN}/go-test-coverage + HELM_DOCS := ${BIN}/helm-docs KIND := ${BIN}/kind @@ -192,19 +197,23 @@ test: codegen fmt vet manifests ${ENVTEST_BINARY_ASSETS} ${KUBEBUILDER} ## Run t ENVTEST_BINARY_ASSETS=${ENVTEST_BINARY_ASSETS} go test ./controllers/logging/... ./pkg/... -coverprofile ${TEST_COV_DIR}/cover_controllers_logging.out ENVTEST_BINARY_ASSETS=${ENVTEST_BINARY_ASSETS} go test ./controllers/extensions/... ./pkg/... -coverprofile ${TEST_COV_DIR}/cover_controllers_extensions.out -.PHONY: install-go-test-coverage -install-go-test-coverage: - GOBIN=${BIN} go install github.com/vladopajic/go-test-coverage/v2@latest - .PHONY: generate-test-coverage -generate-test-coverage: install-go-test-coverage test +generate-test-coverage: test rm -f ${TEST_COV_DIR}/coverage_all.out echo "mode: set" > ${TEST_COV_DIR}/coverage_all.out find -name 'cover_*.out' | xargs cat | grep -v "mode: set" >> ${TEST_COV_DIR}/coverage_all.out .PHONY: check-coverage -check-coverage: install-go-test-coverage generate-test-coverage - GOBIN=${BIN} go-test-coverage --config=./.testcoverage.yml +check-coverage: generate-test-coverage + go-test-coverage --config=./.testcoverage.yml + +.PHONY: test-e2e-coverage-report-ci +test-e2e-coverage-report-ci: ${GO_TEST_COVERAGE} + $(MAKE) test-e2e-coverage-report-no-deps + +.PHONY: test-e2e-coverage-report-no-deps +test-e2e-coverage-report-no-deps: + ${GO_TEST_COVERAGE} --profile=${TEST_COV_DIR}/coverage_e2e.out .PHONY: test-e2e test-e2e: ${KIND} codegen manifests docker-build-e2e-test stern ## Run E2E tests @@ -277,6 +286,13 @@ ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: VERSION := v${GOLANGCI_L ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: | ${BIN} ${go_install_binary} +${GO_TEST_COVERAGE}: ${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION} | ${BIN} + +${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: IMPORT_PATH := github.com/vladopajic/go-test-coverage/v2 +${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: VERSION := v${GO_TEST_COVERAGE_VERSION} +${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: | ${BIN} + GOBIN=${BIN} go install ${IMPORT_PATH}@${VERSION} + ${KIND}: ${KIND}_${KIND_VERSION}_${GOVERSION} | ${BIN} ln -sf $(notdir $<) $@ diff --git a/e2e/go.mod b/e2e/go.mod index 67f8dab65..9e7024d95 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -1,12 +1,12 @@ module github.com/kube-logging/logging-operator/e2e -go 1.23.5 +go 1.24.1 require ( emperror.dev/errors v0.8.1 github.com/MakeNowJust/heredoc v1.0.0 github.com/cisco-open/operator-tools v0.37.0 - github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a + github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 github.com/kube-logging/logging-operator/pkg/sdk v0.11.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 github.com/spf13/cast v1.7.1 @@ -129,10 +129,11 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.32.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.36.0 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 50d7808e5..e1e5427b2 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -223,8 +223,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a h1:ysngvpwv2/SOQX5vgNvFID68Gy3Nnd3MDh1TEWo2oTc= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a/go.mod h1:qEu2mhZL1UI8QsqwqU9YFh08SCkhDlhOw0USZP290Fs= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 h1:eG0FVMywEYiDuCefzJQ65fvIxm0+tBN+5shzzI7q1WQ= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51/go.mod h1:r2qkraCfJgVRoJA5RdWAxrTUjb/tqpFLxzEzwfuFbYM= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= @@ -325,8 +325,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/rubenv/sql-migrate v1.7.1 h1:f/o0WgfO/GqNuVg+6801K/KW3WdDSupzSjDYODmiUq4= github.com/rubenv/sql-migrate v1.7.1/go.mod h1:Ob2Psprc0/3ggbM6wCzyYVFFuc6FyZrb2AS+ezLDFb4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -379,14 +379,16 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= diff --git a/go.mod b/go.mod index ad9faf249..329bc1c65 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kube-logging/logging-operator -go 1.23.5 +go 1.24.1 require ( emperror.dev/errors v0.8.1 @@ -10,7 +10,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/kube-logging/logging-operator/pkg/sdk v0.11.0 github.com/kube-logging/logging-operator/pkg/sdk/logging/model/syslogng/config v0.0.0 - github.com/kube-logging/telemetry-controller v0.0.0-20250130142327-6f7f68dc72f3 + github.com/kube-logging/telemetry-controller v0.0.0-20250303145636-7245b27d7eec github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 github.com/pborman/uuid v1.2.1 @@ -69,7 +69,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nxadm/tail v1.4.8 // indirect - github.com/open-telemetry/opentelemetry-operator v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-operator v0.118.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -80,9 +80,9 @@ require ( github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.24.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.24.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.26.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.26.0 // indirect + go.opentelemetry.io/collector/featuregate v1.26.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect @@ -99,7 +99,7 @@ require ( golang.org/x/text v0.23.0 // indirect golang.org/x/time v0.8.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/go.sum b/go.sum index e0198490d..17b598fd3 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/briandowns/spinner v1.23.1 h1:t5fDPmScwUjozhDj4FA46p5acZWIPXYE30qW2Ptu650= github.com/briandowns/spinner v1.23.1/go.mod h1:LaZeM4wm2Ywy6vO571mvhQNRcWfRUnXOs0RcKV0wYKM= -github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg= -github.com/cert-manager/cert-manager v1.16.2/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0= +github.com/cert-manager/cert-manager v1.16.3 h1:seEF5eidFaeduaCuM85PFEuzH/1X/HOV5Y8zDQrHgpc= +github.com/cert-manager/cert-manager v1.16.3/go.mod h1:6JQ/GAZ6dH+erqS1BbaqorPy8idJzCtWFUmJQBTjo6Q= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cisco-open/k8s-objectmatcher v1.10.0 h1:1TdhMPqVaU+NqECqytAkRF1SFU0QIMqrqbNTnTl933A= @@ -216,8 +216,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-logging/telemetry-controller v0.0.0-20250130142327-6f7f68dc72f3 h1:/DbnkD1FSaJ2xBBop3XGHAtiYc64Vt9t/h7jUSBNS98= -github.com/kube-logging/telemetry-controller v0.0.0-20250130142327-6f7f68dc72f3/go.mod h1:Sn2vv+BYJga3LgkyYcpQ6U5+ZlfOTP8jSd5rDz9j05M= +github.com/kube-logging/telemetry-controller v0.0.0-20250303145636-7245b27d7eec h1:lKKvB90arpmyQGWbAgAEPjwSbLCTYzm2B8M3HKSr8qI= +github.com/kube-logging/telemetry-controller v0.0.0-20250303145636-7245b27d7eec/go.mod h1:jFLiOSxmFaYdmTj/dp38Nop3YwMmKQhsGwgkqfIPExM= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/linode/linodego v1.40.0 h1:7ESY0PwK94hoggoCtIroT1Xk6b1flrFBNZ6KwqbTqlI= @@ -259,8 +259,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= -github.com/open-telemetry/opentelemetry-operator v0.117.0 h1:JN84pdvCk9bH1iIx/LXIsvK+rJbpt/SyNP0Gl7sKPiE= -github.com/open-telemetry/opentelemetry-operator v0.117.0/go.mod h1:MFR3UqDKruKbDABQYXbK7Kl9vVkFSC++65rmB+7HOXA= +github.com/open-telemetry/opentelemetry-operator v0.118.0 h1:IzlJZaWxk0R/aR2XjIi/Tjg12mfxwJ47CN/9Rwfx8O8= +github.com/open-telemetry/opentelemetry-operator v0.118.0/go.mod h1:U6S8fdNCBTzVst/xRwArdiMjSvyKkP7MxWxqGPw5YgQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -326,14 +326,14 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/config/configcompression v1.24.0 h1:jyM6BX7wYcrh+eVSC0FMbWgy/zb9iP58SerOrvisccE= -go.opentelemetry.io/collector/config/configcompression v1.24.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU= -go.opentelemetry.io/collector/config/configopaque v1.24.0 h1:EPOprMDreZPKyIgT0/eVBvEGQVvq7ncvBCBVnWerj54= -go.opentelemetry.io/collector/config/configopaque v1.24.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= +go.opentelemetry.io/collector/config/configcompression v1.26.0 h1:90J6ePTWwZbN6QRPawuGOmJG5H84KB4DzHdbd/kUZM4= +go.opentelemetry.io/collector/config/configcompression v1.26.0/go.mod h1:QwbNpaOl6Me+wd0EdFuEJg0Cc+WR42HNjJtdq4TwE6w= +go.opentelemetry.io/collector/config/configopaque v1.26.0 h1:lM9+fDvr5RWkTupoq8xi7qt0kvXoUX7UFN8D7Wb4zRI= +go.opentelemetry.io/collector/config/configopaque v1.26.0/go.mod h1:GYQiC8IejBcwE8z0O4DwbBR/Hf6U7d8DTf+cszyqwFs= +go.opentelemetry.io/collector/featuregate v1.26.0 h1:NIZdJby6jL9tEHI25ddeUNgc09Q0Fof31YHF1CSVp4Y= +go.opentelemetry.io/collector/featuregate v1.26.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E= @@ -422,16 +422,16 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1: google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/go.work b/go.work index ea9258d59..23fcbadb3 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.5 +go 1.24.1 use ( . diff --git a/images/config-reloader/go.mod b/images/config-reloader/go.mod index 9eb35c923..16f7099d4 100644 --- a/images/config-reloader/go.mod +++ b/images/config-reloader/go.mod @@ -1,6 +1,6 @@ module github.com/banzaicloud/config-reloader -go 1.23.5 +go 1.24.1 require ( github.com/fsnotify/fsnotify v1.8.0 diff --git a/pkg/sdk/go.mod b/pkg/sdk/go.mod index 5114a91a1..c18ceef30 100644 --- a/pkg/sdk/go.mod +++ b/pkg/sdk/go.mod @@ -1,6 +1,6 @@ module github.com/kube-logging/logging-operator/pkg/sdk -go 1.23.5 +go 1.24.1 require ( emperror.dev/errors v0.8.1 @@ -9,7 +9,7 @@ require ( github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 github.com/cisco-open/operator-tools v0.37.0 github.com/go-logr/zapr v1.3.0 - github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a + github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 diff --git a/pkg/sdk/go.sum b/pkg/sdk/go.sum index b1dd448d5..f2e479bd6 100644 --- a/pkg/sdk/go.sum +++ b/pkg/sdk/go.sum @@ -90,8 +90,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a h1:ysngvpwv2/SOQX5vgNvFID68Gy3Nnd3MDh1TEWo2oTc= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a/go.mod h1:qEu2mhZL1UI8QsqwqU9YFh08SCkhDlhOw0USZP290Fs= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 h1:eG0FVMywEYiDuCefzJQ65fvIxm0+tBN+5shzzI7q1WQ= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51/go.mod h1:r2qkraCfJgVRoJA5RdWAxrTUjb/tqpFLxzEzwfuFbYM= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/pkg/sdk/logging/model/syslogng/config/go.mod b/pkg/sdk/logging/model/syslogng/config/go.mod index 76e5aaee7..33ff566ec 100644 --- a/pkg/sdk/logging/model/syslogng/config/go.mod +++ b/pkg/sdk/logging/model/syslogng/config/go.mod @@ -1,6 +1,6 @@ module github.com/kube-logging/logging-operator/pkg/sdk/logging/model/syslogng/config -go 1.23.5 +go 1.24.1 require ( emperror.dev/errors v0.8.1 @@ -37,7 +37,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.11 // indirect - github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a // indirect + github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/pkg/sdk/logging/model/syslogng/config/go.sum b/pkg/sdk/logging/model/syslogng/config/go.sum index 2ca65169a..199669215 100644 --- a/pkg/sdk/logging/model/syslogng/config/go.sum +++ b/pkg/sdk/logging/model/syslogng/config/go.sum @@ -68,8 +68,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a h1:ysngvpwv2/SOQX5vgNvFID68Gy3Nnd3MDh1TEWo2oTc= -github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a/go.mod h1:qEu2mhZL1UI8QsqwqU9YFh08SCkhDlhOw0USZP290Fs= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51 h1:eG0FVMywEYiDuCefzJQ65fvIxm0+tBN+5shzzI7q1WQ= +github.com/kube-logging/logging-operator v0.0.0-20250304164135-9ab3bc475e51/go.mod h1:r2qkraCfJgVRoJA5RdWAxrTUjb/tqpFLxzEzwfuFbYM= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/renovate.json b/renovate.json index 3265d6272..3f063d9a1 100644 --- a/renovate.json +++ b/renovate.json @@ -9,7 +9,7 @@ ], "configMigration": true, "constraints": { - "go": "1.23" + "go": "1.24" }, "customManagers": [ {