diff --git a/app/domain/k8s/certificate_test.go b/app/domain/k8s/certificate_test.go index 4a7588e4e..479d51e3e 100644 --- a/app/domain/k8s/certificate_test.go +++ b/app/domain/k8s/certificate_test.go @@ -36,7 +36,7 @@ func TestNewCertificateClient(t *testing.T) { func TestNewCertificateClientWithConfig(t *testing.T) { config := &rest.Config{} - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() client := k8s.NewCertificateClientWithConfig(config, clientset) @@ -85,7 +85,7 @@ func TestCertificateClient_GetTLSSecret(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() // Add secret to fake clientset if provided if tt.secret != nil { @@ -217,7 +217,7 @@ func TestCertificateClient_GetWebhookCABundle(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() // Add webhook to fake clientset if provided if tt.webhook != nil { @@ -306,7 +306,7 @@ func TestCertificateClient_PatchSecret(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() // Add secret to fake clientset if provided if tt.secret != nil { @@ -425,7 +425,7 @@ func TestCertificateClient_PatchWebhookConfiguration(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() // Add webhook to fake clientset if provided if tt.webhook != nil { @@ -480,7 +480,7 @@ func TestCertificateClient_PatchWebhookConfiguration(t *testing.T) { } func TestCertificateClient_PatchDataMarshalError(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() client := k8s.NewCertificateClientWithConfig(&rest.Config{}, clientset) // Create a secret first so we can patch it @@ -520,7 +520,7 @@ func TestCertificateClient_PatchDataMarshalError(t *testing.T) { func TestCertificateClient_GetTLSSecretMarshalError(t *testing.T) { // Test the case where JSON marshaling fails // This is hard to trigger with real data, but we can test the error handling - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() client := k8s.NewCertificateClientWithConfig(&rest.Config{}, clientset) // Create a secret with data that might cause marshaling issues @@ -554,7 +554,7 @@ func TestCertificateClient_GetTLSSecretMarshalError(t *testing.T) { } func TestCertificateClient_PatchesMarshalError(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() client := k8s.NewCertificateClientWithConfig(&rest.Config{}, clientset) // Create a webhook first so we can patch it diff --git a/app/functions/agent-validator/config/command_test.go b/app/functions/agent-validator/config/command_test.go index 021b9d7ea..47d24484e 100644 --- a/app/functions/agent-validator/config/command_test.go +++ b/app/functions/agent-validator/config/command_test.go @@ -22,7 +22,7 @@ func TestGenerateByName(t *testing.T) { namespace := "test-namespace" // Create a fake clientset with a service named "kube-state-metrics" - clientset := fake.NewSimpleClientset( + clientset := fake.NewClientset( &corev1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: "kube-state-metrics", @@ -92,7 +92,7 @@ func TestGenerateByLabel(t *testing.T) { namespace := "test-namespace" // Create a fake clientset with a service having Helm-specific labels - clientset := fake.NewSimpleClientset( + clientset := fake.NewClientset( &corev1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: "custom-service-name", diff --git a/app/utils/k8s/services_test.go b/app/utils/k8s/services_test.go index 698cae1ec..7e10a4b48 100644 --- a/app/utils/k8s/services_test.go +++ b/app/utils/k8s/services_test.go @@ -17,7 +17,7 @@ import ( ) func TestGetKubeStateMetricsURLByName(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() ctx := context.TODO() namespace := "test-namespace" @@ -43,7 +43,7 @@ func TestGetKubeStateMetricsURLByName(t *testing.T) { } func TestGetKubeStateMetricsURLByLabel(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() ctx := context.TODO() namespace := "test-namespace" @@ -73,7 +73,7 @@ func TestGetKubeStateMetricsURLByLabel(t *testing.T) { } func TestUpdateConfigMap(t *testing.T) { - clientset := fake.NewSimpleClientset() + clientset := fake.NewClientset() ctx := context.TODO() namespace := "test-namespace" diff --git a/go.mod b/go.mod index 5a6e7b100..248279845 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,9 @@ require ( github.com/urfave/cli/v2 v2.27.7 go.uber.org/mock v0.6.0 google.golang.org/protobuf v1.36.11 - k8s.io/api v0.34.3 - k8s.io/apimachinery v0.34.3 - k8s.io/client-go v0.34.3 + k8s.io/api v0.35.0 + k8s.io/apimachinery v0.35.0 + k8s.io/client-go v0.35.0 ) require ( @@ -58,8 +58,8 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect - k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect + k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect + k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/yaml v1.6.0 // indirect @@ -151,8 +151,6 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/onsi/ginkgo/v2 v2.23.4 // indirect - github.com/onsi/gomega v1.37.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.139.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.139.0 // indirect @@ -167,7 +165,6 @@ require ( github.com/prometheus/procfs v0.17.0 // indirect github.com/prometheus/sigv4 v0.3.0 // indirect github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect - github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/rs/xid v1.6.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tinylib/msgp v1.3.0 // indirect diff --git a/go.sum b/go.sum index 25849d58f..f017c8b46 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,9 @@ github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= +github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= @@ -325,10 +328,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= -github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus= -github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= -github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y= -github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= +github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns= +github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= +github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= +github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.139.0 h1:D5aGQCErSCb4sKIHoZhgR4El6AzgviTRYlHUpbSFqDo= github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.139.0/go.mod h1:ZjeRsA5oaVk89fg5D+iXStx2QncmhAvtGbdSumT07H4= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0 h1:6/j0Ta8ZJnmAFVEoC3aZ1Hs19RB4fHzlN6kOZhsBJqM= @@ -489,8 +492,6 @@ go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.1.0 h1:i8YpvWGm/Uq go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.1.0/go.mod h1:pQ70xHY/ZVxNUBPn+qUWPl8nwai87eWdqL3M37lNi9A= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= -go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= @@ -588,18 +589,18 @@ gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= -k8s.io/api v0.34.3 h1:D12sTP257/jSH2vHV2EDYrb16bS7ULlHpdNdNhEw2S4= -k8s.io/api v0.34.3/go.mod h1:PyVQBF886Q5RSQZOim7DybQjAbVs8g7gwJNhGtY5MBk= -k8s.io/apimachinery v0.34.3 h1:/TB+SFEiQvN9HPldtlWOTp0hWbJ+fjU+wkxysf/aQnE= -k8s.io/apimachinery v0.34.3/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= -k8s.io/client-go v0.34.3 h1:wtYtpzy/OPNYf7WyNBTj3iUA0XaBHVqhv4Iv3tbrF5A= -k8s.io/client-go v0.34.3/go.mod h1:OxxeYagaP9Kdf78UrKLa3YZixMCfP6bgPwPwNBQBzpM= +k8s.io/api v0.35.0 h1:iBAU5LTyBI9vw3L5glmat1njFK34srdLmktWwLTprlY= +k8s.io/api v0.35.0/go.mod h1:AQ0SNTzm4ZAczM03QH42c7l3bih1TbAXYo0DkF8ktnA= +k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8= +k8s.io/apimachinery v0.35.0/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= +k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE= +k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 h1:liMHz39T5dJO1aOKHLvwaCjDbf07wVh6yaUlTpunnkE= -k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= -k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0= -k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= +k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= +k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw= sigs.k8s.io/gateway-api v1.4.1 h1:NPxFutNkKNa8UfLd2CMlEuhIPMQgDQ6DXNKG9sHbJU8=