Skip to content

Commit 7866f42

Browse files
lockwobrlockwobr
committed
chore: update k8s version, fix chainsaw install
1 parent 86a2ef9 commit 7866f42

File tree

9 files changed

+31
-30
lines changed

9 files changed

+31
-30
lines changed

‎.github/workflows/agent-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ jobs:
284284
uses: helm/kind-action@v1
285285
with:
286286
version: v0.31.0
287-
node_image: kindest/node:v1.35.0
287+
node_image: kindest/node:v1.35.2
288288
config: operator/config/local-dev/kind-config.yaml
289289
cluster_name: kind
290290

‎operator/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ IMG_REPO ?= ghcr.io/nvidia/skyhook
2626
IMG ?= $(IMG_REPO)/operator
2727

2828
## default version of kind to use
29-
KIND_VERSION?=1.35.0
29+
KIND_VERSION?=1.35.2
3030

3131
PLATFORM := $(shell uname -s 2>/dev/null || echo unknown)
3232
SKYHOOK_NAMESPACE ?= skyhook

‎operator/api/v1alpha1/webhook_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
7575
// Note that you must have the required binaries setup under the bin directory to perform
7676
// the tests directly. When we run make test it will be setup and used automatically.
7777
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
78-
fmt.Sprintf("1.35.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
78+
fmt.Sprintf("1.35.2-%s-%s", runtime.GOOS, runtime.GOARCH)),
7979

8080
WebhookInstallOptions: envtest.WebhookInstallOptions{
8181
Paths: []string{filepath.Join("..", "..", "config", "webhook")},

‎operator/api/v1alpha1/zz_generated.deepcopy.go‎

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

‎operator/deps.mk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ endif
3939
GOLANGCI_LINT_VERSION ?= v2.10.1
4040
KUSTOMIZE_VERSION ?= v5.4.1
4141
CONTROLLER_TOOLS_VERSION ?= v0.18.0
42-
ENVTEST_K8S_VERSION ?= 1.35.0
42+
ENVTEST_K8S_VERSION ?= 1.35.2
4343
GOCOVER_VERSION ?= v1.4.0
4444
GINKGO_VERSION ?= v2.27.2
4545
MOCKERY_VERSION ?= v3.5.0
46-
CHAINSAW_VERSION ?= v0.2.10
46+
CHAINSAW_VERSION ?= v0.2.14
4747
HELM_VERSION ?= v3.18.5
4848
HELMIFY_VERSION ?= v0.4.12
4949
GO_LICENSES_VERSION ?= v1.6.0
@@ -109,8 +109,9 @@ mockery: $(LOCALBIN) ## Download mockery locally if necessary.
109109
test -s $(LOCALBIN)/mockery || GOBIN=$(LOCALBIN) go install github.com/vektra/mockery/v3@$(MOCKERY_VERSION)
110110

111111
.PHONY: chainsaw
112-
chainsaw: $(LOCALBIN) ## Download chainsaw locally if necessary.
113-
test -s $(LOCALBIN)/chainsaw || GOBIN=$(LOCALBIN) go install github.com/kyverno/chainsaw@$(CHAINSAW_VERSION)
112+
chainsaw: $(LOCALBIN) ## Download chainsaw binary if necessary.
113+
test -s $(LOCALBIN)/chainsaw || curl -sSfL https://github.com/kyverno/chainsaw/releases/download/$(CHAINSAW_VERSION)/chainsaw_$(OS)_$(ARCH).tar.gz | \
114+
tar --no-same-owner -zxv -C $(LOCALBIN) chainsaw
114115

115116
.PHONY: helm
116117
helm: $(LOCALBIN) ## Download helm locally if necessary.

‎operator/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/spf13/cobra v1.10.1
1111
github.com/stretchr/testify v1.11.1
1212
go.uber.org/zap v1.27.0
13-
k8s.io/api v0.35.0
14-
k8s.io/apimachinery v0.35.0
15-
k8s.io/cli-runtime v0.35.0
16-
k8s.io/client-go v0.35.0
17-
k8s.io/kubernetes v1.35.0
13+
k8s.io/api v0.35.2
14+
k8s.io/apimachinery v0.35.2
15+
k8s.io/cli-runtime v0.35.2
16+
k8s.io/client-go v0.35.2
17+
k8s.io/kubernetes v1.35.2
1818
sigs.k8s.io/controller-runtime v0.22.4
1919
)
2020

