github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104796 from RA489/rmcsr

Browse Source 
remove the --csr* flags from "kubeadm certs renew"
This commit is contained in:
Kubernetes Prow Robot 2021-09-13 12:15:50 -07:00 committed by GitHub
commit f48336b0ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubeadm/app/cmd/certs.go
View File

@ -301,14 +301,6 @@ func addRenewFlags(cmd *cobra.Command, flags *renewFlags) {
options.AddConfigFlag(cmd.Flags(), &flags.cfgPath) options.AddConfigFlag(cmd.Flags(), &flags.cfgPath)
options.AddCertificateDirFlag(cmd.Flags(), &flags.cfg.CertificatesDir) options.AddCertificateDirFlag(cmd.Flags(), &flags.cfg.CertificatesDir)
options.AddKubeConfigFlag(cmd.Flags(), &flags.kubeconfigPath) options.AddKubeConfigFlag(cmd.Flags(), &flags.kubeconfigPath)
// TODO: remove these flags in a future version:
// https://github.com/kubernetes/kubeadm/issues/2163
const deprecationMessage = "This flag will be removed in a future version. Please use 'kubeadm certs generate-csr' instead."
options.AddCSRFlag(cmd.Flags(), &flags.csrOnly)
cmd.Flags().MarkDeprecated(options.CSROnly, deprecationMessage)
options.AddCSRDirFlag(cmd.Flags(), &flags.csrPath)
cmd.Flags().MarkDeprecated(options.CSRDir, deprecationMessage)
} }
func renewCert(flags *renewFlags, kdir string, internalcfg *kubeadmapi.InitConfiguration, handler *renewal.CertificateRenewHandler) error { func renewCert(flags *renewFlags, kdir string, internalcfg *kubeadmapi.InitConfiguration, handler *renewal.CertificateRenewHandler) error {

25
cmd/kubeadm/app/cmd/certs_test.go
View File

@ -269,31 +269,6 @@ func TestRunRenewCommands(t *testing.T) {
} }
} }
func TestRenewUsingCSR(t *testing.T) {
tmpDir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpDir)
cert := certsphase.KubeadmCertEtcdServer()
cfg := testutil.GetDefaultInternalConfig(t)
cfg.CertificatesDir = tmpDir
caCert, caKey, err := certsphase.KubeadmCertEtcdCA().CreateAsCA(cfg)
if err != nil {
t.Fatalf("couldn't write out CA %s: %v", certsphase.KubeadmCertEtcdCA().Name, err)
}
if err := cert.CreateFromCA(cfg, caCert, caKey); err != nil {
t.Fatalf("couldn't write certificate %s: %v", cert.Name, err)
}
renewCmds := getRenewSubCommands(os.Stdout, tmpDir)
cmdtestutil.RunSubCommand(t, renewCmds, cert.Name, "--csr-only", "--csr-dir="+tmpDir, fmt.Sprintf("--cert-dir=%s", tmpDir))
if _, _, err := pkiutil.TryLoadCSRAndKeyFromDisk(tmpDir, cert.Name); err != nil {
t.Fatalf("couldn't load certificate %q: %v", cert.Name, err)
}
}
func TestRunGenCSR(t *testing.T) { func TestRunGenCSR(t *testing.T) {
tmpDir := testutil.SetupTempDir(t) tmpDir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)