Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm: Honor cert-dir for cert operations #110709

Merged
merged 1 commit into from Jun 24, 2022
Merged

kubeadm: Honor cert-dir for cert operations #110709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions cmd/kubeadm/app/cmd/certs.go
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/spf13/pflag"

"k8s.io/apimachinery/pkg/util/duration"
"k8s.io/klog/v2"

kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
Expand Down Expand Up @@ -335,6 +336,14 @@ func getInternalCfg(cfgPath string, kubeconfigPath string, cfg kubeadmapiv1.Clus
internalcfg, err := configutil.FetchInitConfigurationFromCluster(client, nil, logPrefix, false, false)
if err == nil {
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
}
fmt.Printf("[%s] Error reading configuration from the Cluster. Falling back to default configuration\n\n", logPrefix)
Expand Down