Merge pull request #134592 from liggitt/automated-cherry-pick-of-#134588-upstream-release-1.31

Automated cherry pick of #134588: go 1.25.2/1.24.8 related fixes Kubernetes-commit: fdd91e5f661b6b6cbd6f8fecbf88b17659b9747d
Remove invalid SAN certificate construction
2026-05-15 19:53:50 +00:00 · 2025-10-14 08:39:35 -07:00 · 2025-10-09 16:27:05 -04:00 · 2025-01-22 20:38:33 +00:00 · 2024-09-12 18:15:22 +05:30
6 changed files with 9 additions and 7 deletions
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	golang.org/x/time v0.3.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/evanphx/json-patch.v4 v4.12.0
-	k8s.io/api v0.0.0-20240801003428-382a0912e579
+	k8s.io/api v0.0.0-20240827081448-46f6230a4e83
 	k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
--- a/go.sum
+++ b/go.sum
@@ -156,8 +156,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.0.0-20240801003428-382a0912e579 h1:pElFtnw6/eJb1SLes+tbAqfL/7IezesSZ1bLTO+b2UE=
-k8s.io/api v0.0.0-20240801003428-382a0912e579/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
+k8s.io/api v0.0.0-20240827081448-46f6230a4e83 h1:EHuPy/62w9Llhp491zNknjEuET9oMPQPPSAatwaM2NA=
+k8s.io/api v0.0.0-20240827081448-46f6230a4e83/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
--- a/rest/client_test.go
+++ b/rest/client_test.go
@@ -299,7 +299,7 @@ func TestHTTPProxy(t *testing.T) {
 	}))
 	defer testProxyServer.Close()

-	t.Logf(testProxyServer.URL)
+	t.Log(testProxyServer.URL)

 	u, err := url.Parse(testProxyServer.URL)
 	if err != nil {
--- a/tools/remotecommand/v4.go
+++ b/tools/remotecommand/v4.go
@@ -115,5 +115,5 @@ func (d *errorDecoderV4) decode(message []byte) error {
 		return errors.New("error stream protocol error: unknown error")
 	}

-	return fmt.Errorf(status.Message)
+	return errors.New(status.Message)
 }
--- a/transport/cache_test.go
+++ b/transport/cache_test.go
@@ -159,7 +159,7 @@ func TestTLSConfigKey(t *testing.T) {

 			shouldCacheA := valueA.Proxy == nil
 			if shouldCacheA != canCacheA {
-				t.Errorf("Unexpected canCache=false for " + nameA)
+				t.Error("Unexpected canCache=false for " + nameA)
 			}

 			configIsNotEmpty := !reflect.DeepEqual(*valueA, Config{})
--- a/util/cert/cert.go
+++ b/util/cert/cert.go
@@ -75,13 +75,15 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro
 			CommonName:   cfg.CommonName,
 			Organization: cfg.Organization,
 		},
-		DNSNames:              []string{cfg.CommonName},
 		NotBefore:             notBefore,
 		NotAfter:              now.Add(duration365d * 10).UTC(),
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,
 		IsCA:                  true,
 	}
+	if len(cfg.CommonName) > 0 {
+		tmpl.DNSNames = []string{cfg.CommonName}
+	}

 	certDERBytes, err := x509.CreateCertificate(cryptorand.Reader, &tmpl, &tmpl, key.Public(), key)
 	if err != nil {
Author	SHA1	Message	Date
Kubernetes Publisher	7e2ea0f194	Merge pull request #134592 from liggitt/automated-cherry-pick-of-#134588-upstream-release-1.31 Automated cherry pick of #134588: go 1.25.2/1.24.8 related fixes Kubernetes-commit: fdd91e5f661b6b6cbd6f8fecbf88b17659b9747d	2025-10-14 08:39:35 -07:00
Jordan Liggitt	b134ce0076	Remove invalid SAN certificate construction Kubernetes-commit: 9bd285d24dee6a874dd915b49e4d20179bb69092	2025-10-09 16:27:05 -04:00
Kubernetes Publisher	8eaec8fb35	Merge pull request #129519 from kishen-v/automated-cherry-pick-of-#127422-upstream-release-1.31 Automated cherry pick of #127422: Fix Go vet errors for master golang Kubernetes-commit: d7fc7e30cb630dab3351480c806c58a8c480156f	2025-01-22 20:38:33 +00:00
Abhishek Kr Srivastav	e935feb735	Fix Go vet errors for master golang Co-authored-by: Rajalakshmi-Girish <rajalakshmi.girish1@ibm.com> Co-authored-by: Abhishek Kr Srivastav <Abhishek.kr.srivastav@ibm.com> Kubernetes-commit: 9d10ddb0608aa20ce287c89be879f888f5823cf9	2024-09-12 18:15:22 +05:30