Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
4cbd4f7480 Update dependencies to v0.32.12 tag 2026-02-10 20:32:45 +00:00
Kubernetes Publisher
55b810f8ee Merge pull request #134591 from liggitt/automated-cherry-pick-of-#134588-upstream-release-1.32
Automated cherry pick of #134588: go 1.25.2/1.24.8 related fixes

Kubernetes-commit: 53ac0cd1ee5b4f95057b86bb18d5f949245cfc16
2025-10-14 16:36:45 +00:00
Jordan Liggitt
7e6bf40aa6 Remove invalid SAN certificate construction
Kubernetes-commit: 4983187b9a7b97b5932508d9c42979b928218cb8
2025-10-09 16:27:05 -04:00
3 changed files with 9 additions and 7 deletions

4
go.mod
View File

@@ -28,8 +28,8 @@ require (
golang.org/x/time v0.7.0
google.golang.org/protobuf v1.35.1
gopkg.in/evanphx/json-patch.v4 v4.12.0
k8s.io/api v0.32.0
k8s.io/apimachinery v0.32.0
k8s.io/api v0.32.12
k8s.io/apimachinery v0.32.12
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738

8
go.sum
View File

@@ -150,10 +150,10 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
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.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/api v0.32.12 h1:jnP6b3q7wxE9Gpe6yGFm7X+08YP3Ijmaa45xgI1Nol8=
k8s.io/api v0.32.12/go.mod h1:qKY+lZNlvayx+XjQd+gFysLFZUSwLrj5+Djf/hOtsZU=
k8s.io/apimachinery v0.32.12 h1:Aa5uYUnZ/GwWHd0ZJWGTVxzd+Xksc+dM5S1AFHw5+Mo=
k8s.io/apimachinery v0.32.12/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
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-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

View File

@@ -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 {