Skip to content

Commit 36b657b

Browse files
jpinsonneaujpinsonneau
committed
bump registry
1 parent 3771e25 commit 36b657b

File tree

6 files changed

+149
-134
lines changed

6 files changed

+149
-134
lines changed

‎staging/operator-registry/.github/dependabot.yml

+8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ updates:
88
directory: "/"
99
schedule:
1010
interval: "daily"
11+
groups:
12+
k8s-dependencies:
13+
patterns:
14+
- "k8s.io/*"
15+
- "sigs.k8s.io/*"
16+
golang-x-deps:
17+
patterns:
18+
- "golang.org/x/*"
1119
- package-exosystem: "docker"
1220
directory: "/"
1321
schedule:

‎staging/operator-registry/.github/workflows/test.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,16 @@ on:
1111

1212
jobs:
1313
e2e:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717
- uses: actions/setup-go@v5
1818
with:
1919
go-version-file: 'go.mod'
2020
- name: Install podman
2121
run: |
22-
. /etc/os-release
23-
echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
24-
curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
2522
sudo apt-get update
26-
sudo apt-get -y install conntrack podman
23+
sudo apt-get -y install podman
2724
podman version
2825
- name: Create kind cluster and setup local docker registry
2926
run: |

‎staging/operator-registry/alpha/declcfg/load.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,20 @@ func parseMetaPaths(ctx context.Context, root fs.FS, pathChan <-chan string, wal
183183
if !ok {
184184
return nil
185185
}
186-
file, err := root.Open(path)
186+
err := func() error { // using closure to ensure file is closed immediately after use
187+
file, err := root.Open(path)
188+
if err != nil {
189+
return err
190+
}
191+
defer file.Close()
192+
193+
return WalkMetasReader(file, func(meta *Meta, err error) error {
194+
return walkFn(path, meta, err)
195+
})
196+
}()
187197
if err != nil {
188198
return err
189199
}
190-
if err := WalkMetasReader(file, func(meta *Meta, err error) error {
191-
return walkFn(path, meta, err)
192-
}); err != nil {
193-
return err
194-
}
195200
}
196201
}
197202
}

‎staging/operator-registry/go.mod

+42-43
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
module github.com/operator-framework/operator-registry
22

3-
go 1.23.0
4-
5-
toolchain go1.23.4
3+
go 1.23.7
64

