Skip to content

Commit 5d732d9

Browse files
csatib02csatib02
authored
Merge pull request #1931 from kube-logging/renovate/all
2 parents b74d01d + cd1ea27 commit 5d732d9

File tree

11 files changed

+93
-96
lines changed

11 files changed

+93
-96
lines changed

‎.github/workflows/artifacts.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
retention-days: 5
227227

228228
- name: Upload Trivy scan results to GitHub Security tab
229-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
229+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
230230
with:
231231
sarif_file: trivy-results.sarif
232232

@@ -382,7 +382,7 @@ jobs:
382382
retention-days: 5
383383

384384
- name: Upload Trivy scan results to GitHub Security tab
385-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
385+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
386386
with:
387387
sarif_file: trivy-results.sarif
388388

@@ -506,6 +506,6 @@ jobs:
506506
retention-days: 5
507507

508508
- name: Upload Trivy scan results to GitHub Security tab
509-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
509+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
510510
with:
511511
sarif_file: trivy-results.sarif

‎.github/workflows/dependency-images.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
retention-days: 5
153153

154154
- name: Upload Trivy scan results to GitHub Security tab
155-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
155+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
156156
with:
157157
sarif_file: trivy-results.sarif
158158

@@ -397,6 +397,6 @@ jobs:
397397
retention-days: 5
398398

399399
- name: Upload Trivy scan results to GitHub Security tab
400-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
400+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
401401
with:
402402
sarif_file: trivy-results.sarif

‎e2e/go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module github.com/kube-logging/logging-operator/e2e
22

3-
go 1.23.3
4-
5-
toolchain go1.23.5
3+
go 1.23.5
64

75
require (
86
emperror.dev/errors v0.8.1
97
github.com/MakeNowJust/heredoc v1.0.0
108
github.com/cisco-open/operator-tools v0.37.0
11-
github.com/kube-logging/logging-operator v0.0.0-20250127152226-1410004007d0
9+
github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a
1210
github.com/kube-logging/logging-operator/pkg/sdk v0.11.0
13-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2
11+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0
1412
github.com/spf13/cast v1.7.1
1513
github.com/stretchr/testify v1.10.0
1614
helm.sh/helm/v3 v3.17.0

‎e2e/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
223223
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
224224
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
225225
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
226-
github.com/kube-logging/logging-operator v0.0.0-20250127152226-1410004007d0 h1:09U7NGWAeHpWHBFEFOajNFDaIUL49umVf9UI/es/FYA=
227-
github.com/kube-logging/logging-operator v0.0.0-20250127152226-1410004007d0/go.mod h1:hysDmZjN72nKAsBZ+hF3Vutw9BE1xM7Zd1iEycDFiRs=
226+
github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a h1:ysngvpwv2/SOQX5vgNvFID68Gy3Nnd3MDh1TEWo2oTc=
227+
github.com/kube-logging/logging-operator v0.0.0-20250204114012-5c5cda7a590a/go.mod h1:qEu2mhZL1UI8QsqwqU9YFh08SCkhDlhOw0USZP290Fs=
228228
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
229229
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
230230
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
@@ -305,8 +305,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
305305
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
306306
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
307307
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
308-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 h1:DGv150w4UyxnjNHlkCw85R3+lspOxegtdnbpP2vKRrk=
309-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2/go.mod h1:AVMP4QEW8xuGWnxaWSpI3kKjP9fDA31nO68zsyREJZA=
308+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0 h1:ckSycH7xHtpcvXsmEY/qEziRhDQKqKqbsHi9kX/BO7A=
309+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0/go.mod h1:6x4x0t9BP35g4XcjkHE9EB3RxhyfxpdpmZKd/Qyk8+M=
310310
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
311311
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
312312
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

‎e2e/logging_metrics_monitoring/logging_metrics_monitoring_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func waitForPodReady(ctx context.Context, c client.Client, pod *corev1.Pod) erro
289289
}))
290290
}
291291

292-
func checkServiceMonitorAvailability(serviceMonitors []*v1.ServiceMonitor) error {
292+
func checkServiceMonitorAvailability(serviceMonitors []v1.ServiceMonitor) error {
293293
if len(serviceMonitors) == 0 {
294294
return errors.New("no service monitors found")
295295
}

‎go.mod

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/go-logr/logr v1.4.2
1111
github.com/kube-logging/logging-operator/pkg/sdk v0.11.0
1212
github.com/kube-logging/logging-operator/pkg/sdk/logging/model/syslogng/config v0.0.0
13-
github.com/kube-logging/telemetry-controller v0.0.0-20250129125440-fa099a8e0d23
13+
github.com/kube-logging/telemetry-controller v0.0.0-20250130142327-6f7f68dc72f3
1414
github.com/onsi/ginkgo v1.16.5
1515
github.com/onsi/gomega v1.36.2
1616
github.com/pborman/uuid v1.2.1
17-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2
17+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0
1818
github.com/prometheus/client_golang v1.20.5
1919
github.com/siliconbrain/go-seqs v0.14.0
2020
github.com/spf13/cast v1.7.1
@@ -69,7 +69,7 @@ require (
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7171
github.com/nxadm/tail v1.4.8 // indirect
72-
github.com/open-telemetry/opentelemetry-operator v0.115.0 // indirect
72+
github.com/open-telemetry/opentelemetry-operator v0.117.0 // indirect
7373
github.com/pkg/errors v0.9.1 // indirect
7474
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7575
github.com/prometheus/client_model v0.6.1 // indirect
@@ -79,15 +79,16 @@ require (
7979
github.com/spf13/pflag v1.0.5 // indirect
8080
github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
8181
github.com/x448/float16 v0.8.4 // indirect
82-
go.opentelemetry.io/collector/config/configcompression v1.21.0 // indirect
83-
go.opentelemetry.io/collector/config/configopaque v1.21.0 // indirect
84-
go.opentelemetry.io/collector/featuregate v1.21.0 // indirect
85-
go.opentelemetry.io/otel v1.32.0 // indirect
86-
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
87-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
88-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
89-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
82+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
83+
go.opentelemetry.io/collector/config/configcompression v1.24.0 // indirect
84+
go.opentelemetry.io/collector/config/configopaque v1.24.0 // indirect
85+
go.opentelemetry.io/collector/featuregate v1.24.0 // indirect
86+
go.opentelemetry.io/otel v1.34.0 // indirect
87+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
88+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
89+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
90+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
91+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
9192
go.uber.org/multierr v1.11.0 // indirect
9293
go.uber.org/zap v1.27.0 // indirect
9394
golang.org/x/net v0.34.0 // indirect
@@ -98,7 +99,7 @@ require (
9899
golang.org/x/text v0.21.0 // indirect
99100
golang.org/x/time v0.8.0 // indirect
100101
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
101-
google.golang.org/protobuf v1.36.1 // indirect
102+
google.golang.org/protobuf v1.36.3 // indirect
102103
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103104
gopkg.in/inf.v0 v0.9.1 // indirect
104105
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

0 commit comments

Comments
 (0)