mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-18 16:21:13 +00:00
Merge pull request #121282 from neolit123/1.29-fix-typos-in-elliptic-kubeadm-api
kubeadm: fix "eliptic" typo in API package
This commit is contained in:
commit
760599db27
@ -141,7 +141,7 @@ type ClusterConfiguration struct {
|
|||||||
ClusterName string
|
ClusterName string
|
||||||
|
|
||||||
// EncryptionAlgorithm holds the type of asymmetric encryption algorithm used for keys and certificates.
|
// EncryptionAlgorithm holds the type of asymmetric encryption algorithm used for keys and certificates.
|
||||||
// Can be "RSA" (default algorithm, key size is 2048) or "ECDSA" (uses the P-256 eliptic curve).
|
// Can be "RSA" (default algorithm, key size is 2048) or "ECDSA" (uses the P-256 elliptic curve).
|
||||||
EncryptionAlgorithm EncryptionAlgorithmType
|
EncryptionAlgorithm EncryptionAlgorithmType
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ limitations under the License.
|
|||||||
// `Scheduler.ExtraArgs`, `Etcd.Local.ExtraArgs`. Also to `NodeRegistrationOptions.KubeletExtraArgs`.
|
// `Scheduler.ExtraArgs`, `Etcd.Local.ExtraArgs`. Also to `NodeRegistrationOptions.KubeletExtraArgs`.
|
||||||
// - Add `ClusterConfiguration.EncryptionAlgorithm` that can be used to set the asymmetric encryption algorithm
|
// - Add `ClusterConfiguration.EncryptionAlgorithm` that can be used to set the asymmetric encryption algorithm
|
||||||
// used for this cluster's keys and certificates. Can be "RSA" (default algorithm, key size is 2048) or
|
// used for this cluster's keys and certificates. Can be "RSA" (default algorithm, key size is 2048) or
|
||||||
// "ECDSA" (uses the P-256 eliptic curve).
|
// "ECDSA" (uses the P-256 elliptic curve).
|
||||||
//
|
//
|
||||||
// Migration from old kubeadm config versions
|
// Migration from old kubeadm config versions
|
||||||
//
|
//
|
||||||
|
@ -142,7 +142,7 @@ type ClusterConfiguration struct {
|
|||||||
ClusterName string `json:"clusterName,omitempty"`
|
ClusterName string `json:"clusterName,omitempty"`
|
||||||
|
|
||||||
// EncryptionAlgorithm holds the type of asymmetric encryption algorithm used for keys and certificates.
|
// EncryptionAlgorithm holds the type of asymmetric encryption algorithm used for keys and certificates.
|
||||||
// Can be "RSA" (default algorithm, key size is 2048) or "ECDSA" (uses the P-256 eliptic curve).
|
// Can be "RSA" (default algorithm, key size is 2048) or "ECDSA" (uses the P-256 elliptic curve).
|
||||||
// +optional
|
// +optional
|
||||||
EncryptionAlgorithm EncryptionAlgorithmType `json:"encryptionAlgorithm,omitempty"`
|
EncryptionAlgorithm EncryptionAlgorithmType `json:"encryptionAlgorithm,omitempty"`
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user