mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-07-28 23:49:33 +00:00
fix: Remove unused legacy certificates
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
(cherry picked from commit db778faaf3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
@@ -179,6 +179,11 @@ func CreateRuntimeCertFiles(config *config.Control) {
|
||||
// needed to successfully bootstrap a cluster.
|
||||
func GenServerDeps(config *config.Control) error {
|
||||
runtime := config.Runtime
|
||||
|
||||
if err := cleanupLegacyCerts(config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := genCerts(config); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -447,7 +452,7 @@ func genServerCerts(config *config.Control) error {
|
||||
}
|
||||
|
||||
altNames = &certutil.AltNames{}
|
||||
addSANs(altNames, []string{"localhost" ,"127.0.0.1", "::1"})
|
||||
addSANs(altNames, []string{"localhost", "127.0.0.1", "::1"})
|
||||
|
||||
if _, err := createClientCertKey(regen, "kube-scheduler", nil,
|
||||
altNames, []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
||||
@@ -664,6 +669,20 @@ func createClientCertKey(regen bool, commonName string, organization []string, a
|
||||
return true, certutil.WriteCert(certFile, util.EncodeCertsPEM(cert, caCerts))
|
||||
}
|
||||
|
||||
func cleanupLegacyCerts(config *config.Control) error {
|
||||
// remove legacy certs that are no longer used
|
||||
legacyCerts := []string{
|
||||
config.Runtime.ClientKubeProxyCert,
|
||||
config.Runtime.ClientK3sControllerCert,
|
||||
}
|
||||
for _, cert := range legacyCerts {
|
||||
if err := os.Remove(cert); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func exists(files ...string) bool {
|
||||
for _, file := range files {
|
||||
if _, err := os.Stat(file); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user