Skip to content

Commit b5dce41

Browse files
joelanfordjoelanford
authored
testdata/hybrid: fixup scaffolded versions (#329)
* testdata/hybrid: fixup scaffolded versions Signed-off-by: Joe Lanford <joe.lanford@gmail.com> * pkg/plugins/hybrid: stop pinning controller-runtime Signed-off-by: Joe Lanford <joe.lanford@gmail.com> --------- Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
1 parent 9ebc116 commit b5dce41

File tree

3 files changed

+116
-134
lines changed

3 files changed

+116
-134
lines changed

‎pkg/plugins/hybrid/v1alpha/init.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
"fmt"
1919
"path/filepath"
2020

21-
golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds"
22-
2321
"github.com/spf13/pflag"
2422
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2523
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
@@ -109,19 +107,7 @@ func (p *initSubcommand) Scaffold(fs machinery.Filesystem) error {
109107

110108
scaffolder := scaffolds.NewInitScaffolder(p.config, p.license, p.owner)
111109
scaffolder.InjectFS(fs)
112-
err := scaffolder.Scaffold()
113-
if err != nil {
114-
return err
115-
}
116-
117-
// Ensure that we are pinning the controller-runtime version
118-
// xref: https://github.com/kubernetes-sigs/kubebuilder/issues/997
119-
err = util.RunCmd("Get controller runtime", "go", "get",
120-
"sigs.k8s.io/controller-runtime@"+golangv4.ControllerRuntimeVersion)
121-
if err != nil {
122-
return err
123-
}
124-
return nil
110+
return scaffolder.Scaffold()
125111
}
126112

127113
func (p *initSubcommand) PostScaffold() error {

‎testdata/hybrid/memcached-operator/go.mod

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.21
55
toolchain go1.21.9
66

77
require (
8-
github.com/onsi/ginkgo/v2 v2.14.0
9-
github.com/onsi/gomega v1.30.0
10-
github.com/operator-framework/helm-operator-plugins v0.1.3
11-
k8s.io/apimachinery v0.29.0
12-
k8s.io/client-go v0.29.0
13-
sigs.k8s.io/controller-runtime v0.17.0
8+
github.com/onsi/ginkgo/v2 v2.17.1
9+
github.com/onsi/gomega v1.32.0
10+
github.com/operator-framework/helm-operator-plugins v0.2.0
11+
k8s.io/apimachinery v0.29.2
12+
k8s.io/client-go v0.29.2
13+
sigs.k8s.io/controller-runtime v0.17.2
1414
)
1515

1616
require (
@@ -27,19 +27,19 @@ require (
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2929
github.com/chai2010/gettext-go v1.0.2 // indirect
30-
github.com/containerd/containerd v1.7.11 // indirect
30+
github.com/containerd/containerd v1.7.12 // indirect
3131
github.com/containerd/log v0.1.0 // indirect
3232
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
3333
github.com/davecgh/go-spew v1.1.1 // indirect
34-
github.com/docker/cli v24.0.6+incompatible // indirect
35-
github.com/docker/distribution v2.8.2+incompatible // indirect
36-
github.com/docker/docker v24.0.7+incompatible // indirect
34+
github.com/distribution/reference v0.5.0 // indirect
35+
github.com/docker/cli v25.0.5+incompatible // indirect
36+
github.com/docker/distribution v2.8.3+incompatible // indirect
37+
github.com/docker/docker v25.0.5+incompatible // indirect
3738
github.com/docker/docker-credential-helpers v0.7.0 // indirect
38-
github.com/docker/go-connections v0.4.0 // indirect
39+
github.com/docker/go-connections v0.5.0 // indirect
3940
github.com/docker/go-metrics v0.0.1 // indirect
40-
github.com/docker/go-units v0.5.0 // indirect
4141
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
42-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
42+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
4343
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
4444
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4545
github.com/fatih/color v1.13.0 // indirect
@@ -54,6 +54,7 @@ require (
5454
github.com/go-openapi/jsonreference v0.20.2 // indirect
5555
github.com/go-openapi/swag v0.22.4 // indirect
5656
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
57+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5758
github.com/gobwas/glob v0.2.3 // indirect
5859
github.com/gogo/protobuf v1.3.2 // indirect
5960
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -64,7 +65,7 @@ require (
6465
github.com/google/gofuzz v1.2.0 // indirect
6566
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
6667
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
67-
github.com/google/uuid v1.3.1 // indirect
68+
github.com/google/uuid v1.4.0 // indirect
6869
github.com/gorilla/mux v1.8.0 // indirect
6970
github.com/gorilla/websocket v1.5.0 // indirect
7071
github.com/gosuri/uitable v0.0.4 // indirect
@@ -86,7 +87,6 @@ require (
8687
github.com/mattn/go-colorable v0.1.13 // indirect
8788
github.com/mattn/go-isatty v0.0.17 // indirect
8889
github.com/mattn/go-runewidth v0.0.14 // indirect
89-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9090
github.com/mitchellh/copystructure v1.2.0 // indirect
9191
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9292
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -96,22 +96,21 @@ require (
9696
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9797
github.com/modern-go/reflect2 v1.0.2 // indirect
9898
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
99-
github.com/morikuni/aec v1.0.0 // indirect
10099
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
101100
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
102101
github.com/opencontainers/go-digest v1.0.0 // indirect
103-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
102+
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
104103
github.com/operator-framework/operator-lib v0.12.0 // indirect
105104
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
106105
github.com/pkg/errors v0.9.1 // indirect
107-
github.com/prometheus/client_golang v1.18.0 // indirect
106+
github.com/prometheus/client_golang v1.19.0 // indirect
108107
github.com/prometheus/client_model v0.5.0 // indirect
109-
github.com/prometheus/common v0.45.0 // indirect
108+
github.com/prometheus/common v0.48.0 // indirect
110109
github.com/prometheus/procfs v0.12.0 // indirect
111110
github.com/rivo/uniseg v0.4.2 // indirect
112111
github.com/rubenv/sql-migrate v1.5.2 // indirect
113112
github.com/russross/blackfriday/v2 v2.1.0 // indirect
114-
github.com/sergi/go-diff v1.2.0 // indirect
113+
github.com/sergi/go-diff v1.3.1 // indirect
115114
github.com/shopspring/decimal v1.3.1 // indirect
116115
github.com/sirupsen/logrus v1.9.3 // indirect
117116
github.com/spf13/cast v1.5.0 // indirect
@@ -128,35 +127,35 @@ require (
128127
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
129128
go.uber.org/multierr v1.11.0 // indirect
130129
go.uber.org/zap v1.26.0 // indirect
131-
golang.org/x/crypto v0.17.0 // indirect
130+
golang.org/x/crypto v0.18.0 // indirect
132131
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
133-
golang.org/x/net v0.19.0 // indirect
134-
golang.org/x/oauth2 v0.12.0 // indirect
135-
golang.org/x/sync v0.5.0 // indirect
132+
golang.org/x/net v0.20.0 // indirect
133+
golang.org/x/oauth2 v0.16.0 // indirect
134+
golang.org/x/sync v0.6.0 // indirect
136135
golang.org/x/sys v0.16.0 // indirect
137-
golang.org/x/term v0.15.0 // indirect
136+
golang.org/x/term v0.16.0 // indirect
138137
golang.org/x/text v0.14.0 // indirect
139-
golang.org/x/time v0.3.0 // indirect
140-
golang.org/x/tools v0.16.1 // indirect
138+
golang.org/x/time v0.5.0 // indirect
139+
golang.org/x/tools v0.17.0 // indirect
141140
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
142141
google.golang.org/appengine v1.6.7 // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
144-
google.golang.org/grpc v1.58.3 // indirect
145-
google.golang.org/protobuf v1.31.0 // indirect
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
143+
google.golang.org/grpc v1.59.0 // indirect
144+
google.golang.org/protobuf v1.33.0 // indirect
146145
gopkg.in/inf.v0 v0.9.1 // indirect
147146
gopkg.in/yaml.v2 v2.4.0 // indirect
148147
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
helm.sh/helm/v3 v3.13.3 // indirect
150-
k8s.io/api v0.29.0 // indirect
151-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
152-
k8s.io/apiserver v0.29.0 // indirect
153-
k8s.io/cli-runtime v0.28.5 // indirect
154-
k8s.io/component-base v0.29.0 // indirect
148+
helm.sh/helm/v3 v3.14.3 // indirect
149+
k8s.io/api v0.29.2 // indirect
150+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
151+
k8s.io/apiserver v0.29.2 // indirect
152+
k8s.io/cli-runtime v0.29.2 // indirect
153+
k8s.io/component-base v0.29.2 // indirect
155154
k8s.io/klog/v2 v2.110.1 // indirect
156155
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
157-
k8s.io/kubectl v0.28.5 // indirect
156+
k8s.io/kubectl v0.29.2 // indirect
158157
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
159-
oras.land/oras-go v1.2.4 // indirect
158+
oras.land/oras-go v1.2.5 // indirect
160159
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
161160
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
162161
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect

0 commit comments

Comments
 (0)