Skip to content

Commit

Permalink
kubeadm: Honor cert-dir for cert operations
Browse files Browse the repository at this point in the history
- `cert-dir` could be specified to a value other than the default value
- we have tests that should be executed successfully on the working cluster

Signed-off-by: Dave Chen <dave.chen@arm.com>
  • Loading branch information
chendave committed Jun 23, 2022
1 parent 0246273 commit 57646c9
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions cmd/kubeadm/app/cmd/certs.go
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

0 comments on commit 57646c9

Please sign in to comment.