Skip to content

Commit ad62b84

Browse files
mhenriksmhenriks
authored
Merge pull request #25 from akalenyu/bump-ctrl-runtime-golang
Bump sigs.k8s.io/controller-runtime to 16.3
2 parents 4f97213 + 2b7aebd commit ad62b84

File tree

5,596 files changed

+651531
-361413
lines changed

Some content is hidden

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

5,596 files changed

+651531
-361413
lines changed

‎examples/sample-operator/build/operator/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17 AS builder
1+
FROM golang:1.20 AS builder
22
WORKDIR /src/sample-operator/
33
COPY . .
44
ENV GOFLAGS=-mod=vendor

‎examples/sample-operator/cluster/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function debug {
1010

1111
# Install golang
1212
function ensure_golang {
13-
GOVERSION='go1.17.5.linux-amd64.tar.gz'
13+
GOVERSION='go1.20.10.linux-amd64.tar.gz'
1414
if [[ "$(go version 2>&1)" =~ "not found" ]]; then
1515
wget -q https://dl.google.com/go/${GOVERSION}
1616
tar -C /usr/local -xzf ${GOVERSION}

‎examples/sample-operator/cmd/manager/main.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ import (
2121
v1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/util/intstr"
2323
"k8s.io/client-go/rest"
24+
"sigs.k8s.io/controller-runtime/pkg/cache"
2425
"sigs.k8s.io/controller-runtime/pkg/client/config"
2526
logf "sigs.k8s.io/controller-runtime/pkg/log"
2627
"sigs.k8s.io/controller-runtime/pkg/manager"
2728
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
29+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
2830

2931
"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/apis"
3032
"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/controller"
@@ -92,8 +94,14 @@ func main() {
9294

9395
// Create a new Cmd to provide shared dependencies and start components
9496
mgr, err := manager.New(cfg, manager.Options{
95-
Namespace: namespace,
96-
MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
97+
Cache: cache.Options{
98+
DefaultNamespaces: map[string]cache.Config{
99+
namespace: {},
100+
},
101+
},
102+
Metrics: server.Options{
103+
BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
104+
},
97105
})
98106
if err != nil {
99107
log.Error(err, "")

‎examples/sample-operator/go.mod‎

Lines changed: 206 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,227 @@
11
module kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator
22

3-
go 1.13
3+
go 1.20
44

55
require (
66
github.com/kelseyhightower/envconfig v1.4.0
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.19.0
8+
github.com/onsi/gomega v1.27.10
99
github.com/operator-framework/operator-sdk v0.18.0
1010
github.com/pkg/errors v0.9.1
1111
github.com/spf13/pflag v1.0.5
12-
golang.org/x/tools v0.1.10
13-
k8s.io/api v0.23.5
14-
k8s.io/apimachinery v0.23.5
12+
golang.org/x/tools v0.9.3
13+
k8s.io/api v0.28.3
14+
k8s.io/apimachinery v0.28.3
1515
k8s.io/client-go v12.0.0+incompatible
16-
k8s.io/code-generator v0.23.5
16+
k8s.io/code-generator v0.28.3
1717
kubevirt.io/client-go v0.32.0
1818
kubevirt.io/controller-lifecycle-operator-sdk v0.0.7
1919
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-00010101000000-000000000000
20-
sigs.k8s.io/controller-runtime v0.11.1
20+
sigs.k8s.io/controller-runtime v0.16.3
2121
)
2222

23-
replace k8s.io/client-go => k8s.io/client-go v0.23.5
23+
require (
24+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25+
github.com/BurntSushi/toml v0.3.1 // indirect
26+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
27+
github.com/Masterminds/goutils v1.1.0 // indirect
28+
github.com/Masterminds/semver/v3 v3.1.0 // indirect
29+
github.com/Masterminds/sprig/v3 v3.1.0 // indirect
30+
github.com/Masterminds/squirrel v1.2.0 // indirect
31+
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 // indirect
32+
github.com/Microsoft/hcsshim v0.8.7 // indirect
33+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
34+
github.com/appscode/jsonpatch v1.0.1 // indirect
35+
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
36+
github.com/beorn7/perks v1.0.1 // indirect
37+
github.com/blang/semver v3.5.1+incompatible // indirect
38+
github.com/blang/semver/v4 v4.0.0 // indirect
39+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
40+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
41+
github.com/chai2010/gettext-go v1.0.2 // indirect
42+
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f // indirect
43+
github.com/containerd/containerd v1.3.2 // indirect
44+
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
45+
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de // indirect
46+
github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc // indirect
47+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
48+
github.com/davecgh/go-spew v1.1.1 // indirect
49+
github.com/deislabs/oras v0.8.1 // indirect
50+
github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 // indirect
51+
github.com/docker/distribution v2.8.2+incompatible // indirect
52+
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce // indirect
53+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
54+
github.com/docker/go-connections v0.4.0 // indirect
55+
github.com/docker/go-metrics v0.0.1 // indirect
56+
github.com/docker/go-units v0.4.0 // indirect
57+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
58+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
59+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
60+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
61+
github.com/fatih/color v1.12.0 // indirect
62+
github.com/fatih/structtag v1.1.0 // indirect
63+
github.com/felixge/httpsnoop v1.0.3 // indirect
64+
github.com/fsnotify/fsnotify v1.6.0 // indirect
65+
github.com/ghodss/yaml v1.0.0 // indirect
66+
github.com/go-errors/errors v1.4.2 // indirect
67+
github.com/go-logr/logr v1.2.4 // indirect
68+
github.com/go-logr/stdr v1.2.2 // indirect
69+
github.com/go-logr/zapr v1.2.4 // indirect
70+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
71+
github.com/go-openapi/jsonreference v0.20.2 // indirect
72+
github.com/go-openapi/swag v0.22.3 // indirect
73+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
74+
github.com/gobuffalo/envy v1.7.1 // indirect
75+
github.com/gobuffalo/flect v0.2.3 // indirect
76+
github.com/gobwas/glob v0.2.3 // indirect
77+
github.com/gogo/protobuf v1.3.2 // indirect
78+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
79+
github.com/golang/protobuf v1.5.3 // indirect
80+
github.com/google/btree v1.0.1 // indirect
81+
github.com/google/cel-go v0.16.1 // indirect
82+
github.com/google/gnostic-models v0.6.8 // indirect
83+
github.com/google/go-cmp v0.5.9 // indirect
84+
github.com/google/gofuzz v1.2.0 // indirect
85+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
86+
github.com/google/uuid v1.3.0 // indirect
87+
github.com/gorilla/mux v1.8.0 // indirect
88+
github.com/gosuri/uitable v0.0.4 // indirect
89+
github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
90+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
91+
github.com/hashicorp/hcl v1.0.0 // indirect
92+
github.com/huandu/xstrings v1.3.1 // indirect
93+
github.com/iancoleman/strcase v0.2.0 // indirect
94+
github.com/imdario/mergo v0.3.12 // indirect
95+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
96+
github.com/jmoiron/sqlx v1.2.0 // indirect
97+
github.com/joho/godotenv v1.3.0 // indirect
98+
github.com/josharian/intern v1.0.0 // indirect
99+
github.com/json-iterator/go v1.1.12 // indirect
100+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
101+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
102+
github.com/lib/pq v1.3.0 // indirect
103+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
104+
github.com/magiconair/properties v1.8.5 // indirect
105+
github.com/mailru/easyjson v0.7.7 // indirect
106+
github.com/markbates/inflect v1.0.4 // indirect
107+
github.com/mattn/go-colorable v0.1.8 // indirect
108+
github.com/mattn/go-isatty v0.0.16 // indirect
109+
github.com/mattn/go-runewidth v0.0.7 // indirect
110+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
111+
github.com/mitchellh/copystructure v1.0.0 // indirect
112+
github.com/mitchellh/go-homedir v1.1.0 // indirect
113+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
114+
github.com/mitchellh/mapstructure v1.4.1 // indirect
115+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
116+
github.com/moby/spdystream v0.2.0 // indirect
117+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
118+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
119+
github.com/modern-go/reflect2 v1.0.2 // indirect
120+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
121+
github.com/morikuni/aec v1.0.0 // indirect
122+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
124+
github.com/nxadm/tail v1.4.8 // indirect
125+
github.com/opencontainers/go-digest v1.0.0 // indirect
126+
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect
127+
github.com/opencontainers/runc v1.0.0-rc9 // indirect
128+
github.com/openshift/custom-resource-status v1.1.2 // indirect
129+
github.com/operator-framework/api v0.3.7-0.20200528122852-759ca0d84007 // indirect
130+
github.com/operator-framework/operator-registry v1.12.4 // indirect
131+
github.com/otiai10/copy v1.0.2 // indirect
132+
github.com/pborman/uuid v1.2.0 // indirect
133+
github.com/pelletier/go-toml v1.9.3 // indirect
134+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
135+
github.com/pmezard/go-difflib v1.0.0 // indirect
136+
github.com/prometheus/client_golang v1.16.0 // indirect
137+
github.com/prometheus/client_model v0.4.0 // indirect
138+
github.com/prometheus/common v0.44.0 // indirect
139+
github.com/prometheus/procfs v0.10.1 // indirect
140+
github.com/rogpeppe/go-internal v1.10.0 // indirect
141+
github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 // indirect
142+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
143+
github.com/sergi/go-diff v1.1.0 // indirect
144+
github.com/sirupsen/logrus v1.9.0 // indirect
145+
github.com/spf13/afero v1.9.2 // indirect
146+
github.com/spf13/cast v1.3.1 // indirect
147+
github.com/spf13/cobra v1.7.0 // indirect
148+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
149+
github.com/spf13/viper v1.8.1 // indirect
150+
github.com/stoewer/go-strcase v1.2.0 // indirect
151+
github.com/stretchr/testify v1.8.2 // indirect
152+
github.com/subosito/gotenv v1.2.0 // indirect
153+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
154+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
155+
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
156+
github.com/xlab/treeprint v1.2.0 // indirect
157+
go.etcd.io/bbolt v1.3.7 // indirect
158+
go.opencensus.io v0.24.0 // indirect
159+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
160+
go.opentelemetry.io/otel v1.10.0 // indirect
161+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
162+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
163+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
164+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
165+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
166+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
167+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
168+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
169+
go.uber.org/multierr v1.11.0 // indirect
170+
go.uber.org/zap v1.25.0 // indirect
171+
golang.org/x/crypto v0.14.0 // indirect
172+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
173+
golang.org/x/mod v0.10.0 // indirect
174+
golang.org/x/net v0.17.0 // indirect
175+
golang.org/x/oauth2 v0.8.0 // indirect
176+
golang.org/x/sync v0.2.0 // indirect
177+
golang.org/x/sys v0.13.0 // indirect
178+
golang.org/x/term v0.13.0 // indirect
179+
golang.org/x/text v0.13.0 // indirect
180+
golang.org/x/time v0.3.0 // indirect
181+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
182+
gomodules.xyz/jsonpatch/v3 v3.0.1 // indirect
183+
gomodules.xyz/orderedmap v0.1.0 // indirect
184+
google.golang.org/appengine v1.6.7 // indirect
185+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
186+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
187+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
188+
google.golang.org/grpc v1.54.0 // indirect
189+
google.golang.org/protobuf v1.30.0 // indirect
190+
gopkg.in/gorp.v1 v1.7.2 // indirect
191+
gopkg.in/inf.v0 v0.9.1 // indirect
192+
gopkg.in/ini.v1 v1.62.0 // indirect
193+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
194+
gopkg.in/yaml.v2 v2.4.0 // indirect
195+
gopkg.in/yaml.v3 v3.0.1 // indirect
196+
helm.sh/helm/v3 v3.2.0 // indirect
197+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
198+
k8s.io/apiserver v0.28.3 // indirect
199+
k8s.io/cli-runtime v0.28.3 // indirect
200+
k8s.io/component-base v0.28.3 // indirect
201+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
202+
k8s.io/klog v1.0.0 // indirect
203+
k8s.io/klog/v2 v2.100.1 // indirect
204+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
205+
k8s.io/kube-state-metrics v1.7.2 // indirect
206+
k8s.io/kubectl v0.18.2 // indirect
207+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
208+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
209+
sigs.k8s.io/controller-tools v0.8.0 // indirect
210+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
211+
sigs.k8s.io/kubebuilder v1.0.9-0.20200513134826-f07a0146a40b // indirect
212+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
213+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
214+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
215+
sigs.k8s.io/yaml v1.3.0 // indirect
216+
)
217+
218+
replace k8s.io/client-go => k8s.io/client-go v0.28.3
24219

25-
replace k8s.io/api => k8s.io/api v0.23.5
220+
replace k8s.io/api => k8s.io/api v0.28.3
26221

27-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.5
222+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
28223

29-
replace k8s.io/kubectl => k8s.io/kubectl v0.23.5
224+
replace k8s.io/kubectl => k8s.io/kubectl v0.28.3
30225

31226
replace vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
32227

0 commit comments

Comments
 (0)