Merge pull request #13682 from ryfow/block-startup-for-cert

Auto commit by PR queue bot

cmd/kube-apiserver/app/server.go

@@ -499,9 +499,6 @@ func (s *APIServer) Run(_ []string) error {
 		}
 
 		glog.Infof("Serving securely on %s", secureLocation)
-		go func() {
-			defer util.HandleCrash()
-			for {
 		if s.TLSCertFile == "" && s.TLSPrivateKeyFile == "" {
 			s.TLSCertFile = path.Join(s.CertDirectory, "apiserver.crt")
 			s.TLSPrivateKeyFile = path.Join(s.CertDirectory, "apiserver.key")
@@ -516,6 +513,10 @@ func (s *APIServer) Run(_ []string) error {
 				glog.Infof("Using self-signed cert (%s, %s)", s.TLSCertFile, s.TLSPrivateKeyFile)
 			}
 		}
+
+		go func() {
+			defer util.HandleCrash()
+			for {
 				// err == systemd.SdNotifyNoSocket when not running on a systemd system
 				if err := systemd.SdNotify("READY=1\n"); err != nil && err != systemd.SdNotifyNoSocket {
 					glog.Errorf("Unable to send systemd daemon successful start message: %v\n", err)