75
require (
86
github.com/akrylysov/pogreb v0.10.2
97
github.com/blang/semver/v4 v4.0.0
10-
github.com/containerd/containerd v1.7.25
8+
github.com/containerd/containerd v1.7.27
119
github.com/containerd/errdefs v1.0.0
12-
github.com/containers/common v0.62.0
13-
github.com/containers/image/v5 v5.34.0
14-
github.com/distribution/distribution/v3 v3.0.0-rc.3
10+
github.com/containers/common v0.62.2
11+
github.com/containers/image/v5 v5.34.2
12+
github.com/distribution/distribution/v3 v3.0.0-rc.4
1513
github.com/distribution/reference v0.6.0
16-
github.com/docker/cli v28.0.0+incompatible
14+
github.com/docker/cli v28.0.4+incompatible
1715
github.com/golang-migrate/migrate/v4 v4.18.2
1816
github.com/golang/mock v1.6.0
1917
github.com/google/go-cmp v0.7.0
@@ -24,11 +22,11 @@ require (
2422
github.com/joelanford/ignore v0.1.1
2523
github.com/mattn/go-sqlite3 v1.14.24
2624
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
27-
github.com/onsi/ginkgo/v2 v2.22.2
28-
github.com/onsi/gomega v1.36.2
25+
github.com/onsi/ginkgo/v2 v2.23.3
26+
github.com/onsi/gomega v1.36.3
2927
github.com/opencontainers/go-digest v1.0.0
30-
github.com/opencontainers/image-spec v1.1.0
31-
github.com/operator-framework/api v0.29.0
28+
github.com/opencontainers/image-spec v1.1.1
29+
github.com/operator-framework/api v0.30.0
3230
github.com/otiai10/copy v1.14.1
3331
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
3432
github.com/pkg/errors v0.9.1
@@ -39,34 +37,34 @@ require (
3937
github.com/tidwall/btree v1.7.0
4038
go.etcd.io/bbolt v1.4.0
4139
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
42-
golang.org/x/mod v0.23.0
43-
golang.org/x/net v0.35.0
44-
golang.org/x/sync v0.11.0
45-
golang.org/x/sys v0.30.0
46-
golang.org/x/text v0.22.0
47-
google.golang.org/grpc v1.70.0
40+
golang.org/x/mod v0.24.0
41+
golang.org/x/net v0.37.0
42+
golang.org/x/sync v0.12.0
43+
golang.org/x/sys v0.31.0
44+
golang.org/x/text v0.23.0
45+
google.golang.org/grpc v1.71.0
4846
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
49-
google.golang.org/protobuf v1.36.5
47+
google.golang.org/protobuf v1.36.6
5048
gopkg.in/yaml.v2 v2.4.0
51-
k8s.io/api v0.32.2
52-
k8s.io/apiextensions-apiserver v0.32.2
53-
k8s.io/apimachinery v0.32.2
54-
k8s.io/client-go v0.32.2
49+
k8s.io/api v0.32.3
50+
k8s.io/apiextensions-apiserver v0.32.3
51+
k8s.io/apimachinery v0.32.3
52+
k8s.io/client-go v0.32.3
5553
k8s.io/kubectl v0.32.0
56-
sigs.k8s.io/controller-runtime v0.20.2
57-
sigs.k8s.io/kind v0.26.0
54+
sigs.k8s.io/controller-runtime v0.20.4
55+
sigs.k8s.io/kind v0.27.0
5856
sigs.k8s.io/yaml v1.4.0
5957
)
6058

6159
require (
62-
cel.dev/expr v0.19.0 // indirect
60+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
61+
cel.dev/expr v0.19.1 // indirect
6362
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
6463
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
6564
github.com/BurntSushi/toml v1.4.0 // indirect
6665
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6766
github.com/Microsoft/go-winio v0.6.2 // indirect
6867
github.com/Microsoft/hcsshim v0.12.9 // indirect
69-
github.com/alessio/shellescape v1.4.2 // indirect
7068
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7169
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7270
github.com/beorn7/perks v1.0.1 // indirect
@@ -79,11 +77,11 @@ require (
7977
github.com/containerd/errdefs/pkg v0.3.0 // indirect
8078
github.com/containerd/log v0.1.0 // indirect
8179
github.com/containerd/platforms v0.2.1 // indirect
82-
github.com/containerd/ttrpc v1.2.5 // indirect
80+
github.com/containerd/ttrpc v1.2.7 // indirect
8381
github.com/containerd/typeurl/v2 v2.2.3 // indirect
8482
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8583
github.com/containers/ocicrypt v1.2.1 // indirect
86-
github.com/containers/storage v1.57.1 // indirect
84+
github.com/containers/storage v1.57.2 // indirect
8785
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8886
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8987
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -101,7 +99,7 @@ require (
10199
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
102100
github.com/go-git/go-billy/v5 v5.6.1 // indirect
103101
github.com/go-git/go-git/v5 v5.13.1 // indirect
104-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
102+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
105103
github.com/go-logr/logr v1.4.2 // indirect
106104
github.com/go-logr/stdr v1.2.2 // indirect
107105
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -161,10 +159,11 @@ require (
161159
github.com/x448/float16 v0.8.4 // indirect
162160
github.com/zeebo/errs v1.3.0 // indirect
163161
go.opencensus.io v0.24.0 // indirect
162+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
164163
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
165164
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
166165
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
167-
go.opentelemetry.io/otel v1.32.0 // indirect
166+
go.opentelemetry.io/otel v1.34.0 // indirect
168167
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
169168
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
170169
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
@@ -177,27 +176,27 @@ require (
177176
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
178177
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
179178
go.opentelemetry.io/otel/log v0.8.0 // indirect
180-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
181-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
179+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
180+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
182181
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
183-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
184-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
182+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
183+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
185184
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
186-
golang.org/x/crypto v0.33.0 // indirect
187-
golang.org/x/oauth2 v0.25.0 // indirect
188-
golang.org/x/term v0.29.0 // indirect
185+
golang.org/x/crypto v0.36.0 // indirect
186+
golang.org/x/oauth2 v0.27.0 // indirect
187+
golang.org/x/term v0.30.0 // indirect
189188
golang.org/x/time v0.7.0 // indirect
190-
golang.org/x/tools v0.29.0 // indirect
189+
golang.org/x/tools v0.30.0 // indirect
191190
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
192-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
193-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
191+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
192+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
194193
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
195194
gopkg.in/inf.v0 v0.9.1 // indirect
196195
gopkg.in/warnings.v0 v0.1.2 // indirect
197196
gopkg.in/yaml.v3 v3.0.1 // indirect
198-
k8s.io/apiserver v0.32.2 // indirect
197+
k8s.io/apiserver v0.32.3 // indirect
199198
k8s.io/cli-runtime v0.32.0 // indirect
200-
k8s.io/component-base v0.32.2 // indirect
199+
k8s.io/component-base v0.32.3 // indirect
201200
k8s.io/klog/v2 v2.130.1 // indirect
202201
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
203202
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)