Skip to content

Commit d6fdc05

Browse files
fixing scaffolding version issue (#360)
Signed-off-by: Adam D. Cornett <[email protected]> Co-authored-by: Adam D. Cornett <[email protected]>
1 parent 788eb07 commit d6fdc05

File tree

3 files changed

+102
-112
lines changed

3 files changed

+102
-112
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ const (
4141
imageName = "controller:latest"
4242

4343
// TODO: This is a placeholder for now. This would probably be the operator-sdk version
44-
hybridOperatorVersion = "0.2.1"
44+
hybridOperatorVersion = "0.3.0"
4545

4646
// helmPluginVersion is the operator-framework/helm-operator-plugin version to be used in the project
47-
helmPluginVersion = "v0.2.1"
47+
helmPluginVersion = "v0.3.0"
4848
)
4949

5050
var _ plugins.Scaffolder = &initScaffolder{}

testdata/hybrid/memcached-operator/go.mod

+32-34
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module github.com/example/memcached-operator
22

3-
go 1.21
4-
5-
toolchain go1.22.0
3+
go 1.22.0
64

75
require (
86
github.com/onsi/ginkgo/v2 v2.17.1
97
github.com/onsi/gomega v1.32.0
10-
github.com/operator-framework/helm-operator-plugins v0.2.1
11-
k8s.io/apimachinery v0.29.2
12-
k8s.io/client-go v0.29.2
13-
sigs.k8s.io/controller-runtime v0.17.3
8+
github.com/operator-framework/helm-operator-plugins v0.3.0
9+
k8s.io/apimachinery v0.30.0
10+
k8s.io/client-go v0.30.0
11+
sigs.k8s.io/controller-runtime v0.18.2
1412
)
1513

1614
require (
@@ -38,9 +36,9 @@ require (
3836
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3937
github.com/docker/go-connections v0.5.0 // indirect
4038
github.com/docker/go-metrics v0.0.1 // indirect
41-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
4240
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
43-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
41+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4442
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4543
github.com/fatih/color v1.13.0 // indirect
4644
github.com/felixge/httpsnoop v1.0.3 // indirect
@@ -50,22 +48,22 @@ require (
5048
github.com/go-logr/logr v1.4.1 // indirect
5149
github.com/go-logr/stdr v1.2.2 // indirect
5250
github.com/go-logr/zapr v1.3.0 // indirect
53-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
54-
github.com/go-openapi/jsonreference v0.20.2 // indirect
55-
github.com/go-openapi/swag v0.22.4 // indirect
51+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
52+
github.com/go-openapi/jsonreference v0.20.4 // indirect
53+
github.com/go-openapi/swag v0.22.9 // indirect
5654
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5755
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5856
github.com/gobwas/glob v0.2.3 // indirect
5957
github.com/gogo/protobuf v1.3.2 // indirect
6058
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
61-
github.com/golang/protobuf v1.5.3 // indirect
59+
github.com/golang/protobuf v1.5.4 // indirect
6260
github.com/google/btree v1.1.2 // indirect
6361
github.com/google/gnostic-models v0.6.8 // indirect
6462
github.com/google/go-cmp v0.6.0 // indirect
6563
github.com/google/gofuzz v1.2.0 // indirect
6664
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
6765
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
68-
github.com/google/uuid v1.4.0 // indirect
66+
github.com/google/uuid v1.6.0 // indirect
6967
github.com/gorilla/mux v1.8.0 // indirect
7068
github.com/gorilla/websocket v1.5.0 // indirect
7169
github.com/gosuri/uitable v0.0.4 // indirect
@@ -100,11 +98,11 @@ require (
10098
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
10199
github.com/opencontainers/go-digest v1.0.0 // indirect
102100
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
103-
github.com/operator-framework/operator-lib v0.12.0 // indirect
101+
github.com/operator-framework/operator-lib v0.14.0 // indirect
104102
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
105103
github.com/pkg/errors v0.9.1 // indirect
106104
github.com/prometheus/client_golang v1.19.0 // indirect
107-
github.com/prometheus/client_model v0.5.0 // indirect
105+
github.com/prometheus/client_model v0.6.1 // indirect
108106
github.com/prometheus/common v0.48.0 // indirect
109107
github.com/prometheus/procfs v0.12.0 // indirect
110108
github.com/rivo/uniseg v0.4.2 // indirect
@@ -127,34 +125,34 @@ require (
127125
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
128126
go.uber.org/multierr v1.11.0 // indirect
129127
go.uber.org/zap v1.26.0 // indirect
130-
golang.org/x/crypto v0.18.0 // indirect
131-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
132-
golang.org/x/net v0.20.0 // indirect
133-
golang.org/x/oauth2 v0.16.0 // indirect
128+
golang.org/x/crypto v0.21.0 // indirect
129+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
130+
golang.org/x/net v0.23.0 // indirect
131+
golang.org/x/oauth2 v0.17.0 // indirect
134132
golang.org/x/sync v0.6.0 // indirect
135-
golang.org/x/sys v0.16.0 // indirect
136-
golang.org/x/term v0.16.0 // indirect
133+
golang.org/x/sys v0.18.0 // indirect
134+
golang.org/x/term v0.18.0 // indirect
137135
golang.org/x/text v0.14.0 // indirect
138136
golang.org/x/time v0.5.0 // indirect
139-
golang.org/x/tools v0.17.0 // indirect
137+
golang.org/x/tools v0.18.0 // indirect
140138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141-
google.golang.org/appengine v1.6.7 // indirect
139+
google.golang.org/appengine v1.6.8 // indirect
142140
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
143141
google.golang.org/grpc v1.59.0 // indirect
144142
google.golang.org/protobuf v1.33.0 // indirect
145143
gopkg.in/inf.v0 v0.9.1 // indirect
146144
gopkg.in/yaml.v2 v2.4.0 // indirect
147145
gopkg.in/yaml.v3 v3.0.1 // 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
154-
k8s.io/klog/v2 v2.110.1 // indirect
155-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
156-
k8s.io/kubectl v0.29.2 // indirect
157-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
146+
helm.sh/helm/v3 v3.15.0 // indirect
147+
k8s.io/api v0.30.0 // indirect
148+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
149+
k8s.io/apiserver v0.30.0 // indirect
150+
k8s.io/cli-runtime v0.30.0 // indirect
151+
k8s.io/component-base v0.30.0 // indirect
152+
k8s.io/klog/v2 v2.120.1 // indirect
153+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
154+
k8s.io/kubectl v0.30.0 // indirect
155+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
158156
oras.land/oras-go v1.2.5 // indirect
159157
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
160158
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect

0 commit comments

Comments
 (0)