mirror of
https://github.com/rancher/rke.git
synced 2025-09-16 15:10:12 +00:00
Fetch certificates and state from nodes for legacy cluster
This commit is contained in:
committed by
Alena Prokharchyk
parent
3302099643
commit
c1372bc797
@@ -2,10 +2,12 @@ package pki
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rsa"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
@@ -15,6 +17,7 @@ import (
|
||||
"github.com/rancher/rke/log"
|
||||
v3 "github.com/rancher/types/apis/management.cattle.io/v3"
|
||||
"github.com/sirupsen/logrus"
|
||||
"k8s.io/client-go/util/cert"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -147,3 +150,98 @@ func DeployCertificatesOnHost(ctx context.Context, host *hosts.Host, crtMap map[
|
||||
}
|
||||
return doRunDeployer(ctx, host, env, certDownloaderImage, prsMap)
|
||||
}
|
||||
|
||||
func FetchCertificatesFromHost(ctx context.Context, extraHosts []*hosts.Host, host *hosts.Host, image, localConfigPath string, prsMap map[string]v3.PrivateRegistry) (map[string]CertificatePKI, error) {
|
||||
// rebuilding the certificates. This should look better after refactoring pki
|
||||
tmpCerts := make(map[string]CertificatePKI)
|
||||
|
||||
crtList := map[string]bool{
|
||||
CACertName: false,
|
||||
KubeAPICertName: false,
|
||||
KubeControllerCertName: true,
|
||||
KubeSchedulerCertName: true,
|
||||
KubeProxyCertName: true,
|
||||
KubeNodeCertName: true,
|
||||
KubeAdminCertName: false,
|
||||
RequestHeaderCACertName: false,
|
||||
APIProxyClientCertName: false,
|
||||
}
|
||||
|
||||
for _, etcdHost := range extraHosts {
|
||||
// Fetch etcd certificates
|
||||
crtList[GetEtcdCrtName(etcdHost.InternalAddress)] = false
|
||||
}
|
||||
|
||||
for certName, config := range crtList {
|
||||
certificate := CertificatePKI{}
|
||||
crt, err := FetchFileFromHost(ctx, GetCertTempPath(certName), image, host, prsMap, CertFetcherContainer, "certificates")
|
||||
// I will only exit with an error if it's not a not-found-error and this is not an etcd certificate
|
||||
if err != nil && !strings.HasPrefix(certName, "kube-etcd") {
|
||||
// IsErrNotFound doesn't catch this because it's a custom error
|
||||
if isFileNotFoundErr(err) {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, err
|
||||
|
||||
}
|
||||
// If I can't find an etcd I will not fail and will create it later.
|
||||
if crt == "" && strings.HasPrefix(certName, "kube-etcd") {
|
||||
tmpCerts[certName] = CertificatePKI{}
|
||||
continue
|
||||
}
|
||||
key, err := FetchFileFromHost(ctx, GetKeyTempPath(certName), image, host, prsMap, CertFetcherContainer, "certificate")
|
||||
|
||||
if config {
|
||||
config, err := FetchFileFromHost(ctx, GetConfigTempPath(certName), image, host, prsMap, CertFetcherContainer, "certificate")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
certificate.Config = config
|
||||
}
|
||||
parsedCert, err := cert.ParseCertsPEM([]byte(crt))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
parsedKey, err := cert.ParsePrivateKeyPEM([]byte(key))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
certificate.Certificate = parsedCert[0]
|
||||
certificate.Key = parsedKey.(*rsa.PrivateKey)
|
||||
tmpCerts[certName] = certificate
|
||||
logrus.Debugf("[certificates] Recovered certificate: %s", certName)
|
||||
}
|
||||
|
||||
if err := docker.RemoveContainer(ctx, host.DClient, host.Address, CertFetcherContainer); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return populateCertMap(tmpCerts, localConfigPath, extraHosts), nil
|
||||
|
||||
}
|
||||
|
||||
func FetchFileFromHost(ctx context.Context, filePath, image string, host *hosts.Host, prsMap map[string]v3.PrivateRegistry, containerName, state string) (string, error) {
|
||||
imageCfg := &container.Config{
|
||||
Image: image,
|
||||
}
|
||||
hostCfg := &container.HostConfig{
|
||||
Binds: []string{
|
||||
fmt.Sprintf("%s:/etc/kubernetes:z", path.Join(host.PrefixPath, "/etc/kubernetes")),
|
||||
},
|
||||
Privileged: true,
|
||||
}
|
||||
isRunning, err := docker.IsContainerRunning(ctx, host.DClient, host.Address, containerName, true)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if !isRunning {
|
||||
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, containerName, host.Address, state, prsMap); err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
file, err := docker.ReadFileFromContainer(ctx, host.DClient, host.Address, containerName, filePath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return file, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user