Skip to content

Commit f89074a

Browse files
author
jtcheng
committed
bump controller-runtime to 0.19
1. replace controller-runtime/pkg/ratelimiter to k8s.io/client-go/util/workqueue 2. regenerate mock code 3. remove Controller Manager ConfigFile logic according by kubernetes-sigs/controller-runtime#895 and https://github.com/guacamole-operator/guacamole-operator/pull/35/files#diff-2873f79a86c0d8b3335cd7731b0ecf7dd4301eb19a82ef7a1cba7589b5252261 4. remove unused replacement in go.mod 5. remove admission.DecoderInjector, we should set decoder explicitly 6. fix unittest errors in controller-runtime 1.19, controller-runtime/pkg/ratelimiter has been removed replace controller-runtime/pkg/ratelimiter to k8s.io/client-go/util/workqueue
1 parent 2fe9867 commit f89074a

File tree

20 files changed

+529
-513
lines changed

20 files changed

+529
-513
lines changed

‎base.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ lint: golangcilint ##@Development Run golangci-lint against code.
5353

5454
COVER_PROFILE ?= cover.out
5555
TEST_FILE ?= test.json
56-
GO_TEST_FLAGS ?= -v -json
56+
GO_TEST_FLAGS ?= -v
5757
GO_TEST_TAGS ?= containers_image_openpgp
5858
gotest: ##@Development Run go tests.
5959
go test $(GO_TEST_FLAGS) -tags=$(GO_TEST_TAGS) -coverpkg=./... -coverprofile $(COVER_PROFILE) ./... | tee ${TEST_FILE}

‎config/feature_watch.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/types"
2626
"knative.dev/pkg/logging"
27-
"sigs.k8s.io/controller-runtime/pkg/builder"
2827
"sigs.k8s.io/controller-runtime/pkg/client"
2928
"sigs.k8s.io/controller-runtime/pkg/event"
30-
"sigs.k8s.io/controller-runtime/pkg/handler"
31-
"sigs.k8s.io/controller-runtime/pkg/predicate"
3229
"sigs.k8s.io/controller-runtime/pkg/reconcile"
33-
"sigs.k8s.io/controller-runtime/pkg/source"
3430
)
3531

3632
// ListByFeatureFlagChanged when the function switch is changed, get the object function that triggers reconile.
@@ -44,17 +40,6 @@ func defaultFeatureChanged(new *FeatureFlags, old *FeatureFlags) bool {
4440
return equality.Semantic.DeepEqual(new, old)
4541
}
4642

