Merge pull request #1108 from CodesbyUnnati/bump-k8s-1.35

Bump k8s to 1.35 to fix CVEs

Author: devacts

go.mod

@@ -1,32 +1,32 @@
 module carvel.dev/kapp
 
-go 1.25.6
+go 1.25.7
 
 require (
 	carvel.dev/ytt v0.53.0
+	github.com/carvel-dev/difflib v0.0.0-20240118055029-596a7a5585c3
 	github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef
 	github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
 	github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
 	github.com/cppforlife/go-patch v0.0.0-20240118020416-2147782e467b
 	github.com/google/go-cmp v0.7.0
 	github.com/hashicorp/go-version v1.6.0
-	github.com/k14s/difflib v0.0.0-20240118055029-596a7a5585c3
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11
-	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.6
-	github.com/stretchr/testify v1.10.0
+	github.com/spf13/cobra v1.10.0
+	github.com/spf13/pflag v1.0.9
+	github.com/stretchr/testify v1.11.1
 	github.com/vmware-tanzu/carvel-kapp-controller v0.51.0
 	golang.org/x/net v0.47.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.34.2
-	k8s.io/apiextensions-apiserver v0.31.2
-	k8s.io/apimachinery v0.34.2
-	k8s.io/apiserver v0.31.2
-	k8s.io/client-go v0.34.2
-	k8s.io/component-helpers v0.31.2
-	k8s.io/kubernetes v1.31.14
-	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
+	k8s.io/api v0.35.0
+	k8s.io/apiextensions-apiserver v0.35.0
+	k8s.io/apimachinery v0.35.0
+	k8s.io/apiserver v0.35.0
+	k8s.io/client-go v0.35.0
+	k8s.io/component-helpers v0.35.0
+	k8s.io/kubernetes v1.35.0
+	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 	sigs.k8s.io/yaml v1.6.0
 )
 
@@ -56,29 +56,31 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/vito/go-interact v1.0.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/term v0.37.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.31.2 // indirect
+	k8s.io/component-base v0.35.0 // indirect
+	k8s.io/controller-manager v0.35.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )

go.sum

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/k14s/difflib"
+	"github.com/carvel-dev/difflib"
 )
 
 type TextDiff struct {

pkg/kapp/diff/text_diff.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	ctlconf "carvel.dev/kapp/pkg/kapp/config"
+	"github.com/carvel-dev/difflib"
 	"github.com/cppforlife/color"
-	"github.com/k14s/difflib"
 )
 
 type TextDiffViewOpts struct {

pkg/kapp/diff/text_diff_view.go

@@ -4,7 +4,6 @@
 package diffgraph_test
 
 import (
-	"strings"
 	"testing"
 
 	ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph"
@@ -21,8 +20,6 @@ func TestNewChangeGroupFromAnnString(t *testing.T) {
 		"valid-name.com/valid",
 		"valid-name.com/valid-name_Another_Name--valid",
 		"valid-name.com/valid-name_CustomResourceDefinition--valid",
-		// Allow arbitrary long names since it might be populated with data via placeholders
-		"valid-name.com/valid-name_CustomResourceDefinition--valid" + strings.Repeat("a", 1000),
 		// Example from pinniped of a long name
 		"change-groups.kapp.k14s.io/crds-authentication.concierge.pinniped.dev-WebhookAuthenticator",
 	}