Skip to content

Commit 3d73bac

Browse files
authored
Merge 81ceaa3 into bfa125e
2 parents bfa125e + 81ceaa3 commit 3d73bac

File tree

641 files changed

+29381
-6844
lines changed

Some content is hidden

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

641 files changed

+29381
-6844
lines changed

docs/website/docs/user-guides/quickstart/docs-mdx/dotnet/dotnet_odo_init_output.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Interactive mode enabled, please answer the following questions:
1111
Based on the files in the current directory odo detected
1212
Language: .NET
1313
Project type: dotnet
14-
The devfile "dotnet50:1.0.3" from the registry "DefaultDevfileRegistry" will be downloaded.
14+
The devfile "dotnet60:1.0.2" from the registry "DefaultDevfileRegistry" will be downloaded.
1515
? Is this correct? No
1616
? Select language: .NET
1717
? Select project type: .NET 6.0

docs/website/docs/user-guides/quickstart/docs-mdx/nodejs/nodejs_odo_init_output.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Interactive mode enabled, please answer the following questions:
1111
Based on the files in the current directory odo detected
1212
Language: JavaScript
1313
Project type: Node.js
14+
Application ports: 3000
1415
The devfile "nodejs:2.1.1" from the registry "DefaultDevfileRegistry" will be downloaded.
1516
? Is this correct? Yes
1617
✓ Downloading devfile "nodejs:2.1.1" from registry "DefaultDevfileRegistry" [3s]

go.mod

Lines changed: 62 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,45 @@ require (
2828
github.com/mattn/go-colorable v0.1.13
2929
github.com/olekukonko/tablewriter v0.0.5
3030
github.com/onsi/ginkgo v1.16.5
31-
github.com/onsi/ginkgo/v2 v2.8.0
32-
github.com/onsi/gomega v1.26.0
31+
github.com/onsi/ginkgo/v2 v2.9.5
32+
github.com/onsi/gomega v1.27.7
3333
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
3434
github.com/openshift/client-go v0.0.0-20220603133046-984ee5ebedcf
3535
github.com/openshift/oc v0.0.0-alpha.0.0.20220402064836-f1f09a392fd1
3636
github.com/operator-framework/api v0.17.3
3737
github.com/operator-framework/operator-lifecycle-manager v0.21.2
3838
github.com/pborman/uuid v1.2.1
3939
github.com/posener/complete v1.2.3
40-
github.com/redhat-developer/alizer/go v0.0.0-20230331140053-a1115da45e0c
40+
github.com/redhat-developer/alizer/go v0.0.0-20230619172619-14114f066cef
4141
github.com/redhat-developer/service-binding-operator v1.0.1-0.20211222115357-5b7bbba3bfb3
4242
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
4343
github.com/securego/gosec/v2 v2.15.0
4444
github.com/segmentio/backo-go v1.0.1
4545
github.com/sethvargo/go-envconfig v0.9.0
4646
github.com/spf13/afero v1.6.0
47-
github.com/spf13/cobra v1.6.1
47+
github.com/spf13/cobra v1.7.0
4848
github.com/spf13/pflag v1.0.5
4949
github.com/tidwall/gjson v1.14.4
5050
github.com/zalando/go-keyring v0.2.1
51-
golang.org/x/sync v0.1.0
52-
golang.org/x/sys v0.5.0
53-
golang.org/x/term v0.5.0
54-
golang.org/x/text v0.7.0
51+
golang.org/x/sync v0.2.0
52+
golang.org/x/sys v0.8.0
53+
golang.org/x/term v0.8.0
54+
golang.org/x/text v0.9.0
5555
gopkg.in/AlecAivazis/survey.v1 v1.8.8
5656
gopkg.in/segmentio/analytics-go.v3 v3.0.0-00010101000000-000000000000
5757
gopkg.in/yaml.v2 v2.4.0
5858
gopkg.in/yaml.v3 v3.0.1
59-
k8s.io/api v0.26.1
60-
k8s.io/apiextensions-apiserver v0.26.1
61-
k8s.io/apimachinery v0.26.1
59+
k8s.io/api v0.27.2
60+
k8s.io/apiextensions-apiserver v0.27.2
61+
k8s.io/apimachinery v0.27.2
6262
k8s.io/cli-runtime v0.24.0
63-
k8s.io/client-go v0.26.1
63+
k8s.io/client-go v0.27.2
6464
k8s.io/klog v1.0.0
65-
k8s.io/klog/v2 v2.80.1
65+
k8s.io/klog/v2 v2.90.1
6666
k8s.io/kubectl v0.24.0
6767
k8s.io/pod-security-admission v0.26.1
68-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
69-
sigs.k8s.io/controller-runtime v0.14.4
68+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
69+
sigs.k8s.io/controller-runtime v0.15.0
7070
sigs.k8s.io/yaml v1.3.0
7171
)
7272

