From fdcde3bfd85ccb12fef1eff015eae8e0dfacc3e7 Mon Sep 17 00:00:00 2001 From: Friedrich Date: Thu, 5 Sep 2024 13:48:42 +0200 Subject: [PATCH 01/21] chore: bump dependencies (#616) * bump docker builder image to golang:1.23.0-alpine3.20 * bump go version --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 646d7fa9..60fd017e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.22.6-alpine AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.0-alpine3.20 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 3860d243..4e9677fb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/eventing-manager -go 1.22.6 +go 1.23.0 require ( github.com/avast/retry-go/v3 v3.1.1 From a07c25ba9043da76f9f8b3839a748fb00cf301b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:00:42 +0200 Subject: [PATCH 02/21] deps(dependabot): bump github.com/nats-io/nats-server/v2 (#622) Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.18 to 2.10.20. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.18...v2.10.20) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 4e9677fb..c5f747f4 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/kyma-project/kyma/common/logging v0.0.0-20240729075006-50d76505df8c github.com/kyma-project/nats-manager v1.0.3-0.20231219150808-13159cfea47c github.com/mitchellh/hashstructure/v2 v2.0.2 - github.com/nats-io/nats-server/v2 v2.10.18 + github.com/nats-io/nats-server/v2 v2.10.20 github.com/nats-io/nats.go v1.36.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.1 @@ -93,15 +93,15 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/term v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.23.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect diff --git a/go.sum b/go.sum index 42969358..31d1e360 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE= github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM= -github.com/nats-io/nats-server/v2 v2.10.18/go.mod h1:97Qyg7YydD8blKlR8yBsUlPlWyZKjA7Bp5cl3MUE9K8= +github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI= +github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= github.com/nats-io/nats.go v1.36.0 h1:suEUPuWzTSse/XhESwqLxXGuj8vGRuPRoG7MoRN/qyU= github.com/nats-io/nats.go v1.36.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -358,8 +358,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -453,8 +453,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -499,24 +499,24 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= From 805c1ae43ee2d93a75d6c6a397bb4d9f4da1720d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:34:43 +0200 Subject: [PATCH 03/21] deps(dependabot): bump github.com/prometheus/client_golang (#624) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.1 to 1.20.2. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.1...v1.20.2) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c5f747f4..d4d06a90 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.20.1 + github.com/prometheus/client_golang v1.20.2 github.com/stretchr/testify v1.9.0 github.com/vektra/mockery/v2 v2.45.0 go.uber.org/atomic v1.11.0 diff --git a/go.sum b/go.sum index 31d1e360..873b17fe 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8= -github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= From d07ad6870d5da55bfaec9c74d07cbccb55ad5ae4 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Tue, 17 Sep 2024 10:21:17 +0200 Subject: [PATCH 04/21] fix: bump golint version to fix failing job (#638) * bump golint version * bump golint version * fix lint issues * updated * updated * updated * updated --- .github/workflows/lint-go.yml | 2 +- .golangci.yaml | 1 + Makefile | 2 +- hack/e2e/common/fixtures/fixtures.go | 2 +- .../eventing/subscription/jetstream/reconciler.go | 4 ++-- .../validation/integration_test.go | 4 ++-- pkg/ems/api/events/client/client.go | 2 +- pkg/eventing/utils.go | 6 +++--- pkg/tracing/tracing.go | 1 + pkg/tracing/tracing_test.go | 1 + test/utils/utils.go | 2 +- testing/test_helpers.go | 14 +++++++------- 12 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml index 24b7f117..a6fc9e25 100644 --- a/.github/workflows/lint-go.yml +++ b/.github/workflows/lint-go.yml @@ -40,4 +40,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6.1.0 with: - version: v1.57 + version: v1.60.1 diff --git a/.golangci.yaml b/.golangci.yaml index 7d92e801..eedac303 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -28,6 +28,7 @@ linters: - paralleltest - copyloopvar - perfsprint + - gomnd linters-settings: stylecheck: diff --git a/Makefile b/Makefile index 64f41aab..ab3b5112 100644 --- a/Makefile +++ b/Makefile @@ -204,7 +204,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v5.0.0 CONTROLLER_TOOLS_VERSION ?= v0.16.1 -GOLANG_CI_LINT_VERSION ?= v1.57 +GOLANG_CI_LINT_VERSION ?= v1.60.1 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/hack/e2e/common/fixtures/fixtures.go b/hack/e2e/common/fixtures/fixtures.go index 9b156bd0..47d5815c 100644 --- a/hack/e2e/common/fixtures/fixtures.go +++ b/hack/e2e/common/fixtures/fixtures.go @@ -1,4 +1,4 @@ -//nolint:gomnd // used in tests +//nolint:mnd // used in tests package fixtures import ( diff --git a/internal/controller/eventing/subscription/jetstream/reconciler.go b/internal/controller/eventing/subscription/jetstream/reconciler.go index 0aedf564..98c84817 100644 --- a/internal/controller/eventing/subscription/jetstream/reconciler.go +++ b/internal/controller/eventing/subscription/jetstream/reconciler.go @@ -239,7 +239,7 @@ func (r *Reconciler) enqueueReconciliationForSubscriptions(subs []eventingv1alph // handleSubscriptionDeletion deletes the JetStream subscription and removes its finalizer if it is set. func (r *Reconciler) handleSubscriptionDeletion(ctx context.Context, subscription *eventingv1alpha2.Subscription, log *zap.SugaredLogger, -) (kctrl.Result, error) { +) (kctrl.Result, error) { //nolint:unparam // used as needed. // delete the JetStream subscription/consumer if !utils.ContainsString(subscription.ObjectMeta.Finalizers, eventingv1alpha2.Finalizer) { return kctrl.Result{}, nil @@ -344,7 +344,7 @@ func (r *Reconciler) updateStatus(ctx context.Context, oldSubscription, } // addFinalizer appends the eventing finalizer to the subscription and updates it in k8s. -func (r *Reconciler) addFinalizer(ctx context.Context, sub *eventingv1alpha2.Subscription) (kctrl.Result, error) { +func (r *Reconciler) addFinalizer(ctx context.Context, sub *eventingv1alpha2.Subscription) (kctrl.Result, error) { //nolint:unparam // used as needed. sub.ObjectMeta.Finalizers = append(sub.ObjectMeta.Finalizers, eventingv1alpha2.Finalizer) // update the subscription's finalizers in k8s diff --git a/internal/controller/operator/eventing/integrationtests/validation/integration_test.go b/internal/controller/operator/eventing/integrationtests/validation/integration_test.go index 84ce6ead..f463037e 100644 --- a/internal/controller/operator/eventing/integrationtests/validation/integration_test.go +++ b/internal/controller/operator/eventing/integrationtests/validation/integration_test.go @@ -54,8 +54,8 @@ const ( wrongSecret = "gibberish" publisher = "publisher" replicas = "replicas" - max = "max" - min = "min" + max = "max" //nolint:predeclared // used in tests + min = "min" //nolint:predeclared // used in tests resources = "resources" limits = "limits" requests = "requests" diff --git a/pkg/ems/api/events/client/client.go b/pkg/ems/api/events/client/client.go index 59966e83..bf144480 100644 --- a/pkg/ems/api/events/client/client.go +++ b/pkg/ems/api/events/client/client.go @@ -65,7 +65,7 @@ func (c Client) Publish(event cloudevents.Event, qos types.Qos) (*types.PublishR } // set required headers - req.Header.Set("qos", string(qos)) + req.Header.Set("qos", string(qos)) //nolint:canonicalheader // used as required. var response types.PublishResponse status, responseBody, err := c.client.Do(req, &response) diff --git a/pkg/eventing/utils.go b/pkg/eventing/utils.go index 2722c304..9b929e2e 100644 --- a/pkg/eventing/utils.go +++ b/pkg/eventing/utils.go @@ -42,7 +42,7 @@ func GetPublisherClusterRoleBindingName(eventing v1alpha1.Eventing) string { return fmt.Sprintf("%s-%s", eventing.GetName(), publisherProxySuffix) } -func newHorizontalPodAutoscaler(name, namespace string, min, max, cpuUtilization, memoryUtilization int32, +func newHorizontalPodAutoscaler(name, namespace string, minReplicas, maxReplicas, cpuUtilization, memoryUtilization int32, labels map[string]string, ) *kautoscalingv2.HorizontalPodAutoscaler { return &kautoscalingv2.HorizontalPodAutoscaler{ @@ -61,8 +61,8 @@ func newHorizontalPodAutoscaler(name, namespace string, min, max, cpuUtilization Name: name, APIVersion: "apps/v1", }, - MinReplicas: &min, - MaxReplicas: max, + MinReplicas: &minReplicas, + MaxReplicas: maxReplicas, Metrics: []kautoscalingv2.MetricSpec{ { Type: kautoscalingv2.ResourceMetricSourceType, diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index ef3cdc98..3e3db37e 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -1,3 +1,4 @@ +//nolint:canonicalheader // used as required in tracing. package tracing import ( diff --git a/pkg/tracing/tracing_test.go b/pkg/tracing/tracing_test.go index a1bdcd2d..2c3d60a2 100644 --- a/pkg/tracing/tracing_test.go +++ b/pkg/tracing/tracing_test.go @@ -1,3 +1,4 @@ +//nolint:canonicalheader // used as required in tracing. package tracing import ( diff --git a/test/utils/utils.go b/test/utils/utils.go index cb2aa60d..b91cc6db 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -1,4 +1,4 @@ -//nolint:gomnd // magic numbers here are used only in context of the function +//nolint:mnd // magic numbers here are used only in context of the function package utils import ( diff --git a/testing/test_helpers.go b/testing/test_helpers.go index 1f527edd..a8ea74ef 100644 --- a/testing/test_helpers.go +++ b/testing/test_helpers.go @@ -155,10 +155,10 @@ func GetStructuredMessageHeaders() http.Header { func GetBinaryMessageHeaders() http.Header { headers := make(http.Header) - headers.Add(CeIDHeader, EventID) - headers.Add(CeTypeHeader, CloudEventType) - headers.Add(CeSourceHeader, CloudEventSource) - headers.Add(CeSpecVersionHeader, CloudEventSpecVersion) + headers.Add(CeIDHeader, EventID) //nolint:canonicalheader // used in testing. + headers.Add(CeTypeHeader, CloudEventType) //nolint:canonicalheader // used in testing. + headers.Add(CeSourceHeader, CloudEventSource) //nolint:canonicalheader // used in testing. + headers.Add(CeSpecVersionHeader, CloudEventSpecVersion) //nolint:canonicalheader // used in testing. return headers } @@ -186,7 +186,7 @@ func NewAPIRule(subscription *eventingv1alpha2.Subscription, opts ...APIRuleOpti func WithService(name, host string) APIRuleOption { return func(r *apigatewayv1beta1.APIRule) { - port := uint32(443) //nolint:gomnd // tests + port := uint32(443) //nolint:mnd // tests isExternal := true r.Spec.Host = &host r.Spec.Service = &apigatewayv1beta1.Service{ @@ -531,9 +531,9 @@ func NewSubscriberSvc(name, namespace string) *kcorev1.Service { Ports: []kcorev1.ServicePort{ { Protocol: "TCP", - Port: 443, //nolint:gomnd // tests + Port: 443, //nolint:mnd // tests TargetPort: intstr.IntOrString{ - IntVal: 8080, //nolint:gomnd // tests + IntVal: 8080, //nolint:mnd // tests }, }, }, From 50b169287d5a6d9bfcb7ff668a5b349f31178070 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Tue, 17 Sep 2024 12:25:16 +0200 Subject: [PATCH 05/21] added github action based build jobs (#637) --- .github/workflows/pull-build-image.yaml | 18 ++++++++++++ .github/workflows/push-build-image.yaml | 39 +++++++++++++++++++++++++ .github/workflows/tag-build-image.yaml | 37 +++++++++++++++++++++++ Dockerfile | 4 +-- 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pull-build-image.yaml create mode 100644 .github/workflows/push-build-image.yaml create mode 100644 .github/workflows/tag-build-image.yaml diff --git a/.github/workflows/pull-build-image.yaml b/.github/workflows/pull-build-image.yaml new file mode 100644 index 00000000..5a81d0b5 --- /dev/null +++ b/.github/workflows/pull-build-image.yaml @@ -0,0 +1,18 @@ +name: Pull Build Image + +on: + pull_request_target: + types: [opened, edited, synchronize, reopened, ready_for_review] + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + build: + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: eventing-manager + dockerfile: Dockerfile + context: . + export-tags: true diff --git a/.github/workflows/push-build-image.yaml b/.github/workflows/push-build-image.yaml new file mode 100644 index 00000000..1d718e30 --- /dev/null +++ b/.github/workflows/push-build-image.yaml @@ -0,0 +1,39 @@ +name: Push Build Image + +on: + push: + branches: + - "main" + - "release-*" + paths-ignore: + - "docs/**" + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + compute-tags: + runs-on: ubuntu-latest + outputs: + tags: ${{ steps.get_tag.outputs.TAGS }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Get the latest tag + id: get_tag + run: | + { + echo 'TAGS<> "$GITHUB_OUTPUT" + build: + needs: compute-tags + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: eventing-manager + dockerfile: Dockerfile + context: . + tags: ${{ needs.compute-tags.outputs.tags }} diff --git a/.github/workflows/tag-build-image.yaml b/.github/workflows/tag-build-image.yaml new file mode 100644 index 00000000..fbc224f0 --- /dev/null +++ b/.github/workflows/tag-build-image.yaml @@ -0,0 +1,37 @@ +name: Tag Build Image + +on: + push: + tags: + - '[0-9]+.[0-9]+.[0-9]+' # This will trigger the workflow when a tag (x.y.z) is pushed. + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + compute-tags: + runs-on: ubuntu-latest + outputs: + tags: ${{ steps.get_tag.outputs.TAGS }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Get the latest tag + id: get_tag + run: | + { + echo 'TAGS<> "$GITHUB_OUTPUT" + build: + name: build-${{ github.ref_name }} # The release pipeline will check the status of this job by this name format (e.g. build-1.0.1). + needs: compute-tags + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: eventing-manager + dockerfile: Dockerfile + context: . + tags: ${{ needs.compute-tags.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 60fd017e..eca5ed28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.0-alpi ARG TARGETOS ARG TARGETARCH -WORKDIR /workspace +WORKDIR /app # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum @@ -32,7 +32,7 @@ FROM gcr.io/distroless/static:nonroot LABEL source = git@github.com:kyma-project/eventing-manager.git WORKDIR / -COPY --from=builder /workspace/manager . +COPY --from=builder /app/manager . USER nonroot:nonroot ENTRYPOINT ["/manager"] From 7eaff889f882d7a1bc257bfff23cbd523a1a3a78 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Wed, 18 Sep 2024 16:25:17 +0200 Subject: [PATCH 06/21] chore: replace prow build job waiting with github action (#639) * replace prow build job waiting with github action * updated * updated * updated * updated * updated * updated * updated --- .github/workflows/create-release.yml | 19 ++-- .../workflows/e2e-upgrade-test-reusable.yaml | 17 ---- .github/workflows/e2e.yml | 86 +++++++++---------- .github/workflows/pull-e2e-upgrade-test.yaml | 9 +- .github/workflows/pull-target-e2e.yml | 20 ++--- .github/workflows/push-e2e-upgrade-test.yaml | 10 ++- 6 files changed, 74 insertions(+), 87 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 75b8e136..d29bb816 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -185,6 +185,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + token: ${{ secrets.BOT_PAT }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). - name: Create changelog env: @@ -199,15 +200,14 @@ jobs: RELEASE_ID=$(./hack/ci/create_draft_release.sh $VERSION) echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT - - name: Trigger prow job 'release-eventing-manager-build' + - name: Add lightweight tag to trigger release build job + env: + GITHUB_TOKEN: ${{ secrets.BOT_PAT }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). run: | - # The job release-eventing-manager-build will be triggered by pushing a new tag (format: x.y.z) to the repo. + # The build job will be triggered by pushing a new tag (format: x.y.z) to the repo. git tag $VERSION git push origin $VERSION - - name: Wait for job 'release-eventing-manager-build' to succeed - run: ./hack/ci/wait-for-release-build-job.sh ${{ github.ref_name }} 600 10 30 # Inputs: repo (format: "owner/repo"), timeout, interval and initial wait time. - - name: Create and upload eventing-manager.yaml and eventing-default-cr.yaml env: PULL_BASE_REF: ${{ needs.generate-version.outputs.VERSION }} @@ -218,11 +218,20 @@ jobs: run: | ./hack/ci/render_and_upload_manifests.sh + wait-until-build-succeeds: + needs: [generate-version, create-draft] + uses: "kyma-project/eventing-tools/.github/workflows/wait-build-reusable.yml@main" + with: + repository: ${{ github.repository_owner }}/eventing-manager + git_ref: ${{ needs.generate-version.outputs.VERSION }} + git_check_run_name: "build-${{ needs.generate-version.outputs.VERSION }} / Build image" + bump-sec-scanners-config-main: name: Bump sec-scanners-config.yaml on main branch needs: - create-draft - generate-version + - wait-until-build-succeeds runs-on: ubuntu-latest env: VERSION: ${{ needs.generate-version.outputs.VERSION }} diff --git a/.github/workflows/e2e-upgrade-test-reusable.yaml b/.github/workflows/e2e-upgrade-test-reusable.yaml index 2bdf4bbe..f380ef99 100644 --- a/.github/workflows/e2e-upgrade-test-reusable.yaml +++ b/.github/workflows/e2e-upgrade-test-reusable.yaml @@ -18,9 +18,6 @@ on: required: true type: string description: "The image tag of the Eventing Manager after the upgrade" - build-job-name: - type: string - description: "The name of the build job to wait for" commit-sha: type: string description: "The commit sha of the new version" @@ -88,20 +85,6 @@ jobs: make e2e-setup make e2e-eventing-setup - - name: Wait for the ${{ inputs.build-job-name }} job to succeed - if: ${{ inputs.build-job-name != '' }} - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: ${{ inputs.build-job-name }} - commit_ref: "${{ inputs.commit-sha }}" - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "eventing-manager" - - name: Upgrade Eventing manager id: upgrade-eventing-manager run: | diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 695bd4c4..13f0cc96 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -35,60 +35,52 @@ on: - PROJECT jobs: - wait-until-build-succeeds: + export-info: runs-on: ubuntu-latest outputs: image-name: ${{ steps.extract-image.outputs.image_name }} + git-ref: ${{ steps.extract-image.outputs.git_ref }} steps: - - uses: actions/checkout@v4 - - - name: Wait for the 'pull-eventing-manager-build' job to succeed - id: pull-wait-build - if: github.event_name == 'pull_request' - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "pull-eventing-manager-build" - commit_ref: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "eventing-manager" - - - name: Wait for the 'post-eventing-manager-build' job to succeed - id: push-wait-build - if: github.event_name == 'push' - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "post-eventing-manager-build" - commit_ref: "${{ github.sha }}" - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "eventing-manager" - - - name: Extract container image name from build logs (pull) + - name: export correct info based on event (PR or Push) id: extract-image env: - # Refernce: https://docs.github.com/en/actions/learn-github-actions/expressions#example - COMMIT_STATUS_JSON: "${{ github.event_name == 'push' && steps.push-wait-build.outputs.json || steps.pull-wait-build.outputs.json }}" + GIT_EVENT_NAME: "${{ github.event_name }}" + PR_NUMBER: "${{ github.event.number }}" + PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}" + HEAD_SHA: "${{ github.sha }}" + run: | + if [[ $GIT_EVENT_NAME == "pull_request" ]] + then + echo "exporting info for pull request..." + echo "image_name=europe-docker.pkg.dev/kyma-project/dev/eventing-manager:PR-${PR_NUMBER}" >> "$GITHUB_OUTPUT" + echo "git_ref=${PR_HEAD_SHA}" >> "$GITHUB_OUTPUT" + else + echo "exporting info for push..." + echo "image_name=europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${HEAD_SHA}" >> "$GITHUB_OUTPUT" + echo "git_ref=${HEAD_SHA}" >> "$GITHUB_OUTPUT" + fi + - name: Print info + env: + IMAGE_NAME: ${{ steps.extract-image.outputs.image_name }} + GIT_REF: ${{ steps.extract-image.outputs.git_ref }} run: | - ./scripts/extract_image_from_build_logs.sh - # export value to job output - export IMAGE_NAME="$(cat image.name)" - echo "IMAGE_NAME: ${IMAGE_NAME}" - echo "image_name=${IMAGE_NAME}" >> "$GITHUB_OUTPUT" + echo "IMAGE: $IMAGE_NAME" + echo "Git ref: $GIT_REF" + + + wait-until-build-succeeds: + needs: export-info + uses: "kyma-project/eventing-tools/.github/workflows/wait-build-reusable.yml@main" + with: + repository: ${{ github.repository_owner }}/eventing-manager + git_ref: ${{ needs.export-info.outputs.git-ref }} + git_check_run_name: "build / Build image" nats: runs-on: ubuntu-latest - needs: wait-until-build-succeeds + needs: [export-info, wait-until-build-succeeds] env: - MANAGER_IMAGE: ${{ needs.wait-until-build-succeeds.outputs.image-name }} + MANAGER_IMAGE: ${{ needs.export-info.outputs.image-name }} steps: - uses: actions/checkout@v4 @@ -152,9 +144,9 @@ jobs: PeerAuthentication: runs-on: ubuntu-latest - needs: wait-until-build-succeeds + needs: [export-info, wait-until-build-succeeds] env: - MANAGER_IMAGE: ${{ needs.wait-until-build-succeeds.outputs.image-name }} + MANAGER_IMAGE: ${{ needs.export-info.outputs.image-name }} steps: - uses: actions/checkout@v4 @@ -200,10 +192,10 @@ jobs: kubectl get peerauthentications.security.istio.io -A -o yaml backend-switching: - needs: wait-until-build-succeeds + needs: [export-info, wait-until-build-succeeds] if: github.event_name == 'push' uses: "./.github/workflows/e2e-backend-switching-reuseable.yml" with: - eventing-manager-image: ${{ needs.wait-until-build-succeeds.outputs.image-name }} + eventing-manager-image: ${{ needs.export-info.outputs.image-name }} cluster-name-prefix: "ghem-" secrets: inherit diff --git a/.github/workflows/pull-e2e-upgrade-test.yaml b/.github/workflows/pull-e2e-upgrade-test.yaml index 686f73bf..59ab746f 100644 --- a/.github/workflows/pull-e2e-upgrade-test.yaml +++ b/.github/workflows/pull-e2e-upgrade-test.yaml @@ -15,11 +15,18 @@ on: - PROJECT jobs: + wait-until-build-succeeds: + uses: "kyma-project/eventing-tools/.github/workflows/wait-build-reusable.yml@main" + with: + repository: ${{ github.repository_owner }}/eventing-manager + git_ref: ${{ github.event.pull_request.head.sha }} + git_check_run_name: "build / Build image" + upgrade-test: + needs: wait-until-build-succeeds uses: ./.github/workflows/e2e-upgrade-test-reusable.yaml with: pre-upgrade-image-tag: main post-upgrade-image-tag: PR-${{ github.event.number }} - build-job-name: pull-eventing-manager-build commit-sha: ${{ github.event.pull_request.head.sha }} secrets: inherit diff --git a/.github/workflows/pull-target-e2e.yml b/.github/workflows/pull-target-e2e.yml index 90d4a375..8759600c 100644 --- a/.github/workflows/pull-target-e2e.yml +++ b/.github/workflows/pull-target-e2e.yml @@ -34,22 +34,12 @@ jobs: ./scripts/is_pr_approved.sh wait-until-build-succeeds: - runs-on: ubuntu-latest needs: is-pr-approved - steps: - - name: Wait for the 'pull-eventing-manager-build' job to succeed - id: pull-wait-build - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "pull-eventing-manager-build" - commit_ref: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "eventing-manager" + uses: "kyma-project/eventing-tools/.github/workflows/wait-build-reusable.yml@main" + with: + repository: ${{ github.repository_owner }}/eventing-manager + git_ref: ${{ github.event.pull_request.head.sha }} + git_check_run_name: "build / Build image" backend-switching: needs: wait-until-build-succeeds diff --git a/.github/workflows/push-e2e-upgrade-test.yaml b/.github/workflows/push-e2e-upgrade-test.yaml index 58fa7b65..70ca501b 100644 --- a/.github/workflows/push-e2e-upgrade-test.yaml +++ b/.github/workflows/push-e2e-upgrade-test.yaml @@ -28,12 +28,18 @@ jobs: run: | echo "latest_release_tag=$(curl -s https://api.github.com/repos/kyma-project/eventing-manager/releases/latest | jq -r '.tag_name')" >> "$GITHUB_OUTPUT" + wait-until-build-succeeds: + uses: "kyma-project/eventing-tools/.github/workflows/wait-build-reusable.yml@main" + with: + repository: ${{ github.repository_owner }}/eventing-manager + git_ref: ${{ github.sha }} + git_check_run_name: "build / Build image" + upgrade-test: uses: ./.github/workflows/e2e-upgrade-test-reusable.yaml - needs: get-latest-release + needs: [get-latest-release, wait-until-build-succeeds] with: pre-upgrade-image-tag: ${{ needs.get-latest-release.outputs.latest_release_tag }} post-upgrade-image-tag: main - build-job-name: post-eventing-manager-build commit-sha: ${{ github.sha }} secrets: inherit From 29550eba33356fe85b18eb0e10f16b1bb4c9a769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:27:16 +0200 Subject: [PATCH 07/21] deps(dependabot): bump k8s.io/apiextensions-apiserver (#635) Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.31.0 to 0.31.1. - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.31.0...v0.31.1) --- updated-dependencies: - dependency-name: k8s.io/apiextensions-apiserver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index d4d06a90..247a044e 100644 --- a/go.mod +++ b/go.mod @@ -28,10 +28,10 @@ require ( golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 istio.io/api v1.23.0 istio.io/client-go v1.23.0 - k8s.io/api v0.31.0 - k8s.io/apiextensions-apiserver v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/client-go v0.31.0 + k8s.io/api v0.31.1 + k8s.io/apiextensions-apiserver v0.31.1 + k8s.io/apimachinery v0.31.1 + k8s.io/client-go v0.31.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.19.0 ) diff --git a/go.sum b/go.sum index 873b17fe..dd511c08 100644 --- a/go.sum +++ b/go.sum @@ -703,14 +703,14 @@ istio.io/api v1.23.0 h1:yqv3lNW6XSYS5XkbEkxsmFROXIQznp4lFWqj7xKEqCA= istio.io/api v1.23.0/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= istio.io/client-go v1.23.0 h1://xojbifr84q29WE3eMx74p36hD4lvcejX1KxE3iJvY= istio.io/client-go v1.23.0/go.mod h1:3qX/KBS5aR47QV4JhphcZl5ysnZ53x78TBjNQLM2TC4= -k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= -k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= -k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= -k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= -k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= -k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= +k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= From 61f93d538d2e6e390c03c4b2a64ccf6327c3ffa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:29:16 +0200 Subject: [PATCH 08/21] deps(dependabot): bump github.com/prometheus/client_golang (#640) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.2 to 1.20.4. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.2...v1.20.4) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 247a044e..5887cca7 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.20.2 + github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 github.com/vektra/mockery/v2 v2.45.0 go.uber.org/atomic v1.11.0 diff --git a/go.sum b/go.sum index dd511c08..0bf3ef3a 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= -github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= From c7d71291a58af57ee5f12052fab9e62abb21e330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:45:16 +0200 Subject: [PATCH 09/21] deps(dependabot): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 (#623) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.1 to 1.34.2. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.1...v1.34.2) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 5887cca7..80858d58 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/nats-io/nats-server/v2 v2.10.20 github.com/nats-io/nats.go v1.36.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.34.1 + github.com/onsi/gomega v1.34.2 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 @@ -95,14 +95,14 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/mod v0.19.0 // indirect - golang.org/x/net v0.27.0 // indirect + golang.org/x/mod v0.20.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.6.0 // indirect - golang.org/x/tools v0.23.0 // indirect + golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/go.sum b/go.sum index 0bf3ef3a..ae5d95e1 100644 --- a/go.sum +++ b/go.sum @@ -170,8 +170,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -268,12 +268,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= -github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -395,8 +395,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -430,8 +430,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -567,8 +567,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 92b82af83e63fee51efc3ae64ee01ac3a81d36fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:31:16 +0200 Subject: [PATCH 10/21] deps(dependabot): bump golang.org/x/oauth2 from 0.22.0 to 0.23.0 (#633) Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/oauth2/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 80858d58..08912ac6 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/vektra/mockery/v2 v2.45.0 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/oauth2 v0.22.0 + golang.org/x/oauth2 v0.23.0 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 istio.io/api v1.23.0 istio.io/client-go v1.23.0 diff --git a/go.sum b/go.sum index ae5d95e1..8b9fbe58 100644 --- a/go.sum +++ b/go.sum @@ -441,8 +441,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 8e58c71b9fb5479e2443fb5404d77530777cd321 Mon Sep 17 00:00:00 2001 From: Carina Kothe <69976260+grischperl@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:11:16 +0200 Subject: [PATCH 11/21] bump golang version to 1.23.1 (#641) --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eca5ed28..ed47cc4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.0-alpine3.20 AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.1-alpine3.20 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 08912ac6..866562d6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/eventing-manager -go 1.23.0 +go 1.23.1 require ( github.com/avast/retry-go/v3 v3.1.1 From a312f3860208e222be9f9b90f9ccdb6c7ca29cdc Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Thu, 19 Sep 2024 10:23:17 +0200 Subject: [PATCH 12/21] remove prow reference (#644) --- docs/contributor/testing.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/contributor/testing.md b/docs/contributor/testing.md index 684733fb..155023f9 100644 --- a/docs/contributor/testing.md +++ b/docs/contributor/testing.md @@ -52,20 +52,11 @@ The E2E test consists of four consecutive steps. If desired, you can run them in ## CI/CD -This project uses [Prow](https://docs.prow.k8s.io/docs/) and [GitHub Actions](https://docs.github.com/en/actions) as part of the development cycle. +This project uses [GitHub Actions](https://docs.github.com/en/actions) as part of the development cycle. The aim is to verify the functional correctness of Eventing Manager. -### Prow Jobs - -The Prow Jobs that cover the code of this repository reside in [their own repository](https://github.com/kyma-project/test-infra/tree/main/prow/jobs/kyma-project/eventing-manager). -Presubmit Jobs run on pull requests (PRs) and are marked with the prefix `pull`. Postsubmit jobs run on branch `main` after a PR has been merged and carry the prefix `post`. - -For more information on execution details of each Job, refer to their `description` field and the `command` and `args` fields. -Alternatively, you can access this information from your PR by inspecting the details to the job and viewing the Prow job `.yaml` file. - ### GitHub Actions GitHub Actions reside [within this module repository](https://github.com/kyma-project/eventing-manager/tree/main/.github/workflows). -Pre- and postsubmit actions follow the same naming conventions as Prow Jobs. The [Actions overview](https://github.com/kyma-project/eventing-manager/actions/) shows all the existing workflows and their execution details. Here, you can also trigger a re-run of an action. From 69d8ecf734ec46049c0ff63ce38a4ca198df9363 Mon Sep 17 00:00:00 2001 From: Carina Kothe <69976260+grischperl@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:21:16 +0200 Subject: [PATCH 13/21] chore: bump nats to 1.37.0 (#646) * execute `make generate` * bump nats to 1.37.0 * fix linting problem * add `nolint` comment * add nolint comment --- .../v1alpha1/zz_generated.deepcopy.go | 2 +- go.mod | 2 +- go.sum | 2 ++ .../eventing/mocks/typed_controller.go | 28 ++++++++-------- .../jetstream/mocks/JetStreamContext.go | 32 +++++++++++++++++++ pkg/backend/jetstream/stubs_test.go | 5 +++ testing/test_helpers.go | 8 ++--- 7 files changed, 59 insertions(+), 20 deletions(-) diff --git a/api/operator/v1alpha1/zz_generated.deepcopy.go b/api/operator/v1alpha1/zz_generated.deepcopy.go index c227b344..25bcddd8 100644 --- a/api/operator/v1alpha1/zz_generated.deepcopy.go +++ b/api/operator/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/go.mod b/go.mod index 866562d6..9aa5dbb6 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/kyma-project/nats-manager v1.0.3-0.20231219150808-13159cfea47c github.com/mitchellh/hashstructure/v2 v2.0.2 github.com/nats-io/nats-server/v2 v2.10.20 - github.com/nats-io/nats.go v1.36.0 + github.com/nats-io/nats.go v1.37.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.2 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 8b9fbe58..6bf1be2f 100644 --- a/go.sum +++ b/go.sum @@ -257,6 +257,8 @@ github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTL github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= github.com/nats-io/nats.go v1.36.0 h1:suEUPuWzTSse/XhESwqLxXGuj8vGRuPRoG7MoRN/qyU= github.com/nats-io/nats.go v1.36.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= +github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= diff --git a/internal/controller/operator/eventing/mocks/typed_controller.go b/internal/controller/operator/eventing/mocks/typed_controller.go index 811b48f1..8edc03ee 100644 --- a/internal/controller/operator/eventing/mocks/typed_controller.go +++ b/internal/controller/operator/eventing/mocks/typed_controller.go @@ -73,7 +73,7 @@ func (_c *TypedController_GetLogger_Call[request]) RunAndReturn(run func() logr. } // Reconcile provides a mock function with given fields: _a0, _a1 -func (_m *TypedController[request]) Reconcile(_a0 context.Context, _a1 reconcile.Request) (reconcile.Result, error) { +func (_m *TypedController[request]) Reconcile(_a0 context.Context, _a1 request) (reconcile.Result, error) { ret := _m.Called(_a0, _a1) if len(ret) == 0 { @@ -82,16 +82,16 @@ func (_m *TypedController[request]) Reconcile(_a0 context.Context, _a1 reconcile var r0 reconcile.Result var r1 error - if rf, ok := ret.Get(0).(func(context.Context, reconcile.Request) (reconcile.Result, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, request) (reconcile.Result, error)); ok { return rf(_a0, _a1) } - if rf, ok := ret.Get(0).(func(context.Context, reconcile.Request) reconcile.Result); ok { + if rf, ok := ret.Get(0).(func(context.Context, request) reconcile.Result); ok { r0 = rf(_a0, _a1) } else { r0 = ret.Get(0).(reconcile.Result) } - if rf, ok := ret.Get(1).(func(context.Context, reconcile.Request) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, request) error); ok { r1 = rf(_a0, _a1) } else { r1 = ret.Error(1) @@ -107,14 +107,14 @@ type TypedController_Reconcile_Call[request comparable] struct { // Reconcile is a helper method to define mock.On call // - _a0 context.Context -// - _a1 reconcile.Request +// - _a1 request func (_e *TypedController_Expecter[request]) Reconcile(_a0 interface{}, _a1 interface{}) *TypedController_Reconcile_Call[request] { return &TypedController_Reconcile_Call[request]{Call: _e.mock.On("Reconcile", _a0, _a1)} } -func (_c *TypedController_Reconcile_Call[request]) Run(run func(_a0 context.Context, _a1 reconcile.Request)) *TypedController_Reconcile_Call[request] { +func (_c *TypedController_Reconcile_Call[request]) Run(run func(_a0 context.Context, _a1 request)) *TypedController_Reconcile_Call[request] { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(reconcile.Request)) + run(args[0].(context.Context), args[1].(request)) }) return _c } @@ -124,7 +124,7 @@ func (_c *TypedController_Reconcile_Call[request]) Return(_a0 reconcile.Result, return _c } -func (_c *TypedController_Reconcile_Call[request]) RunAndReturn(run func(context.Context, reconcile.Request) (reconcile.Result, error)) *TypedController_Reconcile_Call[request] { +func (_c *TypedController_Reconcile_Call[request]) RunAndReturn(run func(context.Context, request) (reconcile.Result, error)) *TypedController_Reconcile_Call[request] { _c.Call.Return(run) return _c } @@ -176,7 +176,7 @@ func (_c *TypedController_Start_Call[request]) RunAndReturn(run func(context.Con } // Watch provides a mock function with given fields: src -func (_m *TypedController[request]) Watch(src source.TypedSource[reconcile.Request]) error { +func (_m *TypedController[request]) Watch(src source.TypedSource[request]) error { ret := _m.Called(src) if len(ret) == 0 { @@ -184,7 +184,7 @@ func (_m *TypedController[request]) Watch(src source.TypedSource[reconcile.Reque } var r0 error - if rf, ok := ret.Get(0).(func(source.TypedSource[reconcile.Request]) error); ok { + if rf, ok := ret.Get(0).(func(source.TypedSource[request]) error); ok { r0 = rf(src) } else { r0 = ret.Error(0) @@ -199,14 +199,14 @@ type TypedController_Watch_Call[request comparable] struct { } // Watch is a helper method to define mock.On call -// - src source.TypedSource[reconcile.Request] +// - src source.TypedSource[request] func (_e *TypedController_Expecter[request]) Watch(src interface{}) *TypedController_Watch_Call[request] { return &TypedController_Watch_Call[request]{Call: _e.mock.On("Watch", src)} } -func (_c *TypedController_Watch_Call[request]) Run(run func(src source.TypedSource[reconcile.Request])) *TypedController_Watch_Call[request] { +func (_c *TypedController_Watch_Call[request]) Run(run func(src source.TypedSource[request])) *TypedController_Watch_Call[request] { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(source.TypedSource[reconcile.Request])) + run(args[0].(source.TypedSource[request])) }) return _c } @@ -216,7 +216,7 @@ func (_c *TypedController_Watch_Call[request]) Return(_a0 error) *TypedControlle return _c } -func (_c *TypedController_Watch_Call[request]) RunAndReturn(run func(source.TypedSource[reconcile.Request]) error) *TypedController_Watch_Call[request] { +func (_c *TypedController_Watch_Call[request]) RunAndReturn(run func(source.TypedSource[request]) error) *TypedController_Watch_Call[request] { _c.Call.Return(run) return _c } diff --git a/pkg/backend/jetstream/mocks/JetStreamContext.go b/pkg/backend/jetstream/mocks/JetStreamContext.go index 3f833ba1..c830b57a 100644 --- a/pkg/backend/jetstream/mocks/JetStreamContext.go +++ b/pkg/backend/jetstream/mocks/JetStreamContext.go @@ -387,6 +387,38 @@ func (_c *JetStreamContext_ChanSubscribe_Call) RunAndReturn(run func(string, cha return _c } +// CleanupPublisher provides a mock function with given fields: +func (_m *JetStreamContext) CleanupPublisher() { + _m.Called() +} + +// JetStreamContext_CleanupPublisher_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CleanupPublisher' +type JetStreamContext_CleanupPublisher_Call struct { + *mock.Call +} + +// CleanupPublisher is a helper method to define mock.On call +func (_e *JetStreamContext_Expecter) CleanupPublisher() *JetStreamContext_CleanupPublisher_Call { + return &JetStreamContext_CleanupPublisher_Call{Call: _e.mock.On("CleanupPublisher")} +} + +func (_c *JetStreamContext_CleanupPublisher_Call) Run(run func()) *JetStreamContext_CleanupPublisher_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *JetStreamContext_CleanupPublisher_Call) Return() *JetStreamContext_CleanupPublisher_Call { + _c.Call.Return() + return _c +} + +func (_c *JetStreamContext_CleanupPublisher_Call) RunAndReturn(run func()) *JetStreamContext_CleanupPublisher_Call { + _c.Call.Return(run) + return _c +} + // ConsumerInfo provides a mock function with given fields: stream, name, opts func (_m *JetStreamContext) ConsumerInfo(stream string, name string, opts ...nats.JSOpt) (*nats.ConsumerInfo, error) { _va := make([]interface{}, len(opts)) diff --git a/pkg/backend/jetstream/stubs_test.go b/pkg/backend/jetstream/stubs_test.go index 55409a70..1acd473c 100644 --- a/pkg/backend/jetstream/stubs_test.go +++ b/pkg/backend/jetstream/stubs_test.go @@ -22,6 +22,11 @@ type jetStreamContextStub struct { deleteConsumerErr error } +func (j jetStreamContextStub) CleanupPublisher() { + // TODO implement me + panic("implement me") +} + func (j jetStreamContextStub) StreamNameBySubject(s string, opt ...nats.JSOpt) (string, error) { // TODO implement me panic("implement me") diff --git a/testing/test_helpers.go b/testing/test_helpers.go index a8ea74ef..65695fb0 100644 --- a/testing/test_helpers.go +++ b/testing/test_helpers.go @@ -155,10 +155,10 @@ func GetStructuredMessageHeaders() http.Header { func GetBinaryMessageHeaders() http.Header { headers := make(http.Header) - headers.Add(CeIDHeader, EventID) //nolint:canonicalheader // used in testing. - headers.Add(CeTypeHeader, CloudEventType) //nolint:canonicalheader // used in testing. - headers.Add(CeSourceHeader, CloudEventSource) //nolint:canonicalheader // used in testing. - headers.Add(CeSpecVersionHeader, CloudEventSpecVersion) //nolint:canonicalheader // used in testing. + headers.Add(CeIDHeader, EventID) //nolint:canonicalheader,nolintlint // used in testing. + headers.Add(CeTypeHeader, CloudEventType) //nolint:canonicalheader,nolintlint // used in testing. + headers.Add(CeSourceHeader, CloudEventSource) //nolint:canonicalheader,nolintlint // used in testing. + headers.Add(CeSpecVersionHeader, CloudEventSpecVersion) //nolint:canonicalheader,nolintlint // used in testing. return headers } From 7498116ef21ebda2468f0e983d0c34cf30556893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:07:18 +0200 Subject: [PATCH 14/21] deps(dependabot): bump github.com/vektra/mockery/v2 (#647) Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.45.0 to 2.46.0. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.45.0...v2.46.0) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9aa5dbb6..c62e3e72 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 - github.com/vektra/mockery/v2 v2.45.0 + github.com/vektra/mockery/v2 v2.46.0 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.23.0 diff --git a/go.sum b/go.sum index 6bf1be2f..88f68d4f 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,6 @@ github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE= github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI= github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= -github.com/nats-io/nats.go v1.36.0 h1:suEUPuWzTSse/XhESwqLxXGuj8vGRuPRoG7MoRN/qyU= -github.com/nats-io/nats.go v1.36.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -331,8 +329,8 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/vektra/mockery/v2 v2.45.0 h1:TDKO9y0CPv+/gm7KVBOJfzMcBeK7Y044jvaNdgBBVik= -github.com/vektra/mockery/v2 v2.45.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8= +github.com/vektra/mockery/v2 v2.46.0 h1:DKIFj6hAPGwmOYiWfWzdsQtBgU8ozPXo3Bwbmf+Ku80= +github.com/vektra/mockery/v2 v2.46.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 2cd18720fb1b1eacabe1e8b45a249537e690a2c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:17:20 +0200 Subject: [PATCH 15/21] deps(dependabot): bump istio.io/api from 1.23.0 to 1.23.2 (#649) Bumps [istio.io/api](https://github.com/istio/api) from 1.23.0 to 1.23.2. - [Commits](https://github.com/istio/api/compare/1.23.0...1.23.2) --- updated-dependencies: - dependency-name: istio.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c62e3e72..36843ed7 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.23.0 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 - istio.io/api v1.23.0 + istio.io/api v1.23.2 istio.io/client-go v1.23.0 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 diff --git a/go.sum b/go.sum index 88f68d4f..a982da2c 100644 --- a/go.sum +++ b/go.sum @@ -699,8 +699,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -istio.io/api v1.23.0 h1:yqv3lNW6XSYS5XkbEkxsmFROXIQznp4lFWqj7xKEqCA= -istio.io/api v1.23.0/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= +istio.io/api v1.23.2 h1:FvWi7GC+rWD60/ZFPuulX/h3k+f2Q9qot3dP8CIL8Ss= +istio.io/api v1.23.2/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= istio.io/client-go v1.23.0 h1://xojbifr84q29WE3eMx74p36hD4lvcejX1KxE3iJvY= istio.io/client-go v1.23.0/go.mod h1:3qX/KBS5aR47QV4JhphcZl5ysnZ53x78TBjNQLM2TC4= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= From 96a924f78214e2f45948411dac1f462c3b6b6f40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:25:18 +0200 Subject: [PATCH 16/21] deps(dependabot): bump istio.io/client-go from 1.23.0 to 1.23.2 (#648) Bumps [istio.io/client-go](https://github.com/istio/client-go) from 1.23.0 to 1.23.2. - [Commits](https://github.com/istio/client-go/compare/1.23.0...1.23.2) --- updated-dependencies: - dependency-name: istio.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 36843ed7..1f6766b7 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.23.0 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 istio.io/api v1.23.2 - istio.io/client-go v1.23.0 + istio.io/client-go v1.23.2 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.1 diff --git a/go.sum b/go.sum index a982da2c..8c157224 100644 --- a/go.sum +++ b/go.sum @@ -701,8 +701,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= istio.io/api v1.23.2 h1:FvWi7GC+rWD60/ZFPuulX/h3k+f2Q9qot3dP8CIL8Ss= istio.io/api v1.23.2/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= -istio.io/client-go v1.23.0 h1://xojbifr84q29WE3eMx74p36hD4lvcejX1KxE3iJvY= -istio.io/client-go v1.23.0/go.mod h1:3qX/KBS5aR47QV4JhphcZl5ysnZ53x78TBjNQLM2TC4= +istio.io/client-go v1.23.2 h1:BIt6A+KaUOFin3SzXiDq2Fr/TMBev1+c836R0BfUfhU= +istio.io/client-go v1.23.2/go.mod h1:E08wpMtUulJk2tlWOCUVakjy1bKFxUNm22tM1R1QY0Y= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= From 24339fbbed7b914e7fcdb947e8eca5e18e67f75b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:53:21 +0200 Subject: [PATCH 17/21] deps(dependabot): bump github.com/vektra/mockery/v2 (#650) Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.0 to 2.46.1. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.0...v2.46.1) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1f6766b7..0c690328 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 - github.com/vektra/mockery/v2 v2.46.0 + github.com/vektra/mockery/v2 v2.46.1 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.23.0 diff --git a/go.sum b/go.sum index 8c157224..422dcc1b 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/vektra/mockery/v2 v2.46.0 h1:DKIFj6hAPGwmOYiWfWzdsQtBgU8ozPXo3Bwbmf+Ku80= -github.com/vektra/mockery/v2 v2.46.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8= +github.com/vektra/mockery/v2 v2.46.1 h1:lCR/zfGzZN9naZhyJryyj/8Iq2xgtyZIajlClGIebGA= +github.com/vektra/mockery/v2 v2.46.1/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From fa78b4c026f86fb0cd863cd5d9d142d81ef6a6df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:19:22 +0200 Subject: [PATCH 18/21] deps(dependabot): bump github.com/nats-io/nats-server/v2 (#651) Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.20 to 2.10.21. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.20...v2.10.21) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 0c690328..029b6c39 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/kyma-project/kyma/common/logging v0.0.0-20240729075006-50d76505df8c github.com/kyma-project/nats-manager v1.0.3-0.20231219150808-13159cfea47c github.com/mitchellh/hashstructure/v2 v2.0.2 - github.com/nats-io/nats-server/v2 v2.10.20 + github.com/nats-io/nats-server/v2 v2.10.21 github.com/nats-io/nats.go v1.37.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.2 @@ -93,14 +93,14 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 422dcc1b..1c1ad05f 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE= github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI= -github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= +github.com/nats-io/nats-server/v2 v2.10.21 h1:gfG6T06wBdI25XyY2IsauarOc2srWoFxxfsOKjrzoRA= +github.com/nats-io/nats-server/v2 v2.10.21/go.mod h1:I1YxSAEWbXCfy0bthwvNb5X43WwIWMz7gx5ZVPDr5Rc= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -358,8 +358,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -499,19 +499,19 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From e1cca55d2293b54faf1ddf53e83097e1a865100e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:22:46 +0200 Subject: [PATCH 19/21] deps(dependabot): bump golangci/golangci-lint-action from 6.1.0 to 6.1.1 (#654) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v6.1.0...v6.1.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml index a6fc9e25..659ad8a4 100644 --- a/.github/workflows/lint-go.yml +++ b/.github/workflows/lint-go.yml @@ -38,6 +38,6 @@ jobs: go-version-file: go.mod - name: golangci-lint - uses: golangci/golangci-lint-action@v6.1.0 + uses: golangci/golangci-lint-action@v6.1.1 with: version: v1.60.1 From ca4c65447f89998a75c3786cedc941e5878443d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:24:46 +0200 Subject: [PATCH 20/21] deps(dependabot): bump github.com/vektra/mockery/v2 (#653) Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.1 to 2.46.2. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.1...v2.46.2) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 029b6c39..542686e3 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 - github.com/vektra/mockery/v2 v2.46.1 + github.com/vektra/mockery/v2 v2.46.2 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.23.0 diff --git a/go.sum b/go.sum index 1c1ad05f..6735a19b 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/vektra/mockery/v2 v2.46.1 h1:lCR/zfGzZN9naZhyJryyj/8Iq2xgtyZIajlClGIebGA= -github.com/vektra/mockery/v2 v2.46.1/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ= +github.com/vektra/mockery/v2 v2.46.2 h1:bpUncWvkiDzqn+aWwt4dY1aS0F8Ob4k8+WJrWU/Kh4s= +github.com/vektra/mockery/v2 v2.46.2/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 857f2eb2998b22ae89ae07f1c17bb3b9be0d98a6 Mon Sep 17 00:00:00 2001 From: Andreas Thaler Date: Tue, 8 Oct 2024 14:02:47 +0200 Subject: [PATCH 21/21] feat: add proper categories for CRDs (#652) * feat: Add proper categories for CRDs * fix --- api/eventing/v1alpha2/subscription_types.go | 1 + api/operator/v1alpha1/eventing_types.go | 1 + config/crd/bases/eventing.kyma-project.io_subscriptions.yaml | 2 ++ config/crd/bases/operator.kyma-project.io_eventings.yaml | 3 +++ 4 files changed, 7 insertions(+) diff --git a/api/eventing/v1alpha2/subscription_types.go b/api/eventing/v1alpha2/subscription_types.go index db566ea8..65267c5d 100644 --- a/api/eventing/v1alpha2/subscription_types.go +++ b/api/eventing/v1alpha2/subscription_types.go @@ -65,6 +65,7 @@ type SubscriptionStatus struct { // +kubebuilder:storageversion // +kubebuilder:object:root=true // +kubebuilder:subresource:status +// +kubebuilder:resource:categories={kyma-eventing} // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" diff --git a/api/operator/v1alpha1/eventing_types.go b/api/operator/v1alpha1/eventing_types.go index 9f6a3948..9f139724 100644 --- a/api/operator/v1alpha1/eventing_types.go +++ b/api/operator/v1alpha1/eventing_types.go @@ -83,6 +83,7 @@ func getSupportedConditionsTypes() map[ConditionType]interface{} { // Eventing is the Schema for the eventing API. // +kubebuilder:object:root=true // +kubebuilder:subresource:status +// +kubebuilder:resource:categories={kyma-modules,kyma-eventing} // +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.state",description="State of Eventing" // +kubebuilder:printcolumn:name="Backend",type="string",JSONPath=".spec.backend.type",description="Type of Eventing backend, either NATS or EventMesh" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of the resource" diff --git a/config/crd/bases/eventing.kyma-project.io_subscriptions.yaml b/config/crd/bases/eventing.kyma-project.io_subscriptions.yaml index 4f9291b7..3c10989f 100644 --- a/config/crd/bases/eventing.kyma-project.io_subscriptions.yaml +++ b/config/crd/bases/eventing.kyma-project.io_subscriptions.yaml @@ -8,6 +8,8 @@ metadata: spec: group: eventing.kyma-project.io names: + categories: + - kyma-eventing kind: Subscription listKind: SubscriptionList plural: subscriptions diff --git a/config/crd/bases/operator.kyma-project.io_eventings.yaml b/config/crd/bases/operator.kyma-project.io_eventings.yaml index e8cf39c9..efab2633 100644 --- a/config/crd/bases/operator.kyma-project.io_eventings.yaml +++ b/config/crd/bases/operator.kyma-project.io_eventings.yaml @@ -8,6 +8,9 @@ metadata: spec: group: operator.kyma-project.io names: + categories: + - kyma-modules + - kyma-eventing kind: Eventing listKind: EventingList plural: eventings