47-
// WatchFeatureFlagChanged trigger reconcile when the function switch is changed.
48-
func (manager *Manager) WatchFeatureFlagChanged(ctx context.Context, listFunc ListByFeatureFlagChanged, featureChanged HasFeatureChangedFunc) (source.Source, handler.EventHandler, builder.WatchesOption) {
49-
50-
return &source.Kind{Type: &corev1.ConfigMap{}},
51-
handler.EnqueueRequestsFromMapFunc(enqueueRequestsConfigMapFunc(ctx, listFunc)),
52-
// determine whether the function switch has changed, and return true when it changes.
53-
builder.WithPredicates(predicate.Funcs{
54-
UpdateFunc: predicatesUpdateFunc(manager, featureChanged),
55-
})
56-
}
57-
5843
func enqueueRequestsConfigMapFunc(ctx context.Context, listFunc ListByFeatureFlagChanged) func(client.Object) []reconcile.Request {
5944
return func(obj client.Object) (reqs []reconcile.Request) {
6045
reqs = []reconcile.Request{}

‎controllers/builderoptions.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ limitations under the License.
1717
package controllers
1818

1919
import (
20+
"k8s.io/client-go/util/workqueue"
2021
"sigs.k8s.io/controller-runtime/pkg/controller"
21-
"sigs.k8s.io/controller-runtime/pkg/ratelimiter"
22+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2223
)
2324

2425
// DefaultMaxConcurrentReconciles is the default number of max concurrent reconciles
@@ -41,7 +42,7 @@ func BuilderOptions(opts ...BuilderOptionFunc) controller.Options {
4142
func DefaultOptions() controller.Options {
4243
return controller.Options{
4344
MaxConcurrentReconciles: DefaultMaxConcurrentReconciles,
44-
RateLimiter: DefaultRateLimiter(),
45+
RateLimiter: DefaultTypedRateLimiter[reconcile.Request](),
4546
}
4647
}
4748

@@ -54,7 +55,7 @@ func MaxConCurrentReconciles(num int) BuilderOptionFunc {
5455
}
5556

5657
// RateLimiter sets the rate limiter
57-
func RateLimiter(rl ratelimiter.RateLimiter) BuilderOptionFunc {
58+
func RateLimiter(rl workqueue.TypedRateLimiter[reconcile.Request]) BuilderOptionFunc {
5859
return func(options controller.Options) controller.Options {
5960
options.RateLimiter = rl
6061
return options

‎controllers/builderoptions_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
. "github.com/onsi/gomega"
2222
"k8s.io/client-go/util/workqueue"
2323
"sigs.k8s.io/controller-runtime/pkg/controller"
24+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2425
)
2526

2627
var _ = Describe("Test.BuilderOptions", func() {
@@ -43,7 +44,7 @@ var _ = Describe("Test.BuilderOptions", func() {
4344
})
4445

4546
Context("builderoptions with custom rate limiter", func() {
46-
customRateLimiter := workqueue.NewMaxOfRateLimiter()
47+
customRateLimiter := workqueue.NewTypedMaxOfRateLimiter[reconcile.Request]()
4748

4849
BeforeEach(func() {
4950
buildOptFuns = append(buildOptFuns, RateLimiter(customRateLimiter))

‎controllers/controllerbuilderoptions_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package controllers
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/builder"
2121
"sigs.k8s.io/controller-runtime/pkg/controller"
22+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2223

2324
. "github.com/onsi/ginkgo/v2"
2425
. "github.com/onsi/gomega"
@@ -34,7 +35,7 @@ var _ = Describe("Test.ApplyControllerBuilderOptions", func() {
3435

3536
BeforeEach(func() {
3637
builderFuncs = append(builderFuncs, WithBuilderOptions(controller.Options{
37-
RateLimiter: DefaultRateLimiter(),
38+
RateLimiter: DefaultTypedRateLimiter[reconcile.Request](),
3839
}))
3940
})
4041

‎controllers/ratelimit.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,21 @@ import (
2525

2626
// DefaultRateLimiter returns a workqueue rate limiter with a starting value of 2 seconds
2727
// opposed to controller-runtime's default one of 1 millisecond
28+
// Deprecated: DefaultRateLimiter is deprecated, use DefaultTypedRateLimiter instead.
2829
func DefaultRateLimiter() workqueue.RateLimiter {
2930
return workqueue.NewMaxOfRateLimiter(
3031
workqueue.NewItemExponentialFailureRateLimiter(2*time.Second, 1000*time.Second),
3132
// 10 qps, 100 bucket size. This is only for retry speed and its only the overall factor (not per item)
3233
&workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
3334
)
3435
}
36+
37+
// DefaultTypedRateLimiter returns a workqueue rate limiter with a starting value of 2 seconds
38+
// opposed to controller-runtime's default one of 1 millisecond
39+
func DefaultTypedRateLimiter[T comparable]() workqueue.TypedRateLimiter[T] {
40+
return workqueue.NewTypedMaxOfRateLimiter(
41+
workqueue.NewTypedItemExponentialFailureRateLimiter[T](2*time.Second, 1000*time.Second),
42+
// 10 qps, 100 bucket size. This is only for retry speed and its only the overall factor (not per item)
43+
&workqueue.TypedBucketRateLimiter[T]{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
44+
)
45+
}

‎examples/sample-controller/controllers/test/foobar_controller.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package test
1919
import (
2020
"context"
2121

22+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
23+
2224
"k8s.io/client-go/tools/record"
2325

2426
"k8s.io/apimachinery/pkg/runtime"
@@ -101,6 +103,6 @@ func (r *FooBarReconciler) SetupWithManager(mgr ctrl.Manager) error {
101103
return ctrl.NewControllerManagedBy(mgr).
102104
For(&testv1alpha1.FooBar{}).
103105
WithOptions(controller.Options{
104-
RateLimiter: pkgctrl.DefaultRateLimiter(),
106+
RateLimiter: pkgctrl.DefaultTypedRateLimiter[reconcile.Request](),
105107
}).Complete(r)
106108
}

‎go.mod

Lines changed: 75 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
module github.com/katanomi/pkg
22

3-
go 1.18
3+
go 1.22.0
4+
5+
toolchain go1.22.7
46

57
require (
68
github.com/blendle/zapdriver v1.3.1
79
github.com/cloudevents/sdk-go/v2 v2.15.2
8-
github.com/davecgh/go-spew v1.1.1
10+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
911
github.com/emicklei/go-restful-openapi/v2 v2.3.0
10-
github.com/emicklei/go-restful/v3 v3.10.2
11-
github.com/go-logr/logr v1.4.1
12+
github.com/emicklei/go-restful/v3 v3.12.1
13+
github.com/go-logr/logr v1.4.2
1214
github.com/go-logr/zapr v1.3.0
1315
github.com/go-openapi/spec v0.20.8 // indirect
1416
github.com/go-resty/resty/v2 v2.6.0
1517
github.com/golang/mock v1.6.0
1618
github.com/google/go-cmp v0.6.0
1719
github.com/jarcoal/httpmock v1.0.8
18-
github.com/onsi/ginkgo/v2 v2.17.0
19-
github.com/onsi/gomega v1.30.0
20-
github.com/prometheus/client_golang v1.16.0
20+
github.com/onsi/ginkgo/v2 v2.20.0
21+
github.com/onsi/gomega v1.34.1
22+
github.com/prometheus/client_golang v1.19.1
2123
go.uber.org/zap v1.27.0
22-
golang.org/x/sync v0.6.0
23-
golang.org/x/time v0.5.0
24-
k8s.io/api v0.27.1
25-
k8s.io/apimachinery v0.29.0
26-
k8s.io/apiserver v0.26.10
27-
k8s.io/client-go v0.27.1
24+
golang.org/x/sync v0.8.0
25+
golang.org/x/time v0.6.0
26+
k8s.io/api v0.31.0
27+
k8s.io/apimachinery v0.31.0
28+
k8s.io/apiserver v0.31.0
29+
k8s.io/client-go v0.31.0
2830
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626
29-
sigs.k8s.io/controller-runtime v0.14.7
31+
sigs.k8s.io/controller-runtime v0.19.0
3032
sigs.k8s.io/yaml v1.4.0
3133
yunion.io/x/log v0.0.0-20201210064738-43181789dc74 // indirect
3234
yunion.io/x/pkg v0.0.0-20210218105412-13a69f60034c
3335
)
3436

3537
require (
36-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
37-
go.opentelemetry.io/otel v1.21.0
38+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
39+
go.opentelemetry.io/otel v1.28.0
3840
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
3941
go.opentelemetry.io/otel/exporters/zipkin v1.2.0
40-
go.opentelemetry.io/otel/sdk v1.21.0
41-
go.opentelemetry.io/otel/trace v1.21.0
42+
go.opentelemetry.io/otel/sdk v1.28.0
43+
go.opentelemetry.io/otel/trace v1.28.0
4244
)
4345

4446
require (
@@ -50,45 +52,47 @@ require (
5052
github.com/opencontainers/go-digest v1.0.0
5153
github.com/pkg/errors v0.9.1
5254
github.com/robfig/cron/v3 v3.0.1
53-
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
54-
golang.org/x/net v0.24.0
55-
k8s.io/cli-runtime v0.25.2
56-
k8s.io/klog/v2 v2.100.1
55+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
56+
golang.org/x/net v0.30.0
57+
k8s.io/cli-runtime v0.31.0
58+
k8s.io/klog/v2 v2.130.1
5759
)
5860

5961
require (
6062
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
61-
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
63+
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
64+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
6265
github.com/beorn7/perks v1.0.1 // indirect
6366
github.com/blang/semver/v4 v4.0.0 // indirect
6467
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
65-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
68+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6669
github.com/dustin/go-humanize v1.0.1 // indirect
67-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
68-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
70+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6971
github.com/felixge/httpsnoop v1.0.4 // indirect
7072
github.com/fsnotify/fsnotify v1.7.0 // indirect
71-
github.com/go-errors/errors v1.0.1 // indirect
73+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
74+
github.com/go-errors/errors v1.4.2 // indirect
7275
github.com/go-kit/log v0.2.1 // indirect
7376
github.com/go-logfmt/logfmt v0.5.1 // indirect
7477
github.com/go-logr/stdr v1.2.2 // indirect
75-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
76-
github.com/go-openapi/jsonreference v0.20.2 // indirect
77-
github.com/go-openapi/swag v0.22.3 // indirect
78-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
78+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
79+
github.com/go-openapi/jsonreference v0.21.0 // indirect
80+
github.com/go-openapi/swag v0.23.0 // indirect
81+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7982
github.com/gogo/protobuf v1.3.2 // indirect
8083
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
81-
github.com/golang/protobuf v1.5.3 // indirect
84+
github.com/golang/protobuf v1.5.4 // indirect
8285
github.com/google/btree v1.0.1 // indirect
83-
github.com/google/gnostic v0.6.9 // indirect
86+
github.com/google/gnostic-models v0.6.8 // indirect
8487
github.com/google/gofuzz v1.2.0 // indirect
85-
github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 // indirect
88+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
8689
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
87-
github.com/google/uuid v1.5.0 // indirect
90+
github.com/google/uuid v1.6.0 // indirect
91+
github.com/gorilla/websocket v1.5.1 // indirect
8892
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
89-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
93+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect
9094
github.com/hashicorp/golang-lru v1.0.2 // indirect
91-
github.com/imdario/mergo v0.3.15 // indirect
95+
github.com/imdario/mergo v0.3.16 // indirect
9296
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9397
github.com/josharian/intern v1.0.0 // indirect
9498
github.com/json-iterator/go v1.1.12 // indirect
@@ -99,74 +103,65 @@ require (
99103
github.com/mailru/easyjson v0.7.7 // indirect
100104
github.com/mattn/go-colorable v0.1.13 // indirect
101105
github.com/mattn/go-isatty v0.0.16 // indirect
102-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
103106
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
104107
github.com/minio/md5-simd v1.1.2 // indirect
105108
github.com/minio/sha256-simd v1.0.0 // indirect
106-
github.com/moby/spdystream v0.2.0 // indirect
109+
github.com/moby/spdystream v0.4.0 // indirect
110+
github.com/moby/term v0.5.0 // indirect
107111
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
108112
github.com/modern-go/reflect2 v1.0.2 // indirect
109113
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
110114
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
111116
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
112-
github.com/prometheus/client_model v0.4.0 // indirect
113-
github.com/prometheus/common v0.42.0 // indirect
114-
github.com/prometheus/procfs v0.10.1 // indirect
115-
github.com/prometheus/statsd_exporter v0.21.0 // indirect
116-
github.com/rogpeppe/go-internal v1.10.0 // indirect
117+
github.com/prometheus/client_model v0.6.1 // indirect
118+
github.com/prometheus/common v0.55.0 // indirect
119+
github.com/prometheus/procfs v0.15.1 // indirect
120+
github.com/prometheus/statsd_exporter v0.22.7 // indirect
117121
github.com/rs/xid v1.4.0 // indirect
118-
github.com/sergi/go-diff v1.2.0 // indirect
119122
github.com/sirupsen/logrus v1.9.3 // indirect
120123
github.com/spf13/cobra v1.8.1 // indirect
121124
github.com/spf13/pflag v1.0.5 // indirect
122-
github.com/xlab/treeprint v1.1.0 // indirect
125+
github.com/x448/float16 v0.8.4 // indirect
126+
github.com/xlab/treeprint v1.2.0 // indirect
123127
go.opencensus.io v0.24.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
125-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
126-
go.uber.org/atomic v1.10.0 // indirect
127-
go.uber.org/automaxprocs v1.5.3 // indirect
128-
go.uber.org/multierr v1.10.0 // indirect
129-
golang.org/x/crypto v0.22.0 // indirect
130-
golang.org/x/oauth2 v0.16.0 // indirect
131-
golang.org/x/sys v0.22.0 // indirect
132-
golang.org/x/term v0.22.0 // indirect
133-
golang.org/x/text v0.14.0 // indirect
134-
golang.org/x/tools v0.19.0 // indirect
128+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
129+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
130+
go.uber.org/automaxprocs v1.6.0 // indirect
131+
go.uber.org/multierr v1.11.0 // indirect
132+
golang.org/x/crypto v0.28.0 // indirect
133+
golang.org/x/oauth2 v0.22.0 // indirect
134+
golang.org/x/sys v0.26.0 // indirect
135+
golang.org/x/term v0.25.0 // indirect
136+
golang.org/x/text v0.19.0 // indirect
137+
golang.org/x/tools v0.26.0 // indirect
135138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
136-
google.golang.org/api v0.156.0 // indirect
137-
google.golang.org/appengine v1.6.8 // indirect
138-
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
139-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
140-
google.golang.org/grpc v1.60.1 // indirect
141-
google.golang.org/protobuf v1.33.0 // indirect
139+
google.golang.org/api v0.183.0 // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
142+
google.golang.org/grpc v1.67.1 // indirect
143+
google.golang.org/protobuf v1.35.1 // indirect
144+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
142145
gopkg.in/inf.v0 v0.9.1 // indirect
143146
gopkg.in/ini.v1 v1.67.0 // indirect
144147
gopkg.in/yaml.v2 v2.4.0 // indirect
145148
gopkg.in/yaml.v3 v3.0.1 // indirect
146-
k8s.io/apiextensions-apiserver v0.26.10 // indirect
147-
k8s.io/component-base v0.26.10 // indirect
148-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
149+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
150+
k8s.io/component-base v0.31.0 // indirect
151+
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
149152
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
151-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
152-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
153+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
154+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
155+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
153156
)
154157

155158
require (
156159
github.com/golang-jwt/jwt v3.2.2+incompatible
157-
github.com/openzipkin/zipkin-go v0.4.0 // indirect
158-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
160+
github.com/openzipkin/zipkin-go v0.4.3 // indirect
161+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
159162
)
160163

161164
replace (
162165
go.uber.org/zap => github.com/katanomi/zap v1.27.0-katanomi // indirect
163-
knative.dev/pkg => github.com/katanomi/knative-pkg v0.0.0-20240409030957-1aad1aa6fd94
164-
)
165-
166-
// TODO: Remove this once https://github.com/knative/pkg/issues/2759 is fixed
167-
replace (
168-
k8s.io/api => k8s.io/api v0.26.7
169-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
170-
k8s.io/client-go => k8s.io/client-go v0.26.7
171-
k8s.io/code-generator => k8s.io/code-generator v0.26.7
166+
knative.dev/pkg => github.com/katanomi/knative-pkg v0.0.0-20241021183759-9b9d535af5ad
172167
)

0 commit comments

Comments
 (0)