@@ -76,22 +76,22 @@ require (
7676
github.com/ActiveState/vt10x v1.3.1 // indirect
7777
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
7878
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
79-
github.com/Microsoft/go-winio v0.6.0 // indirect
79+
github.com/Microsoft/go-winio v0.6.1 // indirect
8080
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 // indirect
81-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
81+
github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5 // indirect
8282
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 // indirect
8383
github.com/acomagu/bufpipe v1.0.4 // indirect
8484
github.com/alessio/shellescape v1.4.1 // indirect
8585
github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 // indirect
8686
github.com/apcera/gssapi v0.0.0-00010101000000-000000000000 // indirect
8787
github.com/beorn7/perks v1.0.1 // indirect
8888
github.com/blang/semver/v4 v4.0.0 // indirect
89-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
89+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
9090
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
91-
github.com/cloudflare/circl v1.3.1 // indirect
91+
github.com/cloudflare/circl v1.3.2 // indirect
9292
github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6 // indirect
9393
github.com/containerd/typeurl v1.0.2 // indirect
94-
github.com/creack/pty v1.1.17 // indirect
94+
github.com/creack/pty v1.1.18 // indirect
9595
github.com/danieljoos/wincred v1.1.0 // indirect
9696
github.com/davecgh/go-spew v1.1.1 // indirect
9797
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect
@@ -111,14 +111,15 @@ require (
111111
github.com/go-errors/errors v1.0.1 // indirect
112112
github.com/go-git/gcfg v1.5.0 // indirect
113113
github.com/go-git/go-billy/v5 v5.4.1 // indirect
114-
github.com/go-logr/logr v1.2.3 // indirect
114+
github.com/go-logr/logr v1.2.4 // indirect
115+
github.com/go-logr/zapr v1.2.4 // indirect
115116
github.com/go-openapi/swag v0.22.3 // indirect
116-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
117+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
117118
github.com/gobwas/glob v0.2.3 // indirect
118119
github.com/godbus/dbus/v5 v5.0.6 // indirect
119120
github.com/gogo/protobuf v1.3.2 // indirect
120121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
121-
github.com/golang/protobuf v1.5.2 // indirect
122+
github.com/golang/protobuf v1.5.3 // indirect
122123
github.com/google/btree v1.0.1 // indirect
123124
github.com/google/gnostic v0.5.7-v3refs // indirect
124125
github.com/google/gofuzz v1.2.0 // indirect
@@ -132,8 +133,8 @@ require (
132133
github.com/hashicorp/go-multierror v1.1.1 // indirect
133134
github.com/hashicorp/go-version v1.4.0 // indirect
134135
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02 // indirect
135-
github.com/imdario/mergo v0.3.13 // indirect
136-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
136+
github.com/imdario/mergo v0.3.15 // indirect
137+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
137138
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
138139
github.com/jessevdk/go-flags v1.5.0 // indirect
139140
github.com/josharian/intern v1.0.0 // indirect
@@ -146,14 +147,14 @@ require (
146147
github.com/mailru/easyjson v0.7.7 // indirect
147148
github.com/mattn/go-isatty v0.0.17 // indirect
148149
github.com/mattn/go-runewidth v0.0.13 // indirect
149-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
150+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
150151
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
151152
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
152153
github.com/mitchellh/reflectwalk v1.0.1 // indirect
153154
github.com/moby/buildkit v0.10.6 // indirect
154155
github.com/moby/locker v1.0.1 // indirect
155156
github.com/moby/spdystream v0.2.0 // indirect
156-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
157+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
157158
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
158159
github.com/modern-go/reflect2 v1.0.2 // indirect
159160
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -167,14 +168,14 @@ require (
167168
github.com/pjbgf/sha1cd v0.3.0 // indirect
168169
github.com/pkg/errors v0.9.1 // indirect
169170
github.com/pmezard/go-difflib v1.0.0 // indirect
170-
github.com/prometheus/client_golang v1.14.0 // indirect
171-
github.com/prometheus/client_model v0.3.0 // indirect
172-
github.com/prometheus/common v0.37.0 // indirect
173-
github.com/prometheus/procfs v0.8.0 // indirect
171+
github.com/prometheus/client_golang v1.15.1 // indirect
172+
github.com/prometheus/client_model v0.4.0 // indirect
173+
github.com/prometheus/common v0.42.0 // indirect
174+
github.com/prometheus/procfs v0.9.0 // indirect
174175
github.com/rivo/uniseg v0.2.0 // indirect
175176
github.com/russross/blackfriday v1.5.2 // indirect
176-
github.com/sergi/go-diff v1.2.0 // indirect
177-
github.com/sirupsen/logrus v1.8.1 // indirect
177+
github.com/sergi/go-diff v1.3.1 // indirect
178+
github.com/sirupsen/logrus v1.9.0 // indirect
178179
github.com/skeema/knownhosts v1.1.0 // indirect
179180
github.com/stretchr/testify v1.8.1 // indirect
180181
github.com/tidwall/match v1.1.1 // indirect
@@ -186,24 +187,27 @@ require (
186187
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
187188
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
188189
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
189-
golang.org/x/crypto v0.6.0 // indirect
190-
golang.org/x/mod v0.7.0 // indirect
191-
golang.org/x/net v0.7.0 // indirect
192-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
190+
go.uber.org/atomic v1.7.0 // indirect
191+
go.uber.org/multierr v1.6.0 // indirect
192+
go.uber.org/zap v1.24.0 // indirect
193+
golang.org/x/crypto v0.8.0 // indirect
194+
golang.org/x/mod v0.10.0 // indirect
195+
golang.org/x/net v0.10.0 // indirect
196+
golang.org/x/oauth2 v0.5.0 // indirect
193197
golang.org/x/time v0.3.0 // indirect
194-
golang.org/x/tools v0.5.0 // indirect
195-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
198+
golang.org/x/tools v0.9.1 // indirect
199+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
196200
google.golang.org/appengine v1.6.7 // indirect
197201
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
198-
google.golang.org/grpc v1.49.0 // indirect
199-
google.golang.org/protobuf v1.28.1 // indirect
202+
google.golang.org/grpc v1.51.0 // indirect
203+
google.golang.org/protobuf v1.30.0 // indirect
200204
gopkg.in/inf.v0 v0.9.1 // indirect
201205
gopkg.in/warnings.v0 v0.1.2 // indirect
202-
k8s.io/apiserver v0.26.1 // indirect
203-
k8s.io/component-base v0.26.1 // indirect
204-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
206+
k8s.io/apiserver v0.27.2 // indirect
207+
k8s.io/component-base v0.27.2 // indirect
208+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
205209
oras.land/oras-go v1.1.0 // indirect
206-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
210+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
207211
sigs.k8s.io/kustomize/api v0.11.4 // indirect
208212
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
209213
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
@@ -212,3 +216,16 @@ require (
212216
replace gopkg.in/segmentio/analytics-go.v3 => github.com/segmentio/analytics-go/v3 v3.2.1
213217

214218
replace github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
219+
220+
// We are pinning the versions here because bumping Alizer bumped these packages to upper versions,
221+
// which were not compatible with the Service Binding Operator (SBO) version at this time.
222+
// Example error: *ServiceBinding does not implement admission.Validator (wrong type for ValidateCreate method)
223+
// But we don't want to update SBO libraries at this time, as SBO is currently in maintenance mode only.
224+
// TODO(rm3l): remove these when we remove support for SBO.
225+
replace (
226+
k8s.io/api => k8s.io/api v0.26.1
227+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.1
228+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.1
229+
k8s.io/client-go => k8s.io/client-go v0.26.1
230+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.4
231+
)

0 commit comments

Comments
 (0)