提交 ba9646ed 编写于 作者: L Lucas Käldström

Added error handling for certs as commented

上级 f94581f1
...@@ -56,7 +56,11 @@ func init() { ...@@ -56,7 +56,11 @@ func init() {
func SetupServer(s *localkube.LocalkubeServer) { func SetupServer(s *localkube.LocalkubeServer) {
s.GenerateCerts() err := s.GenerateCerts()
if err != nil {
fmt.Println("Failed to create certificates!")
panic(err)
}
// setup etcd // setup etcd
etcd, err := s.NewEtcd(localkube.KubeEtcdClientURLs, localkube.KubeEtcdPeerURLs, "kubeetcd", s.GetEtcdDataDirectory()) etcd, err := s.NewEtcd(localkube.KubeEtcdClientURLs, localkube.KubeEtcdPeerURLs, "kubeetcd", s.GetEtcdDataDirectory())
......
...@@ -36,7 +36,6 @@ import ( ...@@ -36,7 +36,6 @@ import (
etcd "github.com/coreos/go-etcd/etcd" etcd "github.com/coreos/go-etcd/etcd"
"github.com/golang/glog" "github.com/golang/glog"
skymsg "github.com/skynetservices/skydns/msg" skymsg "github.com/skynetservices/skydns/msg"
//flag "github.com/spf13/pflag"
kapi "k8s.io/kubernetes/pkg/api" kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/endpoints"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
......
...@@ -82,11 +82,11 @@ func (lk LocalkubeServer) GetHostIP() (net.IP, error) { ...@@ -82,11 +82,11 @@ func (lk LocalkubeServer) GetHostIP() (net.IP, error) {
return utilnet.ChooseBindAddress(net.ParseIP("0.0.0.0")) return utilnet.ChooseBindAddress(net.ParseIP("0.0.0.0"))
} }
func (lk LocalkubeServer) GenerateCerts() { func (lk LocalkubeServer) GenerateCerts() error {
if util.CanReadFile(lk.GetPublicKeyCertPath()) && util.CanReadFile(lk.GetPrivateKeyCertPath()) { if util.CanReadFile(lk.GetPublicKeyCertPath()) && util.CanReadFile(lk.GetPrivateKeyCertPath()) {
fmt.Println("Using existing certs") fmt.Println("Using these existing certs: ", lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath())
return return nil
} }
alternateIPs := []net.IP{lk.ServiceClusterIPRange.IP} alternateIPs := []net.IP{lk.ServiceClusterIPRange.IP}
...@@ -94,9 +94,13 @@ func (lk LocalkubeServer) GenerateCerts() { ...@@ -94,9 +94,13 @@ func (lk LocalkubeServer) GenerateCerts() {
hostIP, err := lk.GetHostIP() hostIP, err := lk.GetHostIP()
if err != nil { if err != nil {
fmt.Println("Failed to get host IP: ", err) fmt.Println("Failed to get host IP: ", err)
return err
} }
if err := utilcrypto.GenerateSelfSignedCert(hostIP.String(), lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath(), alternateIPs, alternateDNS); err != nil { if err := utilcrypto.GenerateSelfSignedCert(hostIP.String(), lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath(), alternateIPs, alternateDNS); err != nil {
fmt.Println("Failed to create certs: ", err) fmt.Println("Failed to create certs: ", err)
return err
} }
return nil
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册