mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #110709 from chendave/fix_renew
kubeadm: Honor `cert-dir` for cert operations
This commit is contained in:
commit
07dfdf0859
@ -26,6 +26,7 @@ import (
|
|||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/util/duration"
|
"k8s.io/apimachinery/pkg/util/duration"
|
||||||
|
"k8s.io/klog/v2"
|
||||||
|
|
||||||
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
||||||
kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
|
kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
|
||||||
@ -336,6 +337,14 @@ func getInternalCfg(cfgPath string, kubeconfigPath string, cfg kubeadmapiv1.Clus
|
|||||||
internalcfg, err := configutil.FetchInitConfigurationFromCluster(client, nil, logPrefix, false, false)
|
internalcfg, err := configutil.FetchInitConfigurationFromCluster(client, nil, logPrefix, false, false)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
fmt.Println() // add empty line to separate the FetchInitConfigurationFromCluster output from the command output
|
fmt.Println() // add empty line to separate the FetchInitConfigurationFromCluster output from the command output
|
||||||
|
// certificate renewal or expiration checking doesn't depend on a running cluster, which means the CertificatesDir
|
||||||
|
// could be set to a value other than the default value or the value fetched from the cluster.
|
||||||
|
// cfg.CertificatesDir could be empty if the default value is set to empty (not true today).
|
||||||
|
if len(cfg.CertificatesDir) != 0 {
|
||||||
|
klog.V(1).Infof("Overriding the cluster certificate directory with the value from command line flag --%s: %s", options.CertificatesDir, cfg.CertificatesDir)
|
||||||
|
internalcfg.ClusterConfiguration.CertificatesDir = cfg.CertificatesDir
|
||||||
|
}
|
||||||
|
|
||||||
return internalcfg, nil
|
return internalcfg, nil
|
||||||
}
|
}
|
||||||
fmt.Printf("[%s] Error reading configuration from the Cluster. Falling back to default configuration\n\n", logPrefix)
|
fmt.Printf("[%s] Error reading configuration from the Cluster. Falling back to default configuration\n\n", logPrefix)
|
||||||
|
Loading…
Reference in New Issue
Block a user