Skip to content

Commit ccaa780

Browse files
committed
Revert "Merge pull request kubernetes-sigs#3153 from guettli/fix-empty-auth-nil-pointer-exception-in-stop"
This reverts commit d82dcd8, reversing changes made to 1561e8c.
1 parent d82dcd8 commit ccaa780

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

pkg/internal/testing/controlplane/apiserver.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ func (s *APIServer) populateAPIServerCerts() error {
384384
return err
385385
}
386386

387-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0o640); err != nil {
387+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
388388
return err
389389
}
390-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0o640); err != nil {
390+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
391391
return err
392392
}
393393

@@ -404,10 +404,10 @@ func (s *APIServer) populateAPIServerCerts() error {
404404
return err
405405
}
406406

407-
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0o640); err != nil {
407+
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil {
408408
return err
409409
}
410-
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0o640)
410+
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640)
411411
}
412412

413413
// Stop stops this process gracefully, waits for its termination, and cleans up
@@ -421,9 +421,6 @@ func (s *APIServer) Stop() error {
421421
return err
422422
}
423423
}
424-
if s.Authn == nil {
425-
return nil
426-
}
427424
return s.Authn.Stop()
428425
}
429426

0 commit comments

Comments
 (0)