Skip to content

Commit f8dc02b

Browse files
ATGardnerATGardner
committed
fixed rebase
1 parent 545e2d2 commit f8dc02b

File tree

4 files changed

+137
-182
lines changed

4 files changed

+137
-182
lines changed

‎cmd/commands/product-release.go

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/codefresh-io/cli-v2/internal/log"
2424
"github.com/codefresh-io/cli-v2/internal/util"
25-
"github.com/codefresh-io/cli-v2/internal/log"
2625

2726
"github.com/codefresh-io/go-sdk/pkg/client"
2827
platmodel "github.com/codefresh-io/go-sdk/pkg/model/promotion-orchestrator"

‎go.mod

+71-75
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,26 @@ require (
2727
k8s.io/apimachinery v0.31.0
2828
k8s.io/cli-runtime v0.31.0
2929
k8s.io/client-go v0.31.0
30-
k8s.io/kubectl v0.31.0
30+
k8s.io/kubectl v0.31.2
3131
sigs.k8s.io/kustomize/api v0.18.0
3232
sigs.k8s.io/kustomize/kyaml v0.18.1
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

3636
require (
3737
cloud.google.com/go/compute/metadata v0.3.0 // indirect
38-
dario.cat/mergo v1.0.0 // indirect
38+
dario.cat/mergo v1.0.1 // indirect
3939
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4040
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4141
github.com/BurntSushi/toml v1.3.2 // indirect
4242
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4343
github.com/Masterminds/goutils v1.1.1 // indirect
44-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
44+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4545
github.com/Masterminds/squirrel v1.5.4 // indirect
4646
github.com/Microsoft/go-winio v0.6.1 // indirect
47+
github.com/Microsoft/hcsshim v0.11.4 // indirect
4748
github.com/ProtonMail/go-crypto v1.0.0 // indirect
48-
github.com/argoproj/gitops-engine v0.7.1-0.20240715141605-18ba62e1f1fb // indirect
49+
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b // indirect
4950
github.com/argoproj/pkg v0.13.7-0.20230901113346-235a5432ec98 // indirect
5051
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5152
github.com/beorn7/perks v1.0.1 // indirect
@@ -59,13 +60,13 @@ require (
5960
github.com/cloudflare/circl v1.3.7 // indirect
6061
github.com/containerd/containerd v1.7.12 // indirect
6162
github.com/containerd/log v0.1.0 // indirect
62-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
63+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
6364
github.com/creack/pty v1.1.21 // indirect
6465
github.com/cyphar/filepath-securejoin v0.3.2 // indirect
6566
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6667
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6768
github.com/distribution/reference v0.5.0 // indirect
68-
github.com/dlclark/regexp2 v1.11.2 // indirect
69+
github.com/dlclark/regexp2 v1.11.4 // indirect
6970
github.com/docker/cli v25.0.1+incompatible // indirect
7071
github.com/docker/distribution v2.8.3+incompatible // indirect
7172
github.com/docker/docker v25.0.5+incompatible // indirect
@@ -79,13 +80,13 @@ require (
7980
github.com/fatih/camelcase v1.0.0 // indirect
8081
github.com/felixge/httpsnoop v1.0.4 // indirect
8182
github.com/fsnotify/fsnotify v1.7.0 // indirect
82-
github.com/fvbommel/sortorder v1.1.0 // indirect
83+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8384
github.com/go-errors/errors v1.4.2 // indirect
8485
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8586
github.com/go-git/go-billy/v5 v5.5.0 // indirect
8687
github.com/go-git/go-git/v5 v5.12.0 // indirect
8788
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
88-
github.com/go-logr/logr v1.4.1 // indirect
89+
github.com/go-logr/logr v1.4.2 // indirect
8990
github.com/go-logr/stdr v1.2.2 // indirect
9091
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9192
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -99,15 +100,15 @@ require (
99100
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
100101
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
101102
github.com/golang/protobuf v1.5.4 // indirect
102-
github.com/google/btree v1.1.2 // indirect
103+
github.com/google/btree v1.1.3 // indirect
103104
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
104105
github.com/google/go-cmp v0.6.0 // indirect
105106
github.com/google/go-github/v62 v62.0.0 // indirect
106107
github.com/google/go-querystring v1.1.0 // indirect
107108
github.com/google/gofuzz v1.2.0 // indirect
108109
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
109110
github.com/gorilla/mux v1.8.1 // indirect
110-
github.com/gorilla/websocket v1.5.0 // indirect
111+
github.com/gorilla/websocket v1.5.3 // indirect
111112
github.com/gosuri/uitable v0.0.4 // indirect
112113
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
113114
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -142,17 +143,15 @@ require (
142143
github.com/mitchellh/mapstructure v1.5.0 // indirect
143144
github.com/mitchellh/reflectwalk v1.0.2 // indirect
144145
github.com/moby/locker v1.0.1 // indirect
145-
github.com/moby/spdystream v0.2.0 // indirect
146+
github.com/moby/spdystream v0.4.0 // indirect
146147
github.com/moby/term v0.5.0 // indirect
147148
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
148149
github.com/modern-go/reflect2 v1.0.2 // indirect
149150
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
150151
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
151152
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
152-
github.com/onsi/ginkgo/v2 v2.14.0 // indirect
153-
github.com/onsi/gomega v1.30.0 // indirect
154153
github.com/opencontainers/go-digest v1.0.0 // indirect
155-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
154+
github.com/opencontainers/image-spec v1.1.0 // indirect
156155
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
157156
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
158157
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -190,54 +189,50 @@ require (
190189
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
191190
github.com/xlab/treeprint v1.2.0 // indirect
192191
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
193-
github.com/yuin/gopher-lua v1.1.1 // indirect
194-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
195-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
196-
go.opentelemetry.io/otel v1.24.0 // indirect
197-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
198-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
199-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
192+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
193+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
194+
go.opentelemetry.io/otel v1.30.0 // indirect
195+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
196+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
197+
go.uber.org/automaxprocs v1.5.3 // indirect
200198
go.uber.org/multierr v1.11.0 // indirect
201-
golang.org/x/crypto v0.24.0 // indirect
199+
golang.org/x/crypto v0.27.0 // indirect
202200
golang.org/x/mod v0.17.0 // indirect
203-
golang.org/x/net v0.26.0 // indirect
204-
golang.org/x/oauth2 v0.20.0 // indirect
205-
golang.org/x/sync v0.7.0 // indirect
206-
golang.org/x/sys v0.21.0 // indirect
207-
golang.org/x/term v0.21.0 // indirect
208-
golang.org/x/text v0.16.0 // indirect
209-
golang.org/x/time v0.5.0 // indirect
201+
golang.org/x/net v0.29.0 // indirect
202+
golang.org/x/oauth2 v0.23.0 // indirect
203+
golang.org/x/sync v0.8.0 // indirect
204+
golang.org/x/sys v0.25.0 // indirect
205+
golang.org/x/term v0.24.0 // indirect
206+
golang.org/x/text v0.18.0 // indirect
207+
golang.org/x/time v0.6.0 // indirect
210208
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
211209
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
212-
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect
213-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
214-
google.golang.org/grpc v1.63.2 // indirect
215-
google.golang.org/protobuf v1.34.1 // indirect
210+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
211+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
212+
google.golang.org/grpc v1.66.2 // indirect
213+
google.golang.org/protobuf v1.34.2 // indirect
216214
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
217215
gopkg.in/inf.v0 v0.9.1 // indirect
218216
gopkg.in/ini.v1 v1.67.0 // indirect
219217
gopkg.in/warnings.v0 v0.1.2 // indirect
220218
gopkg.in/yaml.v2 v2.4.0 // indirect
221219
gopkg.in/yaml.v3 v3.0.1 // indirect
222-
k8s.io/apiextensions-apiserver v0.30.0 // indirect
223-
k8s.io/apiserver v0.30.0 // indirect
224-
k8s.io/component-base v0.30.0 // indirect
225-
k8s.io/component-helpers v0.29.6 // indirect
226-
k8s.io/klog/v2 v2.120.1 // indirect
227-
k8s.io/kube-aggregator v0.29.6 // indirect
220+
k8s.io/apiextensions-apiserver v0.31.2 // indirect
221+
k8s.io/apiserver v0.31.0 // indirect
222+
k8s.io/component-base v0.31.0 // indirect
223+
k8s.io/component-helpers v0.31.0 // indirect
224+
k8s.io/klog/v2 v2.130.1 // indirect
225+
k8s.io/kube-aggregator v0.31.2 // indirect
228226
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
229-
k8s.io/kubernetes v1.29.6 // indirect
230-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
227+
k8s.io/kubernetes v1.31.0 // indirect
228+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
231229
oras.land/oras-go v1.2.5 // indirect
232-
oras.land/oras-go/v2 v2.3.0 // indirect
230+
oras.land/oras-go/v2 v2.5.0 // indirect
233231
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
234232
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
235233
)
236234

237235
replace (
238-
// https://github.com/golang/go/issues/33546#issuecomment-519656923
239-
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
240-
241236
github.com/go-telegram-bot-api/telegram-bot-api/v5 => github.com/OvyFlash/telegram-bot-api/v5 v5.0.0-20240108230938-63e5c59035bf
242237

243238
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
@@ -249,34 +244,35 @@ replace (
249244
// Avoid CVE-2022-28948
250245
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
251246

252-
k8s.io/api => k8s.io/api v0.29.6
253-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
254-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
255-
k8s.io/apiserver => k8s.io/apiserver v0.29.6
256-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
257-
k8s.io/client-go => k8s.io/client-go v0.29.6
258-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
259-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
260-
k8s.io/code-generator => k8s.io/code-generator v0.29.6
261-
k8s.io/component-base => k8s.io/component-base v0.29.6
262-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
263-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
264-
k8s.io/cri-api => k8s.io/cri-api v0.29.6
265-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
266-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
267-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
268-
k8s.io/kms => k8s.io/kms v0.29.6
269-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
270-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
271-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
272-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
273-
k8s.io/kubectl => k8s.io/kubectl v0.29.6
274-
k8s.io/kubelet => k8s.io/kubelet v0.29.6
275-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
276-
k8s.io/metrics => k8s.io/metrics v0.29.6
277-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
278-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
279-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
280-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
281-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
247+
k8s.io/api => k8s.io/api v0.31.0
248+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
249+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
250+
k8s.io/apiserver => k8s.io/apiserver v0.31.0
251+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
252+
k8s.io/client-go => k8s.io/client-go v0.31.0
253+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
254+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
255+
k8s.io/code-generator => k8s.io/code-generator v0.31.0
256+
k8s.io/component-base => k8s.io/component-base v0.31.0
257+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
258+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
259+
k8s.io/cri-api => k8s.io/cri-api v0.31.0
260+
k8s.io/cri-client => k8s.io/cri-client v0.31.0
261+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
262+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
263+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.0
264+
k8s.io/kms => k8s.io/kms v0.31.0
265+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
266+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
267+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
268+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
269+
k8s.io/kubectl => k8s.io/kubectl v0.31.0
270+
k8s.io/kubelet => k8s.io/kubelet v0.31.0
271+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
272+
k8s.io/metrics => k8s.io/metrics v0.31.0
273+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
274+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
275+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
276+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0
277+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0
282278
)

0 commit comments

Comments
 (0)