Skip to content

Commit 6e62eda

Browse files
Merge branch 'master' into dependabot/go_modules/github.com/distribution/distribution/v3-3.0.0
2 parents b4fe928 + 53ad34f commit 6e62eda

File tree

12 files changed

+282
-185
lines changed

12 files changed

+282
-185
lines changed

.github/stale.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/go-verdiff.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
name: go-verdiff
22
on:
33
pull_request:
4-
paths:
5-
- '**.mod'
6-
- '.github/workflows/go-verdiff.yaml'
74
branches:
8-
- main
5+
- master
96
jobs:
107
go-verdiff:
118
runs-on: ubuntu-latest
129
steps:
13-
- uses: actions/checkout@v4
14-
with:
15-
fetch-depth: 0
16-
- name: Check golang version
17-
run: hack/tools/check-go-version.sh "${{ github.event.pull_request.base.sha }}"
10+
- uses: actions/checkout@v4
11+
with:
12+
fetch-depth: 0
13+
- name: Check golang version
14+
run: |
15+
export LABELS="$(gh api repos/$OWNER/$REPO/pulls/$PR --jq '.labels.[].name')"
16+
hack/tools/check-go-version.sh -b "${{ github.event.pull_request.base.sha }}"
17+
shell: bash
18+
env:
19+
GH_TOKEN: ${{ github.token }}
20+
OWNER: ${{ github.repository_owner }}
21+
REPO: ${{ github.event.repository.name }}
22+
PR: ${{ github.event.pull_request.number }}

.github/workflows/stale.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# This workflow automatically marks issues and pull requests as stale after 90 days of inactivity
2+
# and closes them after an additional 30 days if no further activity occurs.
3+
#
4+
# Key behavior:
5+
# - After 90 days of no activity:
6+
# - Open issues and pull requests are labeled with "lifecycle/stale"
7+
# - A comment is posted to notify contributors about the inactivity
8+
#
9+
# - After 30 additional days (i.e., 120 days total):
10+
# - If still inactive and still labeled "lifecycle/stale", the issue or PR is closed
11+
# - A closing comment is posted to explain why it was closed
12+
#
13+
# - Activity such as a comment, commit, or label removal during the stale period
14+
# will remove the "lifecycle/stale" label and reset the clock
15+
#
16+
# - Items with any of the following labels will never be marked stale or closed:
17+
# - security
18+
# - planned
19+
# - priority/critical
20+
# - lifecycle/frozen
21+
# - verified
22+
#
23+
# This workflow uses: https://github.com/actions/stale
24+
name: "Close stale issues and PRs"
25+
on:
26+
schedule:
27+
- cron: "0 1 * * *" # Runs daily at 01:00 UTC (adjust as needed)
28+
29+
jobs:
30+
stale:
31+
runs-on: ubuntu-latest
32+
permissions:
33+
issues: write # allow labeling, commenting, closing issues
34+
pull-requests: write # allow labeling, commenting, closing PRs
35+
steps:
36+
- uses: actions/stale@v9
37+
with:
38+
repo-token: ${{ secrets.GITHUB_TOKEN }}
39+
days-before-stale: 90
40+
days-before-close: 30
41+
stale-issue-label: "lifecycle/stale"
42+
stale-pr-label: "lifecycle/stale"
43+
stale-issue-message: >
44+
Issues go stale after 90 days of inactivity. If there is no further
45+
activity, the issue will be closed in another 30 days.
46+
stale-pr-message: >
47+
PRs go stale after 90 days of inactivity. If there is no further
48+
activity, the PR will be closed in another 30 days.
49+
close-issue-message: "This issue has been closed due to inactivity."
50+
close-pr-message: "This pull request has been closed due to inactivity."
51+
exempt-issue-labels: "security,planned,priority/critical,lifecycle/frozen,verified"
52+
exempt-pr-labels: "security,planned,priority/critical,lifecycle/frozen,verified"
53+
operations-per-run: 30

