Skip to content

Commit bcf147d

Browse files
hdabrowskiGitHub Enterprise
authored andcommitted
Merge pull request #138 from Conjur-Enterprise/CNJR-13645
CNJR-13645: Remove unused grpc module, upgrade otel/sdk
2 parents 0696c2d + 8d009a8 commit bcf147d

4 files changed

Lines changed: 6 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1616

1717
### Security
1818
- Upgrade golang to 1.26 to address CVE-2026-22184 (CNJR-13301)
19+
- Upgrade otel to 1.43 to address CVE-2026-39883 and CVE-2026-39882. CNJR-13645
1920

2021
## [1.9.0] - 2026-03-09
2122

deploy/test/test_cases/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if ! command -v helm >/dev/null 2>&1; then
115115
echo "ERROR: helm not found in PATH; cannot build chart dependencies" >&2
116116
exit 1
117117
fi
118-
helm repo add stakater https://stakater.github.io/stakater-charts 2>/dev/null || true
118+
helm repo add stakater https://stakater.github.io/stakater-charts || true
119119
helm repo update
120120
helm dependency build "${_REPO_ROOT}/helm/secrets-provider"
121121

go.mod

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ require (
8686
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
8787
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0 // indirect
8888
go.opentelemetry.io/otel/metric v1.43.0 // indirect
89-
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
89+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
9090
go.opentelemetry.io/otel/trace v1.43.0 // indirect
9191
go.yaml.in/yaml/v2 v2.4.4 // indirect
9292
go.yaml.in/yaml/v3 v3.0.4 // indirect
9393
golang.org/x/net v0.52.0 // indirect
9494
golang.org/x/oauth2 v0.36.0 // indirect
95-
golang.org/x/sys v0.42.0 // indirect
95+
golang.org/x/sys v0.43.0 // indirect
9696
golang.org/x/term v0.41.0 // indirect
9797
golang.org/x/text v0.35.0 // indirect
9898
golang.org/x/time v0.15.0 // indirect
@@ -123,7 +123,3 @@ replace github.com/cyberark/conjur-opentelemetry-tracer => github.com/cyberark/c
123123
// so we don't downgrade future versions unintentionally.
124124

125125
exclude github.com/emicklei/go-restful v2.9.5+incompatible
126-
127-
replace google.golang.org/grpc v1.65.0 => google.golang.org/grpc v1.79.3
128-
129-
replace go.opentelemetry.io/otel/sdk v1.42.0 => go.opentelemetry.io/otel/sdk v1.43.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
210210
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
211211
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
212212
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
213-
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
214-
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
213+
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
214+
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
215215
golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
216216
golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
217217
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=

0 commit comments

Comments
 (0)