Skip to content

Commit f3bd1a8

Browse files
authored
Merge branch 'main' into ci/agent-image-relock-workflow
2 parents 8bb77be + 0b71069 commit f3bd1a8

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This Code of Conduct applies within all community spaces, and also applies when
3737

3838
## Enforcement
3939

40-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at jannes@aqora.io. All complaints will be reviewed and investigated promptly and fairly.
40+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at jannes@paperclip.inc. All complaints will be reviewed and investigated promptly and fairly.
4141

4242
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
4343

GOVERNANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Maintainers may step down at any time by sending a PR to `MAINTAINERS.md`. Maint
2323

2424
## Code of Conduct
2525

26-
All participants are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md). Reports go to `jannes@aqora.io`.
26+
All participants are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md). Reports go to `jannes@paperclip.inc`.
2727

2828
## Security
2929

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Reporting
44

5-
Use [GitHub's private vulnerability reporting](https://github.com/paperclipinc/hermes-operator/security/advisories/new): this routes a private advisory to the maintainers and is the preferred path. As a fallback, email **jannes@aqora.io** with subject "SECURITY: hermes-operator".
5+
Use [GitHub's private vulnerability reporting](https://github.com/paperclipinc/hermes-operator/security/advisories/new): this routes a private advisory to the maintainers and is the preferred path. As a fallback, email **jannes@paperclip.inc** with subject "SECURITY: hermes-operator".
66

77
We aim to acknowledge within 72 hours and provide a remediation timeline within 7 days.
88

bundle/manifests/hermes-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ spec:
214214
- python
215215
maintainers:
216216
- name: Jannes Stubbemann
217-
email: jannes@aqora.io
217+
email: jannes@paperclip.inc
218218
provider:
219219
name: paperclipinc
220220
url: https://github.com/paperclipinc/hermes-operator

charts/hermes-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ sources:
1010
- https://github.com/paperclipinc/hermes-operator
1111
maintainers:
1212
- name: paperclipinc
13-
email: jannes@aqora.io
13+
email: jannes@paperclip.inc

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ require (
6969
github.com/x448/float16 v0.8.4 // indirect
7070
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
7171
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
72-
go.opentelemetry.io/otel v1.41.0 // indirect
72+
go.opentelemetry.io/otel v1.43.0 // indirect
7373
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
7474
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
75-
go.opentelemetry.io/otel/metric v1.41.0 // indirect
76-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
77-
go.opentelemetry.io/otel/trace v1.41.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
76+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
7878
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
7979
go.uber.org/multierr v1.11.0 // indirect
8080
go.uber.org/zap v1.27.1 // indirect

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,20 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
171171
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
172172
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8=
173173
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0=
174-
go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c=
175-
go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE=
174+
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
175+
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
176176
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs=
177177
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0/go.mod h1:bTdK1nhqF76qiPoCCdyFIV+N/sRHYXYCTQc+3VCi3MI=
178178
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 h1:DvJDOPmSWQHWywQS6lKL+pb8s3gBLOZUtw4N+mavW1I=
179179
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0/go.mod h1:EtekO9DEJb4/jRyN4v4Qjc2yA7AtfCBuz2FynRUWTXs=
180-
go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ=
181-
go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps=
182-
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
183-
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
184-
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
185-
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
186-
go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0=
187-
go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis=
180+
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
181+
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
182+
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
183+
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
184+
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
185+
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
186+
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
187+
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
188188
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
189189
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
190190
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

0 commit comments

Comments
 (0)