Skip to content

Commit c070941

Browse files
mchmarnymchmarny
authored
Merge branch 'main' into ladithyav-nvsentinel-bump
2 parents 016d9c2 + f7c64ef commit c070941

9 files changed

Lines changed: 56 additions & 37 deletions

File tree

‎.github/workflows/codeql.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
with:
4141
go-version: ${{ steps.versions.outputs.go }}
4242
cache: true
43-
- uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
43+
- uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
4444
with:
4545
languages: go
4646
- run: go build ./...
4747
env:
4848
GOFLAGS: -mod=vendor
49-
- uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
49+
- uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8

‎.github/workflows/merge-gate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@ jobs:
297297
with:
298298
go-version: ${{ steps.versions.outputs.go }}
299299
cache: true
300-
- uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
300+
- uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
301301
with:
302302
languages: go
303303
- run: go build ./...
304304
env:
305305
GOFLAGS: -mod=vendor
306-
- uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
306+
- uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
307307

308308
analyze-skip:
309309
needs: [check-paths]

‎.github/workflows/on-tag.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ jobs:
545545

546546
- name: Upload SARIF to GitHub Security
547547
if: hashFiles('results.sarif') != '' || steps.scan.outputs.sarif != ''
548-
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
548+
uses: github/codeql-action/upload-sarif@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
549549
with:
550550
sarif_file: ${{ steps.scan.outputs.sarif }}
551551
category: 'anchore-image-${{ matrix.image.key }}-${{ matrix.platform.arch }}'

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.26.6
1+
1.27.0

