Skip to content

Commit 6d83c43

Browse files
rohitagg2020rohitagg2020
authored
Merge pull request #1383 from carvel-dev/ra-k8s-1.28-support
Bumping controller runtime to remove deprecation messages
2 parents 606e658 + 9db0259 commit 6d83c43

File tree

1,915 files changed

+198983
-59444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,915 files changed

+198983
-59444
lines changed

‎.wokeignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# out of our control
22
vendor/
3+
pkg/apiserver/openapi/zz_generated.openapi.go
34
cli/examples/package-authoring/redis-enterprise-operator/upstream/crds/rec_crd.yaml

‎cmd/controller/run.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/client-go/kubernetes"
3232
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // Initialize gcp client auth plugin
3333
"k8s.io/component-base/cli/flag"
34+
"sigs.k8s.io/controller-runtime/pkg/cache"
3435
"sigs.k8s.io/controller-runtime/pkg/client/config"
3536
"sigs.k8s.io/controller-runtime/pkg/controller"
3637
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -66,7 +67,7 @@ func Run(opts Options, runLog logr.Logger) error {
6667
restConfig.Timeout = opts.APIRequestTimeout
6768
}
6869

69-
mgr, err := manager.New(restConfig, manager.Options{Namespace: opts.Namespace,
70+
mgr, err := manager.New(restConfig, manager.Options{Cache: cache.Options{Namespaces: []string{opts.Namespace}},
7071
Scheme: kcconfig.Scheme, MetricsBindAddress: opts.MetricsBindAddress})
7172
if err != nil {
7273
return fmt.Errorf("Setting up overall controller manager: %s", err)
@@ -166,7 +167,7 @@ func Run(opts Options, runLog logr.Logger) error {
166167
return fmt.Errorf("Cannot get kapp-controller namespace")
167168
}
168169

169-
err = reconciler.AttachWatches(ctrl, ns)
170+
err = reconciler.AttachWatches(ctrl, ns, mgr)
170171
if err != nil {
171172
return fmt.Errorf("Setting up Config reconciler watches: %s", err)
172173
}
@@ -216,7 +217,7 @@ func Run(opts Options, runLog logr.Logger) error {
216217
return fmt.Errorf("Setting up Apps reconciler: %s", err)
217218
}
218219

219-
err = reconciler.AttachWatches(ctrl)
220+
err = reconciler.AttachWatches(ctrl, mgr)
220221
if err != nil {
221222
return fmt.Errorf("Setting up Apps reconciler watches: %s", err)
222223
}
@@ -236,7 +237,7 @@ func Run(opts Options, runLog logr.Logger) error {
236237
return fmt.Errorf("Setting up PackageInstalls reconciler: %s", err)
237238
}
238239

239-
err = reconciler.AttachWatches(ctrl)
240+
err = reconciler.AttachWatches(ctrl, mgr)
240241
if err != nil {
241242
return fmt.Errorf("Setting up PackageInstalls reconciler watches: %s", err)
242243
}
@@ -270,7 +271,7 @@ func Run(opts Options, runLog logr.Logger) error {
270271
return fmt.Errorf("Setting up PackageRepositories reconciler: %s", err)
271272
}
272273

273-
err = reconciler.AttachWatches(ctrl)
274+
err = reconciler.AttachWatches(ctrl, mgr)
274275
if err != nil {
275276
return fmt.Errorf("Setting up PackageRepositories reconciler watches: %s", err)
276277
}

‎go.mod‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,122 +6,126 @@ require (
66
github.com/fatih/color v1.13.0 // indirect
77
github.com/gogo/protobuf v1.3.2
88
github.com/google/go-cmp v0.5.9 // indirect
9-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
10-
github.com/prometheus/client_golang v1.14.0
9+
github.com/prometheus/client_golang v1.15.1
1110
github.com/stretchr/testify v1.8.1
1211
github.com/vmware-tanzu/carvel-vendir v0.33.1
1312
golang.org/x/crypto v0.14.0
1413
golang.org/x/text v0.13.0 // indirect
1514
golang.org/x/tools v0.9.1
1615
gopkg.in/yaml.v3 v3.0.1 // indirect
17-
k8s.io/api v0.25.6
18-
k8s.io/apimachinery v0.25.6
19-
k8s.io/apiserver v0.25.6
20-
k8s.io/client-go v0.25.6
21-
k8s.io/code-generator v0.25.6
16+
k8s.io/api v0.27.7
17+
k8s.io/apimachinery v0.27.7
18+
k8s.io/apiserver v0.27.7
19+
k8s.io/client-go v0.27.7
20+
k8s.io/code-generator v0.27.7
2221
k8s.io/kube-aggregator v0.22.17
23-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
24-
sigs.k8s.io/controller-runtime v0.13.1
22+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
23+
sigs.k8s.io/controller-runtime v0.15.3
2524
sigs.k8s.io/controller-tools v0.7.0
2625
sigs.k8s.io/yaml v1.3.0
2726
)
2827

2928
require (
3029
github.com/blang/semver v3.5.1+incompatible
3130
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
32-
github.com/go-logr/logr v1.2.3
31+
github.com/go-logr/logr v1.2.4
3332
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
3433
github.com/spf13/cobra v1.6.1
3534
golang.org/x/sync v0.2.0
3635
gopkg.in/yaml.v2 v2.4.0
37-
k8s.io/component-base v0.25.6
36+
k8s.io/component-base v0.27.7
3837
k8s.io/klog/v2 v2.90.1
39-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
38+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
4039
)
4140

4241
require (
4342
cloud.google.com/go v0.105.0 // indirect
4443
github.com/NYTimes/gziphandler v1.1.1 // indirect
45-
github.com/PuerkitoBio/purell v1.1.1 // indirect
46-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
44+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
45+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4746
github.com/beorn7/perks v1.0.1 // indirect
4847
github.com/blang/semver/v4 v4.0.0 // indirect
4948
github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 // indirect
49+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
5050
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5151
github.com/coreos/go-semver v0.3.0 // indirect
52-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
52+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
5353
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
5454
github.com/davecgh/go-spew v1.1.1 // indirect
5555
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
5656
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5757
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
58-
github.com/felixge/httpsnoop v1.0.1 // indirect
59-
github.com/fsnotify/fsnotify v1.5.4 // indirect
60-
github.com/go-logr/zapr v1.2.3 // indirect
61-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
62-
github.com/go-openapi/jsonreference v0.19.6 // indirect
63-
github.com/go-openapi/swag v0.19.15 // indirect
58+
github.com/felixge/httpsnoop v1.0.3 // indirect
59+
github.com/fsnotify/fsnotify v1.6.0 // indirect
60+
github.com/go-logr/stdr v1.2.2 // indirect
61+
github.com/go-logr/zapr v1.2.4 // indirect
62+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
63+
github.com/go-openapi/jsonreference v0.20.1 // indirect
64+
github.com/go-openapi/swag v0.22.3 // indirect
6465
github.com/gobuffalo/flect v0.2.3 // indirect
6566
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
66-
github.com/golang/protobuf v1.5.2 // indirect
67+
github.com/golang/protobuf v1.5.3 // indirect
68+
github.com/google/cel-go v0.12.7 // indirect
6769
github.com/google/gnostic v0.5.7-v3refs // indirect
6870
github.com/google/gofuzz v1.1.0 // indirect
6971
github.com/google/uuid v1.3.0 // indirect
7072
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
73+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
7174
github.com/hashicorp/go-version v1.2.1 // indirect
7275
github.com/imdario/mergo v0.3.12 // indirect
7376
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7477
github.com/josharian/intern v1.0.0 // indirect
7578
github.com/json-iterator/go v1.1.12 // indirect
76-
github.com/mailru/easyjson v0.7.6 // indirect
79+
github.com/mailru/easyjson v0.7.7 // indirect
7780
github.com/mattn/go-colorable v0.1.12 // indirect
7881
github.com/mattn/go-isatty v0.0.17 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
82+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
83+
github.com/mitchellh/mapstructure v1.4.1 // indirect
8084
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8185
github.com/modern-go/reflect2 v1.0.2 // indirect
8286
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8387
github.com/pkg/errors v0.9.1 // indirect
8488
github.com/pmezard/go-difflib v1.0.0 // indirect
85-
github.com/prometheus/client_model v0.3.0 // indirect
86-
github.com/prometheus/common v0.37.0 // indirect
87-
github.com/prometheus/procfs v0.8.0 // indirect
89+
github.com/prometheus/client_model v0.4.0 // indirect
90+
github.com/prometheus/common v0.42.0 // indirect
91+
github.com/prometheus/procfs v0.9.0 // indirect
8892
github.com/spf13/pflag v1.0.5 // indirect
93+
github.com/stoewer/go-strcase v1.2.0 // indirect
8994
github.com/vito/go-interact v1.0.1 // indirect
9095
go.etcd.io/etcd/api/v3 v3.5.8 // indirect
9196
go.etcd.io/etcd/client/pkg/v3 v3.5.8 // indirect
9297
go.etcd.io/etcd/client/v3 v3.5.8 // indirect
93-
go.opentelemetry.io/contrib v0.20.0 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
95-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
96-
go.opentelemetry.io/otel v0.20.0 // indirect
97-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
98-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
99-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
100-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
101-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
102-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
103-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
98+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
99+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
100+
go.opentelemetry.io/otel v1.10.0 // indirect
101+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
102+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
103+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
104+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
105+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
106+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
107+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
104108
go.uber.org/atomic v1.7.0 // indirect
105109
go.uber.org/multierr v1.6.0 // indirect
106-
go.uber.org/zap v1.21.0 // indirect
110+
go.uber.org/zap v1.24.0 // indirect
107111
golang.org/x/mod v0.10.0 // indirect
108112
golang.org/x/net v0.17.0 // indirect
109-
golang.org/x/oauth2 v0.4.0 // indirect
113+
golang.org/x/oauth2 v0.5.0 // indirect
110114
golang.org/x/sys v0.13.0 // indirect
111115
golang.org/x/term v0.13.0 // indirect
112-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
113-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
116+
golang.org/x/time v0.3.0 // indirect
117+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
114118
google.golang.org/appengine v1.6.7 // indirect
115119
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
116120
google.golang.org/grpc v1.53.0 // indirect
117-
google.golang.org/protobuf v1.28.1 // indirect
118-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
121+
google.golang.org/protobuf v1.30.0 // indirect
119122
gopkg.in/inf.v0 v0.9.1 // indirect
120123
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
121-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
122-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
123-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
124-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
124+
k8s.io/apiextensions-apiserver v0.27.7 // indirect
125+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
126+
k8s.io/kms v0.27.7 // indirect
127+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
128+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
125129
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
126130
)
127131

0 commit comments

Comments
 (0)