OWNERS

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
# approval == this is a good idea /approve
22
approvers:
3-
- awgreene
4-
- dinhxuanvu
3+
- camilamacedo86
54
- grokspawn
65
- joelanford
76
- kevinrizza
8-
- njhale
97
- oceanc80
108
- perdasilva
9+
- tmshort
1110
# review == this code is good /lgtm
1211
reviewers:
1312
- anik120
1413
- ankitathomas
15-
- awgreene
16-
- benluddy
17-
- dinhxuanvu
14+
- camilamacedo86
1815
- everettraven
1916
- exdx
20-
- gallettilance
2117
- grokspawn
22-
- jmrodri
2318
- joelanford
2419
- kevinrizza
25-
- njhale
2620
- oceanc80
2721
- perdasilva
2822
- rashmigottipati
29-
- theishshah
30-
- varshaprasad96
23+
- tmshort
24+
25+
3126
# Bugzilla component
3227
component: "OLM"

go.mod

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module github.com/operator-framework/operator-registry
22

3-
go 1.23.7
3+
go 1.24.3
44

55
require (
66
github.com/akrylysov/pogreb v0.10.2
77
github.com/blang/semver/v4 v4.0.0
88
github.com/containerd/containerd v1.7.27
99
github.com/containerd/errdefs v1.0.0
10-
github.com/containers/common v0.63.0
10+
github.com/containers/common v0.63.1
1111
github.com/containers/image/v5 v5.35.0
1212
github.com/distribution/distribution/v3 v3.0.0
1313
github.com/distribution/reference v0.6.0
14-
github.com/docker/cli v28.1.1+incompatible
15-
github.com/golang-migrate/migrate/v4 v4.18.2
14+
github.com/docker/cli v28.2.2+incompatible
15+
github.com/golang-migrate/migrate/v4 v4.18.3
1616
github.com/golang/mock v1.6.0
1717
github.com/google/go-cmp v0.7.0
18-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
19-
github.com/grpc-ecosystem/grpc-health-probe v0.4.37
18+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
19+
github.com/grpc-ecosystem/grpc-health-probe v0.4.38
2020
github.com/h2non/filetype v1.1.3
2121
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
2222
github.com/joelanford/ignore v0.1.1
@@ -34,35 +34,31 @@ require (
3434
github.com/spf13/pflag v1.0.6
3535
github.com/stretchr/testify v1.10.0
3636
github.com/tidwall/btree v1.7.0
37-
go.etcd.io/bbolt v1.4.0
37+
go.etcd.io/bbolt v1.4.1
3838
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
39-
golang.org/x/mod v0.24.0
40-
golang.org/x/net v0.39.0
41-
golang.org/x/sync v0.13.0
42-
golang.org/x/sys v0.32.0
43-
golang.org/x/text v0.24.0
44-
google.golang.org/grpc v1.72.0
39+
golang.org/x/mod v0.25.0
40+
golang.org/x/net v0.41.0
41+
golang.org/x/sync v0.15.0
42+
golang.org/x/sys v0.33.0
43+
golang.org/x/text v0.26.0
44+
google.golang.org/grpc v1.73.0
4545
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
4646
google.golang.org/protobuf v1.36.6
4747
gopkg.in/yaml.v2 v2.4.0
48-
k8s.io/api v0.32.3
49-
k8s.io/apiextensions-apiserver v0.32.3
50-
k8s.io/apimachinery v0.32.3
51-
k8s.io/client-go v0.32.3
52-
k8s.io/kubectl v0.32.0
53-
oras.land/oras-go/v2 v2.5.0
54-
sigs.k8s.io/controller-runtime v0.20.4
55-
sigs.k8s.io/kind v0.27.0
48+
k8s.io/api v0.33.2
49+
k8s.io/apiextensions-apiserver v0.33.2
50+
k8s.io/apimachinery v0.33.2
51+
k8s.io/client-go v0.33.2
52+
k8s.io/kubectl v0.33.2
53+
oras.land/oras-go/v2 v2.6.0
54+
sigs.k8s.io/controller-runtime v0.21.0
55+
sigs.k8s.io/kind v0.29.0
5656
sigs.k8s.io/yaml v1.4.0
5757
)
5858

59-
// https://github.com/kubernetes/apiserver/issues/116
60-
// reevaluate when we bump to k8s v1.33.0
61-
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
62-
6359
require (
6460
al.essio.dev/pkg/shellescape v1.5.1 // indirect
65-
cel.dev/expr v0.20.0 // indirect
61+
cel.dev/expr v0.23.1 // indirect
6662
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
6763
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
6864
github.com/BurntSushi/toml v1.5.0 // indirect
@@ -121,16 +117,14 @@ require (
121117
github.com/gogo/protobuf v1.3.2 // indirect
122118
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
123119
github.com/golang/protobuf v1.5.4 // indirect
124-
github.com/google/cel-go v0.23.0 // indirect
125-
github.com/google/gnostic-models v0.6.8 // indirect
120+
github.com/google/cel-go v0.25.0 // indirect
121+
github.com/google/gnostic-models v0.6.9 // indirect
126122
github.com/google/go-containerregistry v0.20.3 // indirect
127-
github.com/google/gofuzz v1.2.0 // indirect
128123
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
129-
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
130124
github.com/google/uuid v1.6.0 // indirect
131125
github.com/gorilla/handlers v1.5.2 // indirect
132126
github.com/gorilla/mux v1.8.1 // indirect
133-
github.com/gorilla/websocket v1.5.0 // indirect
127+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
134128
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
135129
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
136130
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
@@ -166,7 +160,7 @@ require (
166160
github.com/pelletier/go-toml v1.9.5 // indirect
167161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
168162
github.com/proglottis/gpgme v0.1.4 // indirect
169-
github.com/prometheus/client_golang v1.21.1 // indirect
163+
github.com/prometheus/client_golang v1.22.0 // indirect
170164
github.com/prometheus/client_model v0.6.1 // indirect
171165
github.com/prometheus/common v0.62.0 // indirect
172166
github.com/prometheus/procfs v0.15.1 // indirect
@@ -196,45 +190,46 @@ require (
196190
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
197191
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
198192
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
199-
go.opentelemetry.io/otel v1.34.0 // indirect
193+
go.opentelemetry.io/otel v1.35.0 // indirect
200194
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
201195
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
202196
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
203197
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
204198
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
205-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
199+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
206200
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
207201
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
208202
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
209203
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
210204
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
211205
go.opentelemetry.io/otel/log v0.8.0 // indirect
212-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
213-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
206+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
207+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
214208
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
215-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
216-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
209+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
210+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
217211
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
218212
go.uber.org/automaxprocs v1.6.0 // indirect
219-
golang.org/x/crypto v0.37.0 // indirect
213+
golang.org/x/crypto v0.39.0 // indirect
220214
golang.org/x/oauth2 v0.29.0 // indirect
221-
golang.org/x/term v0.31.0 // indirect
215+
golang.org/x/term v0.32.0 // indirect
222216
golang.org/x/time v0.11.0 // indirect
223-
golang.org/x/tools v0.31.0 // indirect
217+
golang.org/x/tools v0.33.0 // indirect
224218
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
225-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
219+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
226220
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
227221
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
228222
gopkg.in/inf.v0 v0.9.1 // indirect
229223
gopkg.in/warnings.v0 v0.1.2 // indirect
230224
gopkg.in/yaml.v3 v3.0.1 // indirect
231-
k8s.io/apiserver v0.32.3 // indirect
232-
k8s.io/cli-runtime v0.32.0 // indirect
233-
k8s.io/component-base v0.32.3 // indirect
225+
k8s.io/apiserver v0.33.2 // indirect
226+
k8s.io/cli-runtime v0.33.2 // indirect
227+
k8s.io/component-base v0.33.2 // indirect
234228
k8s.io/klog/v2 v2.130.1 // indirect
235-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
229+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
236230
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
237-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
231+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
238232
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
239-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
233+
sigs.k8s.io/randfill v1.0.0 // indirect
234+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
240235
)

0 commit comments

Comments
 (0)