‎.settings.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ build_tools:
3030
# Linting
3131
linting:
3232
# renovate: datasource=go depName=golang.org/x/exp depType=linting
33-
apidiff: 'v0.0.0-20260813180055-c1d0aacb2297'
33+
apidiff: 'v0.0.0-20260820142414-ca536658362e'
3434
# renovate: datasource=github-releases depName=golangci/golangci-lint depType=linting
35-
golangci_lint: 'v2.12.2'
35+
golangci_lint: 'v2.13.1'
3636
# renovate: datasource=pypi depName=yamllint depType=linting
3737
yamllint: '1.38.0'
3838
# renovate: datasource=github-releases depName=google/addlicense depType=linting
@@ -67,7 +67,7 @@ security_tools:
6767
# E2E Testing Tools
6868
testing_tools:
6969
# renovate: datasource=github-releases depName=kubernetes/kubernetes depType=testing_tools
70-
kubectl: 'v1.36.3'
70+
kubectl: 'v1.36.4'
7171
# kubelogin: Entra exec-plugin for AKS kubeconfigs, installed by uat-azure.yaml
7272
# via `az aks install-cli` (which defaults to latest without an explicit pin).
7373
# renovate: datasource=github-releases depName=Azure/kubelogin depType=testing_tools
@@ -124,14 +124,14 @@ testing_tools:
124124
# Run with USE_SSL=1: sigstore's awskms signer hardcodes https://, so the e2e
125125
# serves TLS with a mkcert cert (see mkcert below).
126126
# renovate: datasource=docker depName=ministackorg/ministack depType=testing_tools
127-
ministack_image: 'ministackorg/ministack:1.4.19'
127+
ministack_image: 'ministackorg/ministack:1.4.21'
128128
# OpenBAO: the Linux Foundation Apache-2.0 fork of HashiCorp Vault, used by the
129129
# Vault KMS e2e to exercise the hashivault:// signing/verification path against
130130
# a real Transit secrets engine. API-identical to Vault; the sigstore hashivault
131131
# provider drives it over plain HTTP in dev mode (no TLS needed). Pinned (never
132132
# :latest) for reproducibility.
133133
# renovate: datasource=docker depName=openbao/openbao depType=testing_tools
134-
openbao_image: 'openbao/openbao:2.6.1'
134+
openbao_image: 'openbao/openbao:2.6.2'
135135
# mkcert issues a trusted localhost cert for MiniStack's TLS and installs its CA
136136
# into the system trust store, so the Go AWS SDK accepts the awskms:// endpoint.
137137
# renovate: datasource=github-releases depName=FiloSottile/mkcert depType=testing_tools
@@ -176,7 +176,7 @@ testing_tools:
176176
# renovate: datasource=github-releases depName=hauler-dev/hauler depType=testing_tools
177177
hauler: 'v2.0.3'
178178
# renovate: datasource=github-releases depName=zarf-dev/zarf depType=testing_tools
179-
zarf: 'v0.83.0'
179+
zarf: 'v0.84.0'
180180
# Quality Thresholds
181181
quality:
182182
coverage_threshold: '80'

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ require (
3737
golang.org/x/time v0.15.0
3838
google.golang.org/protobuf v1.36.12
3939
gopkg.in/yaml.v3 v3.0.1
40-
k8s.io/api v0.36.3
41-
k8s.io/apimachinery v0.36.3
42-
k8s.io/client-go v0.36.3
40+
k8s.io/api v0.36.4
41+
k8s.io/apimachinery v0.36.4
42+
k8s.io/client-go v0.36.4
4343
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3
4444
oras.land/oras-go/v2 v2.6.2
4545
sigs.k8s.io/controller-runtime v0.24.1
@@ -225,7 +225,7 @@ require (
225225
k8s.io/klog/v2 v2.140.0 // indirect
226226
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
227227
k8s.io/kubernetes v1.36.3 // indirect
228-
k8s.io/streaming v0.36.3 // indirect
228+
k8s.io/streaming v0.36.4 // indirect
229229
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
230230
sigs.k8s.io/randfill v1.0.0 // indirect
231231
sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -585,16 +585,16 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
585585
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
586586
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
587587
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
588-
k8s.io/api v0.36.3 h1:NxB+05W2UGqXWFXcLO0RB5cnqnUPP5v5sVlaOH0Iz4w=
589-
k8s.io/api v0.36.3/go.mod h1:JzLQKqRHC5+I8RVj/lS3lCg0mg6nWI9Fo/Sk3ElxHzg=
588+
k8s.io/api v0.36.4 h1:RxrvqCL6vgH5/+UnTeu1IIFqYmGfy0hnyrod1rn35Oo=
589+
k8s.io/api v0.36.4/go.mod h1:S2B3orCFBDhrgyWbLeuKcT2QdHIpQesBkCYSlWtwUOw=
590590
k8s.io/apiextensions-apiserver v0.36.3 h1:dPmOAPhwTtqb1bTxbFPsy18KHPhktQeO3WUPXunZIB0=
591591
k8s.io/apiextensions-apiserver v0.36.3/go.mod h1:KTXFqgXiuw2pRoL+Wpmttqc+up9Xt/GohadPWeLLOa4=
592-
k8s.io/apimachinery v0.36.3 h1:PkzMRBRG8joFD8EhCuQAtNPvJlxb82FwplP26HIzvAM=
593-
k8s.io/apimachinery v0.36.3/go.mod h1:cTSjBWgPe/6CQyBKzY/hDIRWCQQQeK0mfLbml0UYFHE=
592+
k8s.io/apimachinery v0.36.4 h1:PT2UzkupGuAx/+xT5XjiMJ1WGpY3fn9/hdAvjweRet4=
593+
k8s.io/apimachinery v0.36.4/go.mod h1:p2I2dipt7JHG+quVwQ1d02d28O4GdDi77RByQ13MTpk=
594594
k8s.io/apiserver v0.36.3 h1:MGSg2SkdfuytiDEcRylT5mQFmmSsbx90XFUO67Y4bsQ=
595595
k8s.io/apiserver v0.36.3/go.mod h1:fVH7zv9EUNUA7Fl7LtDKh8aB9W7u1VQPSGtWV5SjUxg=
596-
k8s.io/client-go v0.36.3 h1:M4JdVzXxYcZk4fGpfDdYnxSwhLKWCFoQsHW6t+z8Hfg=
597-
k8s.io/client-go v0.36.3/go.mod h1:gcPwr0c87vjjG6HB6pWEqOeuYVoXSsREjzux2j6GF30=
596+
k8s.io/client-go v0.36.4 h1:MDvfDNvMSt0Br94SK8neviVlwL9qifw9B26hJCpD1K0=
597+
k8s.io/client-go v0.36.4/go.mod h1:pNK4WKELbwlEDvtbE8l22lEZL5THYF61H5EealokZmA=
598598
k8s.io/component-base v0.36.3 h1:vc/UFvPCkW0irPz84LAodAL1j3f4xktPM6dDJIEheAY=
599599
k8s.io/component-base v0.36.3/go.mod h1:hZbNFG+gCMl9EbykDGEu73feKP9/Cq6JsV4pTo9GTO8=
600600
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
@@ -603,8 +603,8 @@ k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad h1:oXImqH8mQNk7PmvzKhmN3d
603603
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I=
604604
k8s.io/kubernetes v1.36.3 h1:qDQdoMiluAE2Eab6Fa52YV+WjiGz9mZFFoagEA6cI+o=
605605
k8s.io/kubernetes v1.36.3/go.mod h1:6oChkQeI7Yf6lV9lFpSdRzODdbY/ECp/4zUeBk8ONaw=
606-
k8s.io/streaming v0.36.3 h1:9rAaqBk0C0Pc7+/fqGekj07NV+/Xrew58p647A0JT8w=
607-
k8s.io/streaming v0.36.3/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
606+
k8s.io/streaming v0.36.4 h1:RS5YlhrdBN2pKGVjgygGntdu6SNdsduyjGWGe3cX0vo=
607+
k8s.io/streaming v0.36.4/go.mod h1:tJ6S2bZa2HxIBauguBbCWSCYyd93Grfz1+z3tcOvlDE=
608608
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE=
609609
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM=
610610
oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo=

‎vendor/k8s.io/client-go/tools/cache/fake_custom_store.go‎

Lines changed: 28 additions & 9 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
@@ -1234,7 +1234,7 @@ gopkg.in/yaml.v2
12341234
# gopkg.in/yaml.v3 v3.0.1
12351235
## explicit
12361236
gopkg.in/yaml.v3
1237-
# k8s.io/api v0.36.3
1237+
# k8s.io/api v0.36.4
12381238
## explicit; go 1.26.0
12391239
k8s.io/api/admissionregistration/v1
12401240
k8s.io/api/admissionregistration/v1alpha1
@@ -1303,7 +1303,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
13031303
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
13041304
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
13051305
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
1306-
# k8s.io/apimachinery v0.36.3
1306+
# k8s.io/apimachinery v0.36.4
13071307
## explicit; go 1.26.0
13081308
k8s.io/apimachinery/pkg/api/equality
13091309
k8s.io/apimachinery/pkg/api/errors
@@ -1376,7 +1376,7 @@ k8s.io/apiserver/pkg/cel
13761376
k8s.io/apiserver/pkg/cel/library
13771377
k8s.io/apiserver/pkg/features
13781378
k8s.io/apiserver/pkg/util/feature
1379-
# k8s.io/client-go v0.36.3
1379+
# k8s.io/client-go v0.36.4
13801380
## explicit; go 1.26.0
13811381
k8s.io/client-go/applyconfigurations
13821382
k8s.io/client-go/applyconfigurations/admissionregistration/v1
@@ -1753,7 +1753,7 @@ k8s.io/kube-openapi/pkg/validation/strfmt/bson
17531753
## explicit; go 1.26.0
17541754
k8s.io/kubernetes/pkg/apis/core
17551755
k8s.io/kubernetes/pkg/apis/core/helper
1756-
# k8s.io/streaming v0.36.3
1756+
# k8s.io/streaming v0.36.4
17571757
## explicit; go 1.26.0
17581758
k8s.io/streaming/pkg/httpstream
17591759
k8s.io/streaming/pkg/httpstream/spdy

0 commit comments

Comments
 (0)