From 4cdbf1f6e7b8010699bd2870b8368bd34139b890 Mon Sep 17 00:00:00 2001 From: Michael Burt Date: Thu, 23 Apr 2026 10:23:20 -0600 Subject: [PATCH 1/2] Rebase branch onto main From bed5c37adf372678e8f820c053f3ecc9075d23a2 Mon Sep 17 00:00:00 2001 From: Michael Burt Date: Thu, 23 Apr 2026 10:33:05 -0600 Subject: [PATCH 2/2] Upgrade go-jsonnet to v0.22.0 --- go.mod | 2 +- go.sum | 4 ++-- internal/commands/setup.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 655dcf69..50f49947 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-openapi/strfmt v0.24.0 github.com/go-openapi/validate v0.25.0 github.com/google/gnostic-models v0.7.0 - github.com/google/go-jsonnet v0.21.0 + github.com/google/go-jsonnet v0.22.0 github.com/iancoleman/strcase v0.2.0 github.com/jonboulle/clockwork v0.5.0 github.com/mattn/go-isatty v0.0.20 diff --git a/go.sum b/go.sum index de03e1e4..2da2ab88 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7O github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-jsonnet v0.21.0 h1:43Bk3K4zMRP/aAZm9Po2uSEjY6ALCkYUVIcz9HLGMvA= -github.com/google/go-jsonnet v0.21.0/go.mod h1:tCGAu8cpUpEZcdGMmdOu37nh8bGgqubhI5v2iSk3KJQ= +github.com/google/go-jsonnet v0.22.0 h1:o0bOAIE+9SIfRZ7FXQPuta0mHLLE0AwbY/L5GTH5CH8= +github.com/google/go-jsonnet v0.22.0/go.mod h1:pLhKpu0/ODjL2Zev4y+CmCoHKAgONT1gSLQyriuYh9w= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= diff --git a/internal/commands/setup.go b/internal/commands/setup.go index 1c623bbf..8dde92ff 100644 --- a/internal/commands/setup.go +++ b/internal/commands/setup.go @@ -34,7 +34,7 @@ var ( version = "dev" commit = "dev" goVersion = "unknown" - jsonnetVersion = "v0.21.0" // update this when library dependency is upgraded + jsonnetVersion = "v0.22.0" // update this when library dependency is upgraded clientGoVersion = "kubernetes-1.34.1" // ditto when client go dep is upgraded )