UPSTREAM: <drop>: Revert "certificates default to tolerate no key enc…

…ipherment" This reverts commit 3ace3eb.
openshift · Apr 11, 2023 · 9428f8b · 9428f8b
1 parent eeb32c1
commit 9428f8b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/apis/certificates/v1beta1/defaults.go b/pkg/apis/certificates/v1beta1/defaults.go
@@ -56,9 +56,9 @@ func DefaultSignerNameFromSpec(obj *certificatesv1beta1.CertificateSigningReques
 		// Set the signerName to 'legacy-unknown' as the CSR could not be
 		// recognised.
 		return certificatesv1beta1.LegacyUnknownSignerName
-	case IsKubeletClientCSR(csr, obj.Usages, true):
+	case IsKubeletClientCSR(csr, obj.Usages, false):
 		return certificatesv1beta1.KubeAPIServerClientKubeletSignerName
-	case IsKubeletServingCSR(csr, obj.Usages, true):
+	case IsKubeletServingCSR(csr, obj.Usages, false):
 		return certificatesv1beta1.KubeletServingSignerName
 	default:
 		return certificatesv1beta1.LegacyUnknownSignerName