Skip to content

Commit 2f70270

Browse files
gmlexxgmlexx
authored
chore: vendor opentelemetry types and events recordign to bump kcm to 1.8.0 (#846)
1 parent 9bb035b commit 2f70270

13 files changed

Lines changed: 1432 additions & 92 deletions

File tree

‎kof-operator/cmd/main.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,14 @@ func main() {
178178
httpServer.Router.NotFound(handlers.NotFoundHandler)
179179
setupLog.Info(fmt.Sprintf("Starting http server on :%s", httpServerPort))
180180
var wg sync.WaitGroup
181-
wg.Add(1)
182-
go func() {
183-
defer wg.Done()
181+
wg.Go(func() {
184182
if err := httpServer.Run(); err != nil {
185183
if err != http.ErrServerClosed {
186184
setupLog.Error(err, "Error starting http server")
187185
os.Exit(1)
188186
}
189187
}
190-
}()
188+
})
191189

192190
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
193191
// More info:
@@ -237,7 +235,7 @@ func main() {
237235
os.Exit(1)
238236
}
239237

240-
record.InitFromRecorder(mgr.GetEventRecorderFor("kof-operator"))
238+
record.InitFromRecorder(mgr.GetEventRecorder("kof-operator"))
241239

242240
if err = (&controller.PromxyServerGroupReconciler{
243241
Client: mgr.GetClient(),

‎kof-operator/go.mod‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,15 @@ module github.com/k0rdent/kof/kof-operator
33
go 1.26
44

55
require (
6-
// Pinning `go get github.com/K0rdent/kcm@v1.7.0`
7-
// and `go get sigs.k8s.io/controller-runtime@v0.22.5`
8-
// to avoid `not enough arguments in call to ctrl.NewWebhookManagedBy`
9-
// in opentelemetry-operator@v0.143.0 until the fix is released for this issue:
10-
// https://github.com/open-telemetry/opentelemetry-operator/issues/4756
11-
github.com/K0rdent/kcm v1.7.0
6+
github.com/K0rdent/kcm v1.8.0
127
github.com/VictoriaMetrics/operator/api v0.66.1
138
github.com/coreos/go-oidc/v3 v3.17.0
14-
github.com/fluxcd/source-controller/api v1.7.4
9+
github.com/fluxcd/source-controller/api v1.8.0
1510
github.com/go-jose/go-jose/v4 v4.1.3
1611
github.com/go-logr/logr v1.4.3
1712
github.com/grafana/grafana-operator/v5 v5.18.0
1813
github.com/onsi/ginkgo/v2 v2.28.1
1914
github.com/onsi/gomega v1.39.1
20-
github.com/open-telemetry/opentelemetry-operator v0.143.0
2115
github.com/projectsveltos/addon-controller v1.1.1
2216
github.com/projectsveltos/libsveltos v1.1.1
2317
github.com/prometheus-community/prom-label-proxy v0.12.1
@@ -33,7 +27,7 @@ require (
3327
k8s.io/client-go v0.35.1
3428
k8s.io/metrics v0.33.3
3529
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
36-
sigs.k8s.io/controller-runtime v0.22.5
30+
sigs.k8s.io/controller-runtime v0.23.1
3731
sigs.k8s.io/yaml v1.6.0
3832
)
3933

@@ -50,7 +44,6 @@ require (
5044
cloud.google.com/go/auth v0.17.0 // indirect
5145
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
5246
cloud.google.com/go/compute/metadata v0.9.0 // indirect
53-
dario.cat/mergo v1.0.2 // indirect
5447
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
5548
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 // indirect
5649
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
@@ -92,7 +85,7 @@ require (
9285
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
9386
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
9487
github.com/felixge/httpsnoop v1.0.4 // indirect
95-
github.com/fluxcd/helm-controller/api v1.4.5 // indirect
88+
github.com/fluxcd/helm-controller/api v1.5.0 // indirect
9689
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
9790
github.com/fluxcd/pkg/apis/kustomize v1.15.0 // indirect
9891
github.com/fluxcd/pkg/apis/meta v1.25.0 // indirect
@@ -149,7 +142,6 @@ require (
149142
github.com/knadh/koanf/v2 v2.3.0 // indirect
150143
github.com/kylelemons/godebug v1.1.0 // indirect
151144
github.com/mitchellh/copystructure v1.2.0 // indirect
152-
github.com/mitchellh/mapstructure v1.5.0 // indirect
153145
github.com/mitchellh/reflectwalk v1.0.2 // indirect
154146
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
155147
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
@@ -196,24 +188,11 @@ require (
196188
go.opentelemetry.io/collector/semconv v0.128.0 // indirect
197189
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
198190
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
199-
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
200191
go.opentelemetry.io/otel v1.40.0 // indirect
201-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
202-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
203-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
204-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0 // indirect
205192
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
206193
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
207-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
208-
go.opentelemetry.io/otel/exporters/prometheus v0.61.0 // indirect
209-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
210-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
211-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
212-
go.opentelemetry.io/otel/log v0.14.0 // indirect
213194
go.opentelemetry.io/otel/metric v1.40.0 // indirect
214195
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
215-
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
216-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
217196
go.opentelemetry.io/otel/trace v1.40.0 // indirect
218197
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
219198
go.uber.org/atomic v1.11.0 // indirect

‎kof-operator/go.sum‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIi
66
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
77
cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
88
cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
9-
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
10-
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
119
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 h1:5YTBM8QDVIBN3sxBil89WfdAAqDZbyJTgh688DSxX5w=
1210
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=
1311
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 h1:KpMC6LFL7mqpExyMC9jVOYRiVhLmamjeZfRsUpB7l4s=
@@ -27,8 +25,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0/go.mod h1:HKpQ
2725
github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU=
2826
github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4=
2927
github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
30-
github.com/K0rdent/kcm v1.7.0 h1:46JR0Ns3hY4A2+hcvsYzaJZFZJXOZuJMiBDSWM7zwmU=
31-
github.com/K0rdent/kcm v1.7.0/go.mod h1:YAUT0Kwo5Y+6JUrUSui/uoCsbxXjyfMjG58Ovbi5Jd8=
28+
github.com/K0rdent/kcm v1.8.0 h1:A6CLTTwNVcIU8NoobQnjHev9r8igp0GZz14ld9jqbeI=
29+
github.com/K0rdent/kcm v1.8.0/go.mod h1:ORKB5KBil3Wc5GvDxTDpLB7lXw7MlNGhv8ql44MDRVM=
3230
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
3331
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
3432
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
@@ -101,8 +99,6 @@ github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/
10199
github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
102100
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
103101
github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
104-
github.com/cert-manager/cert-manager v1.19.2 h1:jSprN1h5pgNDSl7HClAmIzXuTxic/5FXJ32kbQHqjlM=
105-
github.com/cert-manager/cert-manager v1.19.2/go.mod h1:e9NzLtOKxTw7y99qLyWGmPo6mrC1Nh0EKKcMkRfK+GE=
106102
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
107103
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
108104
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -152,16 +148,16 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
152148
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
153149
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
154150
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
155-
github.com/fluxcd/helm-controller/api v1.4.5 h1:hMEBtgXUbJjp+ah0jPI3OOQNVngoToOQvTgFgVpAjNg=
156-
github.com/fluxcd/helm-controller/api v1.4.5/go.mod h1:rCgx3qhjjtoIH+1EbzFC2vN71/pp0PgMDrZnGCZX5XY=
151+
github.com/fluxcd/helm-controller/api v1.5.0 h1:M82IuZxDiwTinwq9ASBQ4VjPP0dPJwW576GZZk3mqdY=
152+
github.com/fluxcd/helm-controller/api v1.5.0/go.mod h1:Yr0y7GKizbvQQGK5wBX6sGCZrTY86AN9n1PNEsji2XE=
157153
github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA=
158154
github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4=
159155
github.com/fluxcd/pkg/apis/kustomize v1.15.0 h1:p8wPIxdmn0vy0a664rsE9JKCfnliZz4HUsDcTy4ZOxA=
160156
github.com/fluxcd/pkg/apis/kustomize v1.15.0/go.mod h1:XWdsx8P15OiMaQIvmUjYWdmD3zAwhl5q9osl5iCqcOk=
161157
github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/eay3eA=
162158
github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc=
163-
github.com/fluxcd/source-controller/api v1.7.4 h1:+EOVnRA9LmLxOx7J273l7IOEU39m+Slt/nQGBy69ygs=
164-
github.com/fluxcd/source-controller/api v1.7.4/go.mod h1:ruf49LEgZRBfcP+eshl2n9SX1MfHayCcViAIGnZcaDY=
159+
github.com/fluxcd/source-controller/api v1.8.0 h1:ndrYmcv6ZMcdQHFSUkOrFVDO7h16SfDBSw/DOqf/LPo=
160+
github.com/fluxcd/source-controller/api v1.8.0/go.mod h1:1O7+sMbqc1+3tPvjmtgFz+bASTl794Y9SxpebHDDSGA=
165161
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
166162
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
167163
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
@@ -411,16 +407,10 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0
411407
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0/go.mod h1:VfA8xHz4xg7Fyj5bBsCDbOO3iVYzDn9wP/QFsjcAE5c=
412408
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.139.0 h1:iRNX/ueuad1psOVgnNkxuQmXxvF3ze5ZZCP66xKFk/w=
413409
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.139.0/go.mod h1:bW09lo3WgHsPsZ1mgsJvby9wCefT5o13patM5phdfIU=
414-
github.com/open-telemetry/opentelemetry-operator v0.143.0 h1:2W+w0e2vNND5UjStwaf3HICXCB05azOktJzSvaGtygY=
415-
github.com/open-telemetry/opentelemetry-operator v0.143.0/go.mod h1:w583C16bYbJp8rMwppCwb2lwYq1LOkNzgD6nN3vl8s4=
416410
github.com/opencontainers/go-digest v1.0.1-0.20250116041648-1e56c6daea3b h1:0XWQwEHfTQ7zrjFjaOnKrU8z9UVdv1A4uGU39phmwNI=
417411
github.com/opencontainers/go-digest v1.0.1-0.20250116041648-1e56c6daea3b/go.mod h1:RqnyioA3pIEZMkSbOIcrw32YSgETfn/VrLuEikEdPNU=
418412
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
419413
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
420-
github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad h1:MiZEukiPd7ll8BQDwBfc3LKBxbqyeXIx+wl4CzVj5EQ=
421-
github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
422-
github.com/operator-framework/operator-lib v0.19.0 h1:az6ogYj21rtU0SF9uYctRLyKp2dtlqTsmpfehFy6Ce8=
423-
github.com/operator-framework/operator-lib v0.19.0/go.mod h1:KxycAjFnHt0DBtHmH3Jm7yHcY5sdrshPKTqM/HKAQ08=
424414
github.com/ovh/go-ovh v1.9.0 h1:6K8VoL3BYjVV3In9tPJUdT7qMx9h0GExN9EXx1r2kKE=
425415
github.com/ovh/go-ovh v1.9.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c=
426416
github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
@@ -576,42 +566,16 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.
576566
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0/go.mod h1:rjbQTDEPQymPE0YnRQp9/NuPwwtL0sesz/fnqRW/v84=
577567
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
578568
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
579-
go.opentelemetry.io/contrib/otelconf v0.18.0 h1:ciF2Gf00BWs0DnexKFZXcxg9kJ8r3SUW1LOzW3CsKA8=
580-
go.opentelemetry.io/contrib/otelconf v0.18.0/go.mod h1:FcP7k+JLwBLdOxS6qY6VQ/4b5VBntI6L6o80IMwhAeI=
581569
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
582570
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
583-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 h1:OMqPldHt79PqWKOMYIAQs3CxAi7RLgPxwfFSwr4ZxtM=
584-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0/go.mod h1:1biG4qiqTxKiUCtoWDPpL3fB3KxVwCiGw81j3nKMuHE=
585-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 h1:QQqYw3lkrzwVsoEX0w//EhH/TCnpRdEenKBOOEIMjWc=
586-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0/go.mod h1:gSVQcr17jk2ig4jqJ2DX30IdWH251JcNAecvrqTxH1s=
587-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 h1:vl9obrcoWVKp/lwl8tRE33853I8Xru9HFbw/skNeLs8=
588-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0/go.mod h1:GAXRxmLJcVM3u22IjTg74zWBrRCKq8BnOqUVLodpcpw=
589-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0 h1:nKP4Z2ejtHn3yShBb+2KawiXgpn8In5cT7aO2wXuOTE=
590-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0/go.mod h1:NwjeBbNigsO4Aj9WgM0C+cKIrxsZUaRmZUO7A8I7u8o=
591571
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
592572
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
593573
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54=
594574
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=
595-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
596-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
597-
go.opentelemetry.io/otel/exporters/prometheus v0.61.0 h1:cCyZS4dr67d30uDyh8etKM2QyDsQ4zC9ds3bdbrVoD0=
598-
go.opentelemetry.io/otel/exporters/prometheus v0.61.0/go.mod h1:iivMuj3xpR2DkUrUya3TPS/Z9h3dz7h01GxU+fQBRNg=
599-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 h1:B/g+qde6Mkzxbry5ZZag0l7QrQBCtVm7lVjaLgmpje8=
600-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0/go.mod h1:mOJK8eMmgW6ocDJn6Bn11CcZ05gi3P8GylBXEkZtbgA=
601-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 h1:wm/Q0GAAykXv83wzcKzGGqAnnfLFyFe7RslekZuv+VI=
602-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0/go.mod h1:ra3Pa40+oKjvYh+ZD3EdxFZZB0xdMfuileHAm4nNN7w=
603-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/hPp3O7LCGLcHXFlvS2/FFOrwL+SE=
604-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE=
605-
go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM=
606-
go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno=
607575
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
608576
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
609577
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
610578
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
611-
go.opentelemetry.io/otel/sdk/log v0.14.0 h1:JU/U3O7N6fsAXj0+CXz21Czg532dW2V4gG1HE/e8Zrg=
612-
go.opentelemetry.io/otel/sdk/log v0.14.0/go.mod h1:imQvII+0ZylXfKU7/wtOND8Hn4OpT3YUoIgqJVksUkM=
613-
go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM=
614-
go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA=
615579
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
616580
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
617581
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
@@ -753,8 +717,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 h1:qPrZsv1cwQiFe
753717
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
754718
sigs.k8s.io/cluster-api v1.12.3 h1:cuOl3fWXhlXFuQcyIH4C8i3ns8rLhtcnK+x00MVdKBs=
755719
sigs.k8s.io/cluster-api v1.12.3/go.mod h1:EAiTJtf/8M5eBetPwumi6t8DJJ55Ln6Fkvh2OAa7PD4=
756-
sigs.k8s.io/controller-runtime v0.22.5 h1:v3nfSUMowX/2WMp27J9slwGFyAt7IV0YwBxAkrUr0GE=
757-
sigs.k8s.io/controller-runtime v0.22.5/go.mod h1:pc5SoYWnWI6I+cBHYYdZ7B6YHZVY5xNfll88JB+vniI=
720+
sigs.k8s.io/controller-runtime v0.23.1 h1:TjJSM80Nf43Mg21+RCy3J70aj/W6KyvDtOlpKf+PupE=
721+
sigs.k8s.io/controller-runtime v0.23.1/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
758722
sigs.k8s.io/gateway-api v1.4.0 h1:ZwlNM6zOHq0h3WUX2gfByPs2yAEsy/EenYJB78jpQfQ=
759723
sigs.k8s.io/gateway-api v1.4.0/go.mod h1:AR5RSqciWP98OPckEjOjh2XJhAe2Na4LHyXD2FUY7Qk=
760724
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

‎kof-operator/internal/controller/record/recorder.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,40 @@ import (
2121
"golang.org/x/text/language"
2222
corev1 "k8s.io/api/core/v1"
2323
"k8s.io/apimachinery/pkg/runtime"
24-
"k8s.io/client-go/tools/record"
24+
"k8s.io/client-go/tools/events"
2525
)
2626

2727
var (
2828
initOnce sync.Once
29-
DefaultRecorder record.EventRecorder
29+
DefaultRecorder events.EventRecorder
3030
)
3131

3232
// InitFromRecorder initializes the global default recorder. It can only be called once.
3333
// Subsequent calls are considered noops.
34-
func InitFromRecorder(recorder record.EventRecorder) {
34+
func InitFromRecorder(recorder events.EventRecorder) {
3535
initOnce.Do(func() {
3636
DefaultRecorder = recorder
3737
})
3838
}
3939

4040
// Event constructs an event from the given information and puts it in the queue for sending.
41-
func Event(object runtime.Object, annotations map[string]string, reason, message string) {
42-
DefaultRecorder.AnnotatedEventf(object, annotations, corev1.EventTypeNormal, title(reason), message)
41+
func Event(object runtime.Object, _ map[string]string, reason, message string) {
42+
DefaultRecorder.Eventf(object, nil, corev1.EventTypeNormal, title(reason), title(reason), message)
4343
}
4444

4545
// Eventf is just like Event, but with Sprintf for the message field.
46-
func Eventf(object runtime.Object, annotations map[string]string, reason, message string, args ...any) {
47-
DefaultRecorder.AnnotatedEventf(object, annotations, corev1.EventTypeNormal, title(reason), message, args...)
46+
func Eventf(object runtime.Object, _ map[string]string, reason, message string, args ...any) {
47+
DefaultRecorder.Eventf(object, nil, corev1.EventTypeNormal, title(reason), title(reason), message, args...)
4848
}
4949

5050
// Warn constructs a warning event from the given information and puts it in the queue for sending.
51-
func Warn(object runtime.Object, annotations map[string]string, reason, message string) {
52-
DefaultRecorder.AnnotatedEventf(object, annotations, corev1.EventTypeWarning, title(reason), message)
51+
func Warn(object runtime.Object, _ map[string]string, reason, message string) {
52+
DefaultRecorder.Eventf(object, nil, corev1.EventTypeWarning, title(reason), title(reason), message)
5353
}
5454

5555
// Warnf is just like Warn, but with Sprintf for the message field.
56-
func Warnf(object runtime.Object, annotations map[string]string, reason, message string, args ...any) {
57-
DefaultRecorder.AnnotatedEventf(object, annotations, corev1.EventTypeWarning, title(reason), message, args...)
56+
func Warnf(object runtime.Object, _ map[string]string, reason, message string, args ...any) {
57+
DefaultRecorder.Eventf(object, nil, corev1.EventTypeWarning, title(reason), title(reason), message, args...)
5858
}
5959

6060
// title returns a copy of the string source with all Unicode letters that begin words

0 commit comments

Comments
 (0)