Skip to content

Commit f6dba55

Browse files
authored
Merge branch 'main' into bump-base-instrumentation-mem-limit
2 parents c31f47c + 5cab636 commit f6dba55

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ require (
7575
github.com/bytedance/sonic v1.11.6 // indirect
7676
github.com/bytedance/sonic/loader v0.1.1 // indirect
7777
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
78-
github.com/cert-manager/cert-manager v1.16.1
78+
github.com/cert-manager/cert-manager v1.16.2
7979
github.com/cloudwego/base64x v0.1.4 // indirect
8080
github.com/cloudwego/iasm v0.2.0 // indirect
8181
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4
103103
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
104104
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
105105
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
106-
github.com/cert-manager/cert-manager v1.16.1 h1:1ceFMqTtwiqY2vyfaRT85CNiVmK7pJjt3GebYCx9awY=
107-
github.com/cert-manager/cert-manager v1.16.1/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
106+
github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg=
107+
github.com/cert-manager/cert-manager v1.16.2/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
108108
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
109109
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
110110
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

tests/e2e-openshift/multi-cluster/04-assert.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ metadata:
44
name: generate-traces-http
55
namespace: chainsaw-multi-cluster-send
66
status:
7-
conditions:
8-
- status: "True"
9-
type: Complete
7+
succeeded: 1
108

119
---
1210
apiVersion: batch/v1
@@ -15,6 +13,4 @@ metadata:
1513
name: generate-traces-grpc
1614
namespace: chainsaw-multi-cluster-send
1715
status:
18-
conditions:
19-
- status: "True"
20-
type: Complete
16+
succeeded: 1

0 commit comments

Comments
 (0)