Skip to content

Commit d17fd0c

Browse files
authored
Merge branch 'main' into dependabot/go_modules/k8s.io/apimachinery-0.36.2
2 parents cf1fa61 + b009ede commit d17fd0c

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v6
25+
uses: actions/checkout@v7
2626

2727
- name: Set up Go
2828
uses: actions/setup-go@v6
2929
with:
3030
go-version: ${{ env.GO_VERSION }}
3131

3232
- name: Cache Go modules
33-
uses: actions/cache@v5
33+
uses: actions/cache@v6
3434
with:
3535
path: |
3636
~/.cache/go-build
@@ -72,7 +72,7 @@ jobs:
7272
actions: read
7373
steps:
7474
- name: Checkout code
75-
uses: actions/checkout@v6
75+
uses: actions/checkout@v7
7676

7777
- name: Set up Go
7878
uses: actions/setup-go@v6
@@ -98,15 +98,15 @@ jobs:
9898
runs-on: ubuntu-latest
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v6
101+
uses: actions/checkout@v7
102102

103103
- name: Set up Go
104104
uses: actions/setup-go@v6
105105
with:
106106
go-version: ${{ env.GO_VERSION }}
107107

108108
- name: Cache Go modules
109-
uses: actions/cache@v5
109+
uses: actions/cache@v6
110110
with:
111111
path: |
112112
~/.cache/go-build
@@ -151,7 +151,7 @@ jobs:
151151
runs-on: ubuntu-latest
152152
steps:
153153
- name: Checkout code
154-
uses: actions/checkout@v6
154+
uses: actions/checkout@v7
155155

156156
- name: Set up Helm
157157
uses: azure/setup-helm@v5
@@ -169,7 +169,7 @@ jobs:
169169
needs: [lint, test]
170170
steps:
171171
- name: Checkout code
172-
uses: actions/checkout@v6
172+
uses: actions/checkout@v7
173173

174174
- name: Set up Docker Buildx
175175
uses: docker/setup-buildx-action@v4
@@ -203,7 +203,7 @@ jobs:
203203
actions: read
204204
steps:
205205
- name: Checkout code
206-
uses: actions/checkout@v6
206+
uses: actions/checkout@v7
207207

208208
- name: Set up Go
209209
uses: actions/setup-go@v6
@@ -223,7 +223,7 @@ jobs:
223223
if: github.event_name == 'pull_request'
224224
steps:
225225
- name: Checkout code
226-
uses: actions/checkout@v6
226+
uses: actions/checkout@v7
227227
with:
228228
fetch-depth: 0
229229

.github/workflows/multi-arch-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
packages: write
103103
steps:
104104
- name: Checkout code
105-
uses: actions/checkout@v6
105+
uses: actions/checkout@v7
106106

107107
- name: Set environment variables
108108
env:

.github/workflows/pr-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- name: Checkout code
81-
uses: actions/checkout@v6
81+
uses: actions/checkout@v7
8282
with:
8383
fetch-depth: 0
8484

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packages: write
3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v6
36+
uses: actions/checkout@v7
3737
with:
3838
ref: ${{ inputs.tag_name || github.event.release.tag_name }}
3939

@@ -165,7 +165,7 @@ jobs:
165165
packages: write
166166
steps:
167167
- name: Checkout code
168-
uses: actions/checkout@v6
168+
uses: actions/checkout@v7
169169
with:
170170
ref: ${{ inputs.tag_name || github.event.release.tag_name }}
171171

.github/workflows/security.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
language: ["go"]
3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v6
36+
uses: actions/checkout@v7
3737

3838
- name: Set up Go
3939
uses: actions/setup-go@v6
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout code
64-
uses: actions/checkout@v6
64+
uses: actions/checkout@v7
6565

6666
- name: Set up Go
6767
uses: actions/setup-go@v6
@@ -98,7 +98,7 @@ jobs:
9898
security-events: write
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v6
101+
uses: actions/checkout@v7
102102

103103
- name: Set up Docker Buildx
104104
uses: docker/setup-buildx-action@v4
@@ -140,7 +140,7 @@ jobs:
140140
runs-on: ubuntu-latest
141141
steps:
142142
- name: Checkout code
143-
uses: actions/checkout@v6
143+
uses: actions/checkout@v7
144144
with:
145145
fetch-depth: 0
146146

@@ -159,7 +159,7 @@ jobs:
159159
runs-on: ubuntu-latest
160160
steps:
161161
- name: Checkout code
162-
uses: actions/checkout@v6
162+
uses: actions/checkout@v7
163163

164164
- name: Set up Helm
165165
uses: azure/setup-helm@v5
@@ -237,7 +237,7 @@ jobs:
237237
security-events: write
238238
steps:
239239
- name: Checkout code
240-
uses: actions/checkout@v6
240+
uses: actions/checkout@v7
241241

242242
- name: Set up Go
243243
uses: actions/setup-go@v6
@@ -281,7 +281,7 @@ jobs:
281281
runs-on: ubuntu-latest
282282
steps:
283283
- name: Checkout code
284-
uses: actions/checkout@v6
284+
uses: actions/checkout@v7
285285

286286
- name: Set up Go
287287
uses: actions/setup-go@v6

.github/workflows/semantic-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
new-release-git-tag: ${{ steps.semantic.outputs.new_release_git_tag }}
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
with:
2929
ref: main
3030
fetch-depth: 0

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.26.0
55
require (
66
go.uber.org/zap v1.28.0
77
golang.org/x/text v0.37.0
8-
k8s.io/api v0.36.1
8+
k8s.io/api v0.36.2
99
k8s.io/apimachinery v0.36.2
1010
sigs.k8s.io/controller-runtime v0.24.1
1111
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
145145
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
146146
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
147147
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
148-
k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY=
149-
k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo=
148+
k8s.io/api v0.36.2 h1:TF6YDLIzKfccK7cq9YpTcGX8TJmEkHVRv78DM51fRYY=
149+
k8s.io/api v0.36.2/go.mod h1:F4LbMO4brjZYh7yFkXWhynSvtB7YauxV4c+HHkNRGNg=
150150
k8s.io/apiextensions-apiserver v0.36.0 h1:Wt7E8J+VBCbj4FjiBfDTK/neXDDjyJVJc7xfuOHImZ0=
151151
k8s.io/apiextensions-apiserver v0.36.0/go.mod h1:kGDjH0msuiIB3tgsYRV0kS9GqpMYMUsQ3GHv7TApyug=
152152
k8s.io/apimachinery v0.36.2 h1:0PE/W/WNy1UX61NLbXY5TMbJ6UwLL6E6lAPkYrKFxbQ=

0 commit comments

Comments
 (0)