‎operator/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,22 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
232232
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
233233
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
234234
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
235-
k8s.io/api v0.35.0 h1:iBAU5LTyBI9vw3L5glmat1njFK34srdLmktWwLTprlY=
236-
k8s.io/api v0.35.0/go.mod h1:AQ0SNTzm4ZAczM03QH42c7l3bih1TbAXYo0DkF8ktnA=
235+
k8s.io/api v0.35.2 h1:tW7mWc2RpxW7HS4CoRXhtYHSzme1PN1UjGHJ1bdrtdw=
236+
k8s.io/api v0.35.2/go.mod h1:7AJfqGoAZcwSFhOjcGM7WV05QxMMgUaChNfLTXDRE60=
237237
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
238238
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
239-
k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8=
240-
k8s.io/apimachinery v0.35.0/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
241-
k8s.io/cli-runtime v0.35.0 h1:PEJtYS/Zr4p20PfZSLCbY6YvaoLrfByd6THQzPworUE=
242-
k8s.io/cli-runtime v0.35.0/go.mod h1:VBRvHzosVAoVdP3XwUQn1Oqkvaa8facnokNkD7jOTMY=
243-
k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE=
244-
k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o=
239+
k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
240+
k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
241+
k8s.io/cli-runtime v0.35.2 h1:3DNctzpPNXavqyrm/FFiT60TLk4UjUxuUMYbKOE970E=
242+
k8s.io/cli-runtime v0.35.2/go.mod h1:G2Ieu0JidLm5m1z9b0OkFhnykvJ1w+vjbz1tR5OFKL0=
243+
k8s.io/client-go v0.35.2 h1:YUfPefdGJA4aljDdayAXkc98DnPkIetMl4PrKX97W9o=
244+
k8s.io/client-go v0.35.2/go.mod h1:4QqEwh4oQpeK8AaefZ0jwTFJw/9kIjdQi0jpKeYvz7g=
245245
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
246246
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
247247
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
248248
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
249-
k8s.io/kubernetes v1.35.0 h1:PUOojD8c8E3csMP5NX+nLLne6SGqZjrYCscptyBfWMY=
250-
k8s.io/kubernetes v1.35.0/go.mod h1:Tzk9Y9W/XUFFFgTUVg+BAowoFe+Pc7koGLuaiLHdcFg=
249+
k8s.io/kubernetes v1.35.2 h1:2HthVDfK3YJYv624imuKXPzUJ17xQop9OT5dgT+IMKE=
250+
k8s.io/kubernetes v1.35.2/go.mod h1:AaPpCpiS8oAqRbEwpY5r3RitLpwpVp5lVXKFkJril58=
251251
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
252252
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
253253
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=

‎operator/internal/controller/suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ var _ = BeforeSuite(func() {
8080
// the tests directly. When we run make test it will be setup and used automatically.
8181
// NOTE: Also, this version needs to match what is installed in the make file
8282
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
83-
fmt.Sprintf("1.35.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
83+
fmt.Sprintf("1.35.2-%s-%s", runtime.GOOS, runtime.GOARCH)),
8484
// AttachControlPlaneOutput: true,
8585
// UseExistingCluster: ptr[bool](true),
8686
}

‎operator/vendor/modules.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ gopkg.in/inf.v0
348348
# gopkg.in/yaml.v3 v3.0.1
349349
## explicit
350350
gopkg.in/yaml.v3
351-
# k8s.io/api v0.35.0
351+
# k8s.io/api v0.35.2
352352
## explicit; go 1.25.0
353353
k8s.io/api/admission/v1
354354
k8s.io/api/admission/v1beta1
@@ -421,7 +421,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
421421
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
422422
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
423423
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
424-
# k8s.io/apimachinery v0.35.0
424+
# k8s.io/apimachinery v0.35.2
425425
## explicit; go 1.25.0
426426
k8s.io/apimachinery/pkg/api/equality
427427
k8s.io/apimachinery/pkg/api/errors
@@ -486,13 +486,13 @@ k8s.io/apimachinery/pkg/version
486486
k8s.io/apimachinery/pkg/watch
487487
k8s.io/apimachinery/third_party/forked/golang/json
488488
k8s.io/apimachinery/third_party/forked/golang/reflect
489-
# k8s.io/cli-runtime v0.35.0
489+
# k8s.io/cli-runtime v0.35.2
490490
## explicit; go 1.25.0
491491
k8s.io/cli-runtime/pkg/genericclioptions
492492
k8s.io/cli-runtime/pkg/genericiooptions
493493
k8s.io/cli-runtime/pkg/printers
494494
k8s.io/cli-runtime/pkg/resource
495-
# k8s.io/client-go v0.35.0
495+
# k8s.io/client-go v0.35.2
496496
## explicit; go 1.25.0
497497
k8s.io/client-go/applyconfigurations
498498
k8s.io/client-go/applyconfigurations/admissionregistration/v1
@@ -859,7 +859,7 @@ k8s.io/kube-openapi/pkg/spec3
859859
k8s.io/kube-openapi/pkg/util
860860
k8s.io/kube-openapi/pkg/util/proto
861861
k8s.io/kube-openapi/pkg/validation/spec
862-
# k8s.io/kubernetes v1.35.0
862+
# k8s.io/kubernetes v1.35.2
863863
## explicit; go 1.25.0
864864
k8s.io/kubernetes/pkg/apis/core
865865
k8s.io/kubernetes/pkg/apis/core/helper

0 commit comments

Comments
 (0)