Skip to content

Commit

Permalink
Surface errors when autodiscovery fails
Browse files Browse the repository at this point in the history 
We swallowd discovery errors (no/to many router etc).
Now those errors come up as events.
Furthermore I also fixed that all value can be set by the user und are checked for consitency.
  • Loading branch information
@databus23
databus23 committed Dec 1, 2017
1 parent 13fc199 commit 2a79087
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 34 deletions.
23 changes: 11 additions & 12 deletions pkg/client/openstack/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ type Project struct {
type Router struct {
ID string
Networks []Network
Subnets []Subnet
}

type Network struct {
ID string
ID string
Subnets []Subnet
}

type Subnet struct {
Expand Down Expand Up @@ -321,14 +321,14 @@ func (c *client) GetRouters(project_id string) ([]Router, error) {
if err != nil {
return nil, err
}
resultList := []Router{}
resultRouters := []Router{}
err = routers.List(networkClient, routers.ListOpts{TenantID: project_id}).EachPage(func(page pagination.Page) (bool, error) {
routerList, err := routers.ExtractRouters(page)
routers, err := routers.ExtractRouters(page)
if err != nil {
return false, err
}
for _, router := range routerList {
resultRouter := Router{ID: router.ID, Subnets: []Subnet{}}
for _, router := range routers {
resultRouter := Router{ID: router.ID}
networkIDs, err := getRouterNetworks(networkClient, router.ID)
if err != nil {
return false, err
Expand All @@ -338,27 +338,26 @@ func (c *client) GetRouters(project_id string) ([]Router, error) {
if err != nil {
return false, err
}
resultRouter.Networks = append(resultRouter.Networks, Network{ID: network.ID})
resultNetwork := Network{ID: network.ID, Subnets: make([]Subnet, 0, len(network.Subnets))}

for _, subnetID := range network.Subnets {
subnet, err := subnets.Get(networkClient, subnetID).Extract()
if err != nil {
return false, err
}
resultRouter.Subnets = append(resultRouter.Subnets, Subnet{ID: subnet.ID, CIDR: subnet.CIDR})
resultNetwork.Subnets = append(resultNetwork.Subnets, Subnet{ID: subnet.ID, CIDR: subnet.CIDR})
}
resultRouter.Networks = append(resultRouter.Networks, resultNetwork)
}
if len(resultRouter.Subnets) > 0 {
resultList = append(resultList, resultRouter)
}
resultRouters = append(resultRouters, resultRouter)
}
return true, nil
})

if err != nil {
return nil, err
}
return resultList, nil
return resultRouters, nil

}

Expand Down
80 changes: 58 additions & 22 deletions pkg/controller/ground.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/sapcc/kubernikus/pkg/api/models"
"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1"
"github.com/sapcc/kubernikus/pkg/client/kubernetes"
"github.com/sapcc/kubernikus/pkg/client/openstack"
"github.com/sapcc/kubernikus/pkg/controller/config"
"github.com/sapcc/kubernikus/pkg/controller/ground"
"github.com/sapcc/kubernikus/pkg/controller/metrics"
Expand Down Expand Up @@ -380,12 +381,12 @@ func (op *GroundControl) discoverKubernikusInfo(kluster *v1.Kluster) error {

if copy.Status.Apiserver == "" {
copy.Status.Apiserver = fmt.Sprintf("https://%s.%s", kluster.GetName(), op.Config.Kubernikus.Domain)
glog.V(5).Infof("[%v] Setting ServerURL to %v", kluster.Name, copy.Status.Apiserver)
glog.Infof("[%v] Setting ServerURL to %v", kluster.Name, copy.Status.Apiserver)
}

if copy.Status.Wormhole == "" {
copy.Status.Wormhole = fmt.Sprintf("https://%s-wormhole.%s", kluster.GetName(), op.Config.Kubernikus.Domain)
glog.V(5).Infof("[%v] Setting WormholeURL to %v", kluster.Name, copy.Status.Wormhole)
glog.Infof("[%v] Setting WormholeURL to %v", kluster.Name, copy.Status.Wormhole)
}

_, err = op.Clients.Kubernikus.Kubernikus().Klusters(kluster.Namespace).Update(copy)
Expand All @@ -407,38 +408,73 @@ func (op *GroundControl) discoverOpenstackInfo(kluster *v1.Kluster) error {

if copy.Spec.Openstack.ProjectID == "" {
copy.Spec.Openstack.ProjectID = kluster.Account()
glog.V(5).Infof("[%v] Setting ProjectID to %v", kluster.Name, copy.Spec.Openstack.ProjectID)
glog.Infof("[%v] Setting ProjectID to %v", kluster.Name, copy.Spec.Openstack.ProjectID)
}

if copy.Spec.Openstack.RouterID == "" {
if len(routers) == 1 {
copy.Spec.Openstack.RouterID = routers[0].ID
glog.V(5).Infof("[%v] Setting RouterID to %v", kluster.Name, copy.Spec.Openstack.RouterID)
var selectedRouter *openstack.Router

if routerID := copy.Spec.Openstack.RouterID; routerID != "" {
for _, router := range routers {
if router.ID == routerID {
selectedRouter = &router
break
}
}
if selectedRouter == nil {
return fmt.Errorf("Specified router %s not found in project", routerID)
}
} else {
if numRouters := len(routers); numRouters == 1 {
selectedRouter = &routers[0]
glog.Infof("[%v] Setting RouterID to %v", kluster.Name, selectedRouter.ID)
copy.Spec.Openstack.RouterID = selectedRouter.ID
} else {
glog.V(5).Infof("[%v] There's more than 1 router. Autodiscovery not possible!")
return fmt.Errorf("Found %d routers in project. Autoconfiguration not possible.", numRouters)
}
}

if copy.Spec.Openstack.NetworkID == "" {
if len(routers) == 1 {
if len(routers[0].Networks) == 1 {
copy.Spec.Openstack.NetworkID = routers[0].Networks[0].ID
glog.V(5).Infof("[%v] Setting NetworkID to %v", kluster.Name, copy.Spec.Openstack.NetworkID)
} else {
glog.V(5).Infof("[%v] There's more than 1 network on the router. Autodiscovery not possible!")
//we have a router beyond this point
var selectedNetwork *openstack.Network

if networkID := copy.Spec.Openstack.NetworkID; networkID != "" {
for _, network := range selectedRouter.Networks {
if network.ID == networkID {
selectedNetwork = &network
break
}
}
if selectedNetwork == nil {
return fmt.Errorf("Selected network %s not found on router %s", networkID, selectedRouter.ID)
}
} else {
if numNetworks := len(selectedRouter.Networks); numNetworks == 1 {
selectedNetwork = &selectedRouter.Networks[0]
copy.Spec.Openstack.NetworkID = selectedNetwork.ID
glog.Infof("[%v] Setting NetworkID to %v", kluster.Name, selectedNetwork.ID)
} else {
return fmt.Errorf("Found %d networks on router %s. Auto-configuration not possible. Please choose one.", numNetworks, selectedRouter.ID)

}
}

if copy.Spec.Openstack.LBSubnetID == "" {
if len(routers) == 1 {
if len(routers[0].Subnets) == 1 {
copy.Spec.Openstack.LBSubnetID = routers[0].Subnets[0].ID
glog.V(5).Infof("[%v] Setting LBSubnetID to %v", kluster.Name, copy.Spec.Openstack.LBSubnetID)
} else {
glog.V(5).Infof("[%v] There's more than 1 subnet on the router. Autodiscovery not possible!")
if subnetID := copy.Spec.Openstack.LBSubnetID; subnetID != "" {
found := false
for _, subnet := range selectedNetwork.Subnets {
if subnet.ID == subnetID {
found = true
break
}
}
if !found {
return fmt.Errorf("Selected subnet %s not found in network %s", subnetID, selectedNetwork.ID)
}
} else {
if numSubnets := len(selectedNetwork.Subnets); numSubnets == 1 {
copy.Spec.Openstack.LBSubnetID = selectedNetwork.Subnets[0].ID
glog.V(5).Infof("[%v] Setting LBSubnetID to %v", kluster.Name, copy.Spec.Openstack.LBSubnetID)
} else {
return fmt.Errorf("Found %d subnets for network %s. Auto-configuration not possible. Please choose one.", numSubnets, selectedNetwork.ID)
}
}

_, err = op.Clients.Kubernikus.Kubernikus().Klusters(kluster.Namespace).Update(copy)
Expand Down

0 comments on commit 2a79087

Please sign in to comment.