Skip to content

Commit c48f4cf

Browse files
authored
chore: upgrade ocm version (#135)
<!-- markdownlint-disable MD041 --> #### What this PR does / why we need it upgrade ocm version to version after package restructuring (huge achievement)! #### Which issue(s) this PR fixes <!-- Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. -->
1 parent 9ff3f07 commit c48f4cf

File tree

5 files changed

+197
-119
lines changed

5 files changed

+197
-119
lines changed

go.mod

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ require (
2424
github.com/fluxcd/pkg/version v0.6.0
2525
github.com/fluxcd/source-controller/api v1.5.0
2626
github.com/open-component-model/git-controller v0.12.1
27-
github.com/open-component-model/ocm v0.11.0
2827
github.com/open-component-model/ocm-controller v0.25.4
2928
github.com/open-component-model/replication-controller v0.13.1
3029
k8s.io/api v0.32.3
3130
k8s.io/apiextensions-apiserver v0.32.3
3231
k8s.io/apimachinery v0.32.3
3332
k8s.io/cli-runtime v0.32.3
3433
k8s.io/client-go v0.32.3
34+
ocm.software/ocm v0.14.0
3535
sigs.k8s.io/controller-runtime v0.20.3
3636
sigs.k8s.io/e2e-framework v0.6.0
3737
sigs.k8s.io/kustomize/api v0.19.0
@@ -42,7 +42,6 @@ require (
4242
cloud.google.com/go/auth v0.9.3 // indirect
4343
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
4444
cloud.google.com/go/compute/metadata v0.6.0 // indirect
45-
cuelabs.dev/go/oci/ociregistry v0.0.0-20240404174027-a39bec0462d2 // indirect
4645
filippo.io/edwards25519 v1.1.0 // indirect
4746
github.com/42wim/httpsig v1.2.1 // indirect
4847
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
@@ -63,6 +62,8 @@ require (
6362
github.com/Microsoft/go-winio v0.6.2 // indirect
6463
github.com/ProtonMail/go-crypto v1.1.5 // indirect
6564
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
65+
github.com/a8m/envsubst v1.4.2 // indirect
66+
github.com/alecthomas/participle/v2 v2.1.1 // indirect
6667
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
6768
github.com/alibabacloud-go/cr-20160607 v1.0.1 // indirect
6869
github.com/alibabacloud-go/cr-20181201 v1.0.10 // indirect
@@ -76,22 +77,22 @@ require (
7677
github.com/aliyun/credentials-go v1.3.4 // indirect
7778
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7879
github.com/aws/aws-sdk-go-v2 v1.35.0 // indirect
79-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
80+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
8081
github.com/aws/aws-sdk-go-v2/config v1.29.3 // indirect
8182
github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
8283
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
83-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.23 // indirect
84+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11 // indirect
8485
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
8586
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
8687
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
87-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.8 // indirect
88+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
8889
github.com/aws/aws-sdk-go-v2/service/ecr v1.40.0 // indirect
8990
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.23.9 // indirect
9091
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.10 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
9293
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
93-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.8 // indirect
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.55.0 // indirect
94+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 // indirect
9596
github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
9697
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
9798
github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
@@ -100,9 +101,9 @@ require (
100101
github.com/beorn7/perks v1.0.1 // indirect
101102
github.com/blang/semver v3.5.1+incompatible // indirect
102103
github.com/blang/semver/v4 v4.0.0 // indirect
103-
github.com/buildkite/agent/v3 v3.73.1 // indirect
104-
github.com/buildkite/go-pipeline v0.9.0 // indirect
105-
github.com/buildkite/interpolate v0.1.2 // indirect
104+
github.com/buildkite/agent/v3 v3.76.2 // indirect
105+
github.com/buildkite/go-pipeline v0.10.0 // indirect
106+
github.com/buildkite/interpolate v0.1.3 // indirect
106107
github.com/buildkite/roko v1.2.0 // indirect
107108
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
108109
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -117,15 +118,16 @@ require (
117118
github.com/containerd/log v0.1.0 // indirect
118119
github.com/containerd/platforms v0.2.1 // indirect
119120
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
120-
github.com/containers/image/v5 v5.31.0 // indirect
121+
github.com/containers/image/v5 v5.32.1 // indirect
121122
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
122-
github.com/containers/ocicrypt v1.1.10 // indirect
123-
github.com/containers/storage v1.54.0 // indirect
124-
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
123+
github.com/containers/ocicrypt v1.2.0 // indirect
124+
github.com/containers/storage v1.55.0 // indirect
125+
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
125126
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
126127
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
127128
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
128129
github.com/davidmz/go-pageant v1.0.2 // indirect
130+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
129131
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
130132
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
131133
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -139,10 +141,12 @@ require (
139141
github.com/docker/go-metrics v0.0.1 // indirect
140142
github.com/docker/go-units v0.5.0 // indirect
141143
github.com/dustin/go-humanize v1.0.1 // indirect
144+
github.com/elliotchance/orderedmap v1.6.0 // indirect
142145
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
143146
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
144147
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
145148
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
149+
github.com/fatih/color v1.17.0 // indirect
146150
github.com/felixge/httpsnoop v1.0.4 // indirect
147151
github.com/fluxcd/pkg/apis/acl v0.6.0 // indirect
148152
github.com/fluxcd/pkg/apis/kustomize v1.9.0 // indirect
@@ -169,7 +173,10 @@ require (
169173
github.com/go-openapi/strfmt v0.23.0 // indirect
170174
github.com/go-openapi/swag v0.23.0 // indirect
171175
github.com/go-openapi/validate v0.24.0 // indirect
172-
github.com/go-test/deep v1.1.0 // indirect
176+
github.com/go-test/deep v1.1.1 // indirect
177+
github.com/gobwas/glob v0.2.3 // indirect
178+
github.com/goccy/go-json v0.10.3 // indirect
179+
github.com/goccy/go-yaml v1.12.0 // indirect
173180
github.com/gogo/protobuf v1.3.2 // indirect
174181
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
175182
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
@@ -205,23 +212,26 @@ require (
205212
github.com/in-toto/in-toto-golang v0.9.0 // indirect
206213
github.com/inconshreveable/mousetrap v1.1.0 // indirect
207214
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
215+
github.com/jinzhu/copier v0.4.0 // indirect
208216
github.com/jmespath/go-jmespath v0.4.0 // indirect
209217
github.com/josharian/intern v1.0.0 // indirect
210218
github.com/json-iterator/go v1.1.12 // indirect
211219
github.com/klauspost/compress v1.17.11 // indirect
212220
github.com/klauspost/pgzip v1.2.6 // indirect
213-
github.com/letsencrypt/boulder v0.0.0-20240606225043-de8401e3454f // indirect
221+
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
214222
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
215223
github.com/magiconair/properties v1.8.7 // indirect
216224
github.com/mailru/easyjson v0.9.0 // indirect
217225
github.com/mandelsoft/filepath v0.0.0-20240223090642-3e2777258aa3 // indirect
218-
github.com/mandelsoft/goutils v0.0.0-20240605100619-84d61423f421 // indirect
219-
github.com/mandelsoft/logging v0.0.0-20240201091719-67180059d6bf // indirect
226+
github.com/mandelsoft/goutils v0.0.0-20240623134558-383cb09dec16 // indirect
227+
github.com/mandelsoft/logging v0.0.0-20240618075559-fdca28a87b0a // indirect
220228
github.com/mandelsoft/spiff v1.7.0-beta-5 // indirect
221229
github.com/mandelsoft/vfs v0.4.3 // indirect
222230
github.com/marstr/guid v1.1.0 // indirect
231+
github.com/mattn/go-colorable v0.1.13 // indirect
223232
github.com/mattn/go-isatty v0.0.20 // indirect
224233
github.com/miekg/pkcs11 v1.1.1 // indirect
234+
github.com/mikefarah/yq/v4 v4.44.3 // indirect
225235
github.com/mitchellh/copystructure v1.2.0 // indirect
226236
github.com/mitchellh/go-homedir v1.1.0 // indirect
227237
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -230,7 +240,9 @@ require (
230240
github.com/moby/docker-image-spec v1.3.1 // indirect
231241
github.com/moby/locker v1.0.1 // indirect
232242
github.com/moby/spdystream v0.5.0 // indirect
243+
github.com/moby/sys/mountinfo v0.7.2 // indirect
233244
github.com/moby/sys/sequential v0.5.0 // indirect
245+
github.com/moby/sys/user v0.3.0 // indirect
234246
github.com/moby/term v0.5.0 // indirect
235247
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
236248
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -242,8 +254,10 @@ require (
242254
github.com/oklog/ulid v1.3.1 // indirect
243255
github.com/oleiade/reflections v1.0.1 // indirect
244256
github.com/onsi/gomega v1.36.2 // indirect
257+
github.com/open-component-model/ocm v0.11.0 // indirect
245258
github.com/opencontainers/go-digest v1.0.0 // indirect
246259
github.com/opencontainers/image-spec v1.1.0 // indirect
260+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
247261
github.com/opentracing/opentracing-go v1.2.0 // indirect
248262
github.com/pborman/uuid v1.2.1 // indirect
249263
github.com/pelletier/go-toml v1.9.5 // indirect
@@ -254,6 +268,7 @@ require (
254268
github.com/prometheus/client_model v0.6.1 // indirect
255269
github.com/prometheus/common v0.62.0 // indirect
256270
github.com/prometheus/procfs v0.15.1 // indirect
271+
github.com/redis/go-redis/v9 v9.7.0 // indirect
257272
github.com/russross/blackfriday/v2 v2.1.0 // indirect
258273
github.com/ryanuber/go-glob v1.0.0 // indirect
259274
github.com/sagikazarmark/locafero v0.6.0 // indirect
@@ -262,10 +277,11 @@ require (
262277
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
263278
github.com/segmentio/ksuid v1.0.4 // indirect
264279
github.com/shibumi/go-pathspec v1.3.0 // indirect
265-
github.com/sigstore/cosign/v2 v2.2.4 // indirect
266-
github.com/sigstore/fulcio v1.4.5 // indirect
280+
github.com/sigstore/cosign/v2 v2.4.0 // indirect
281+
github.com/sigstore/fulcio v1.5.1 // indirect
282+
github.com/sigstore/protobuf-specs v0.3.2 // indirect
267283
github.com/sigstore/rekor v1.3.6 // indirect
268-
github.com/sigstore/sigstore v1.8.4 // indirect
284+
github.com/sigstore/sigstore v1.8.8 // indirect
269285
github.com/sigstore/timestamp-authority v1.2.2 // indirect
270286
github.com/sirupsen/logrus v1.9.3 // indirect
271287
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
@@ -275,8 +291,9 @@ require (
275291
github.com/spf13/cobra v1.8.1 // indirect
276292
github.com/spf13/pflag v1.0.6 // indirect
277293
github.com/spf13/viper v1.19.0 // indirect
278-
github.com/spiffe/go-spiffe/v2 v2.2.0 // indirect
294+
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
279295
github.com/subosito/gotenv v1.6.0 // indirect
296+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
280297
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
281298
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect
282299
github.com/thales-e-security/pool v0.0.2 // indirect
@@ -297,6 +314,7 @@ require (
297314
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
298315
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
299316
github.com/xlab/treeprint v1.2.0 // indirect
317+
github.com/yuin/gopher-lua v1.1.1 // indirect
300318
github.com/zeebo/errs v1.3.0 // indirect
301319
go.mongodb.org/mongo-driver v1.15.0 // indirect
302320
go.opencensus.io v0.24.0 // indirect
@@ -311,7 +329,7 @@ require (
311329
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
312330
go.opentelemetry.io/otel/trace v1.34.0 // indirect
313331
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
314-
go.step.sm/crypto v0.47.0 // indirect
332+
go.step.sm/crypto v0.51.1 // indirect
315333
go.uber.org/multierr v1.11.0 // indirect
316334
go.uber.org/zap v1.27.0 // indirect
317335
golang.org/x/crypto v0.35.0 // indirect
@@ -324,6 +342,7 @@ require (
324342
golang.org/x/term v0.29.0 // indirect
325343
golang.org/x/text v0.22.0 // indirect
326344
golang.org/x/time v0.10.0 // indirect
345+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
327346
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
328347
google.golang.org/api v0.197.0 // indirect
329348
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
@@ -333,6 +352,7 @@ require (
333352
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
334353
gopkg.in/inf.v0 v0.9.1 // indirect
335354
gopkg.in/ini.v1 v1.67.0 // indirect
355+
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
336356
gopkg.in/yaml.v2 v2.4.0 // indirect
337357
gopkg.in/yaml.v3 v3.0.1 // indirect
338358
helm.sh/helm/v3 v3.17.0 // indirect
@@ -344,6 +364,6 @@ require (
344364
oras.land/oras-go v1.2.5 // indirect
345365
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
346366
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
347-
sigs.k8s.io/release-utils v0.8.2 // indirect
367+
sigs.k8s.io/release-utils v0.8.4 // indirect
348368
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
349369
)

0 commit comments

Comments
 (0)