Skip to content

Commit 56ea4c2

Browse files
🌱 Update Golang Dependencies group to v2.6.1 [SECURITY]
| datasource | package | from | to | | ---------- | -------------------- | ------ | ------ | | go | oras.land/oras-go/v2 | v2.6.0 | v2.6.1 |
1 parent c82e9ba commit 56ea4c2

24 files changed

Lines changed: 390 additions & 75 deletions

File tree

.builder-image-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.34
1+
1.1.35

.github/workflows/pr-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
2222
runs-on: ubuntu-latest
2323
container:
24-
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.34
24+
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.35
2525
credentials:
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.github_token }}

.github/workflows/schedule-scan-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Trivy
1010
runs-on: ubuntu-latest
1111
container:
12-
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.34
12+
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.35
1313
credentials:
1414
username: ${{ github.actor }}
1515
password: ${{ secrets.github_token }}

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/SovereignCloudStack/cluster-stack-operator
22

3-
go 1.24.0
3+
go 1.25.0
44

55
toolchain go1.25.1
66

@@ -19,7 +19,7 @@ require (
1919
k8s.io/cli-runtime v0.30.3
2020
k8s.io/client-go v0.30.3
2121
k8s.io/klog/v2 v2.130.1
22-
oras.land/oras-go/v2 v2.6.0
22+
oras.land/oras-go/v2 v2.6.1
2323
sigs.k8s.io/cluster-api v1.8.1
2424
sigs.k8s.io/cluster-api/test v1.8.1
2525
sigs.k8s.io/controller-runtime v0.18.7
@@ -50,7 +50,7 @@ require (
5050
go.uber.org/automaxprocs v1.6.0 // indirect
5151
go.yaml.in/yaml/v3 v3.0.4 // indirect
5252
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
53-
golang.org/x/sync v0.16.0 // indirect
53+
golang.org/x/sync v0.20.0 // indirect
5454
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
5555
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
5656
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
286286
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
287287
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
288288
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
289-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
290-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
289+
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
290+
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
291291
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
292292
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
293293
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -388,8 +388,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
388388
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
389389
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
390390
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
391-
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
392-
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
391+
oras.land/oras-go/v2 v2.6.1 h1:bonOEkjLfp8tt6qXWRRWP6p1F+9octchOf2EqnWB4Zs=
392+
oras.land/oras-go/v2 v2.6.1/go.mod h1:dhtFrFOuZuDtAVeZ9FUnaa5zfzplG3ZnFX9/uH1J/Yk=
393393
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
394394
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
395395
sigs.k8s.io/cluster-api v1.8.1 h1:OA3w1CjCmXXXDL7aY3WDe+seL0mdFVJX1K5mZwqKbDE=

vendor/golang.org/x/sync/errgroup/errgroup.go

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

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ golang.org/x/net/internal/httpcommon
356356
## explicit; go 1.24.0
357357
golang.org/x/oauth2
358358
golang.org/x/oauth2/internal
359-
# golang.org/x/sync v0.16.0
360-
## explicit; go 1.23.0
359+
# golang.org/x/sync v0.20.0
360+
## explicit; go 1.25.0
361361
golang.org/x/sync/errgroup
362362
golang.org/x/sync/semaphore
363363
# golang.org/x/sys v0.35.0
@@ -788,8 +788,8 @@ k8s.io/utils/pointer
788788
k8s.io/utils/ptr
789789
k8s.io/utils/strings/slices
790790
k8s.io/utils/trace
791-
# oras.land/oras-go/v2 v2.6.0
792-
## explicit; go 1.23.0
791+
# oras.land/oras-go/v2 v2.6.1
792+
## explicit; go 1.25.0
793793
oras.land/oras-go/v2
794794
oras.land/oras-go/v2/content
795795
oras.land/oras-go/v2/content/file
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright The ORAS Authors.
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
14+
version: 2
15+
16+
# oras-go is a library — no binary builds or archives needed.
17+
builds:
18+
- skip: true
19+
20+
checksum:
21+
disable: true
22+
23+
release:
24+
# Tags containing -alpha, -beta, or -rc are automatically marked pre-release.
25+
prerelease: auto
26+
draft: false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Derived from OWNERS.md
2-
* @sajayantony @shizhMSFT @stevelasker @Wwwsylvia
2+
* @sabre1041 @shizhMSFT @TerryHowe @Wwwsylvia

vendor/oras.land/oras-go/v2/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ clean:
2626
.PHONY: check-encoding
2727
check-encoding:
2828
! find . -not -path "./vendor/*" -name "*.go" -type f -exec file "{}" ";" | grep CRLF
29-
! find scripts -name "*.sh" -type f -exec file "{}" ";" | grep CRLF
3029

3130
.PHONY: fix-encoding
3231
fix-encoding:
3332
find . -not -path "./vendor/*" -name "*.go" -type f -exec sed -i -e "s/\r//g" {} +
34-
find scripts -name "*.sh" -type f -exec sed -i -e "s/\r//g" {} +
3533

3634
.PHONY: vendor
3735
vendor:

0 commit comments

Comments
 (0)