Skip to content

Commit 279155f

Browse files
Merge pull request #729 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 215fb45 + f268968 commit 279155f

File tree

104 files changed

+2129
-1572
lines changed

Some content is hidden

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

104 files changed

+2129
-1572
lines changed

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
2323
google.golang.org/protobuf v1.33.0
2424
gopkg.in/yaml.v2 v2.4.0
25-
helm.sh/helm/v3 v3.12.2
25+
helm.sh/helm/v3 v3.14.3
2626
k8s.io/api v0.29.3
2727
k8s.io/apimachinery v0.29.3
2828
k8s.io/client-go v0.29.3
@@ -53,7 +53,7 @@ require (
5353
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5454
github.com/chai2010/gettext-go v1.0.2 // indirect
5555
github.com/containerd/cgroups/v3 v3.0.2 // indirect
56-
github.com/containerd/containerd v1.7.11 // indirect
56+
github.com/containerd/containerd v1.7.12 // indirect
5757
github.com/containerd/continuity v0.4.2 // indirect
5858
github.com/containerd/log v0.1.0 // indirect
5959
github.com/containerd/ttrpc v1.2.2 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/docker/go-metrics v0.0.1 // indirect
7979
github.com/docker/go-units v0.5.0 // indirect
8080
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
81-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
81+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
8282
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
8383
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
8484
github.com/fatih/color v1.15.0 // indirect
@@ -90,7 +90,7 @@ require (
9090
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9191
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9292
github.com/go-git/go-git/v5 v5.11.0 // indirect
93-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
93+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
9494
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9595
github.com/go-logr/stdr v1.2.2 // indirect
9696
github.com/go-logr/zapr v1.3.0 // indirect
@@ -179,7 +179,7 @@ require (
179179
github.com/prometheus/common v0.47.0 // indirect
180180
github.com/prometheus/procfs v0.12.0 // indirect
181181
github.com/rivo/uniseg v0.4.4 // indirect
182-
github.com/rubenv/sql-migrate v1.3.1 // indirect
182+
github.com/rubenv/sql-migrate v1.5.2 // indirect
183183
github.com/russross/blackfriday/v2 v2.1.0 // indirect
184184
github.com/shopspring/decimal v1.3.1 // indirect
185185
github.com/spf13/cast v1.5.0 // indirect

go.sum

Lines changed: 12 additions & 422 deletions
Large diffs are not rendered by default.

staging/operator-lifecycle-manager/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/coreos/go-semver v0.3.1
88
github.com/distribution/distribution v2.7.1+incompatible
9-
github.com/evanphx/json-patch v5.6.0+incompatible
9+
github.com/evanphx/json-patch v5.7.0+incompatible
1010
github.com/fsnotify/fsnotify v1.7.0
1111
github.com/ghodss/yaml v1.0.0
1212
github.com/go-air/gini v1.0.4
@@ -40,7 +40,7 @@ require (
4040
golang.org/x/time v0.5.0
4141
google.golang.org/grpc v1.61.1
4242
gopkg.in/yaml.v2 v2.4.0
43-
helm.sh/helm/v3 v3.12.2
43+
helm.sh/helm/v3 v3.14.3
4444
k8s.io/api v0.29.3
4545
k8s.io/apiextensions-apiserver v0.29.3
4646
k8s.io/apimachinery v0.29.3
@@ -79,7 +79,7 @@ require (
7979
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8080
github.com/chai2010/gettext-go v1.0.2 // indirect
8181
github.com/containerd/cgroups/v3 v3.0.2 // indirect
82-
github.com/containerd/containerd v1.7.11 // indirect
82+
github.com/containerd/containerd v1.7.12 // indirect
8383
github.com/containerd/continuity v0.4.2 // indirect
8484
github.com/containerd/log v0.1.0 // indirect
8585
github.com/containerd/ttrpc v1.2.2 // indirect
@@ -108,7 +108,7 @@ require (
108108
github.com/felixge/httpsnoop v1.0.4 // indirect
109109
github.com/fvbommel/sortorder v1.1.0 // indirect
110110
github.com/go-errors/errors v1.4.2 // indirect
111-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
111+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
112112
github.com/go-logr/stdr v1.2.2 // indirect
113113
github.com/go-logr/zapr v1.3.0 // indirect
114114
github.com/go-openapi/jsonpointer v0.20.2 // indirect
@@ -185,7 +185,7 @@ require (
185185
github.com/pmezard/go-difflib v1.0.0 // indirect
186186
github.com/prometheus/procfs v0.12.0 // indirect
187187
github.com/rivo/uniseg v0.4.4 // indirect
188-
github.com/rubenv/sql-migrate v1.3.1 // indirect
188+
github.com/rubenv/sql-migrate v1.5.2 // indirect
189189
github.com/russross/blackfriday/v2 v2.1.0 // indirect
190190
github.com/shopspring/decimal v1.3.1 // indirect
191191
github.com/spf13/cast v1.5.0 // indirect

staging/operator-lifecycle-manager/go.sum

Lines changed: 12 additions & 455 deletions
Large diffs are not rendered by default.

vendor/github.com/containerd/containerd/archive/compression/compression.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/content/helpers.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/mount/mount_freebsd.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/mount/mount_linux.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/version/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/evanphx/json-patch/README.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)