Merge pull request #418 from yussufsh/gomod

Remove panic calls and use fatal instead

Author: k8s-ci-robot

cmd/options.go

@@ -89,7 +89,7 @@ func GetOptions(fs *flag.FlagSet) *Options {
 	}
 
 	if err := fs.Parse(args); err != nil {
-		panic(err)
+		klog.Fatal(err)
 	}
 
 	if *version {

pkg/cloud/powervs.go

@@ -38,20 +38,6 @@ import (
 
 var _ Cloud = &powerVSCloud{}
 
-var (
-	// TODO: Never seen these catalog values changing, lets add code to get these values in future for the sake of better design.
-
-	// This can be found in the IBM Cloud catalog, command used to get this information is
-	// $ ibmcloud catalog service-marketplace| grep power-iaas
-	// abd259f0-9990-11e8-acc8-b9f54a8f1661 power-iaas
-	powerVSServiceID = "abd259f0-9990-11e8-acc8-b9f54a8f1661"
-
-	// PlanID can be fetched via command:
-	// $ ibmcloud catalog service abd259f0-9990-11e8-acc8-b9f54a8f1661 | grep plan
-	//                 power-virtual-server-group                    plan         f165dd34-3a40-423b-9d95-e90a23f724dd
-	powerVSPlanID = "f165dd34-3a40-423b-9d95-e90a23f724dd"
-)
-
 const (
 	PollTimeout          = 120 * time.Second
 	PollInterval         = 5 * time.Second
@@ -92,28 +78,24 @@ func NewPowerVSCloud(cloudInstanceID, zone string, debug bool) (Cloud, error) {
 func newPowerVSCloud(cloudInstanceID, zone string, debug bool) (Cloud, error) {
 	apikey := os.Getenv("IBMCLOUD_API_KEY")
 
+	authenticator := &core.IamAuthenticator{ApiKey: apikey}
+
 	serviceClientOptions := &resourcecontrollerv2.ResourceControllerV2Options{
-		Authenticator: &core.IamAuthenticator{ApiKey: apikey},
+		Authenticator: authenticator,
 	}
-	serviceClient, err := resourcecontrollerv2.NewResourceControllerV2UsingExternalConfig(serviceClientOptions)
+	serviceClient, err := resourcecontrollerv2.NewResourceControllerV2(serviceClientOptions)
 	if err != nil {
-		return nil, fmt.Errorf("errored while creating NewResourceControllerV2UsingExternalConfig: %v", err)
+		return nil, fmt.Errorf("errored while creating NewResourceControllerV2: %v", err)
 	}
-	resourceInstanceList, _, err := serviceClient.ListResourceInstances(&resourcecontrollerv2.ListResourceInstancesOptions{
-		GUID:           &cloudInstanceID,
-		ResourceID:     &powerVSServiceID,
-		ResourcePlanID: &powerVSPlanID,
+	resourceInstance, _, err := serviceClient.GetResourceInstance(&resourcecontrollerv2.GetResourceInstanceOptions{
+		ID: &cloudInstanceID,
 	})
-	if err != nil {
-		return nil, fmt.Errorf("errored while listing the Power VS service instance with ID: %s, err: %v", cloudInstanceID, err)
-	}
 
-	if len(resourceInstanceList.Resources) == 0 {
-		return nil, fmt.Errorf("no Power VS service instance found with ID: %s", cloudInstanceID)
+	if err != nil {
+		return nil, fmt.Errorf("errored while getting the Power VS service instance with ID: %s, err: %v", cloudInstanceID, err)
 	}
 
-	authenticator := &core.IamAuthenticator{ApiKey: apikey}
-	piOptions := ibmpisession.IBMPIOptions{Authenticator: authenticator, Debug: debug, UserAccount: *resourceInstanceList.Resources[0].AccountID, Zone: zone}
+	piOptions := ibmpisession.IBMPIOptions{Authenticator: authenticator, Debug: debug, UserAccount: *resourceInstance.AccountID, Zone: zone}
 	piSession, err := ibmpisession.NewIBMPISession(&piOptions)
 	if err != nil {
 		return nil, err

pkg/cloud/powervs_node.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 )
 
@@ -65,7 +66,7 @@ func NewNodeUpdateScope(params NodeUpdateScopeParams) (scope *NodeUpdateScope, e
 
 	c, err := NewPowerVSCloud(scope.ServiceInstanceId, scope.Zone, false)
 	if err != nil {
-		panic(err)
+		klog.Fatalf("Failed to get powervs cloud: %v", err)
 	}
 	scope.Cloud = c
 

pkg/driver/controller.go

@@ -89,7 +89,7 @@ var (
 )
 
 // newControllerService creates a new controller service
-// it panics if failed to create the service
+// it will print stack trace and osexit if failed to create the service
 func newControllerService(driverOptions *Options) controllerService {
 	var (
 		cloudInstanceId string
@@ -99,31 +99,31 @@ func newControllerService(driverOptions *Options) controllerService {
 		var cloudConfig CloudConfig
 		config, err := os.Open(driverOptions.cloudconfig)
 		if nil != err {
-			panic(err)
+			klog.Fatalf("Failed to get cloud config: %v", err)
 		}
 		defer config.Close()
 
 		if err := gcfg.FatalOnly(gcfg.ReadInto(&cloudConfig, config)); err != nil {
-			panic(err)
+			klog.Fatalf("Failed to read cloud config: %v", err)
 		}
 		cloudInstanceId = cloudConfig.Prov.PowerVSCloudInstanceID
 		zone = cloudConfig.Prov.PowerVSZone
 		if cloudInstanceId == "" || zone == "" {
-			panic(status.Errorf(codes.NotFound, "cloud instance id or zone is empty"))
+			klog.Fatalf("Failed to read cloud config: %v", status.Errorf(codes.NotFound, "cloud instance id or zone is empty"))
 		}
 	} else {
 		klog.V(4).Infof("retrieving node info from metadata service")
 		metadata, err := cloud.NewMetadataService(cloud.DefaultKubernetesAPIClient, driverOptions.kubeconfig)
 		if err != nil {
-			panic(err)
+			klog.Fatalf("Failed to get metadata service: %v", err)
 		}
 		cloudInstanceId = metadata.GetCloudInstanceId()
 		zone = metadata.GetZone()
 	}
 
 	c, err := NewPowerVSCloudFunc(cloudInstanceId, zone, driverOptions.debug)
 	if err != nil {
-		panic(err)
+		klog.Fatalf("Failed to get powervs cloud: %v", err)
 	}
 
 	return controllerService{

pkg/driver/node.go

@@ -73,17 +73,17 @@ type nodeService struct {
 }
 
 // newNodeService creates a new node service
-// it panics if failed to create the service
+// it will print stack trace and osexit if failed to create the service
 func newNodeService(driverOptions *Options) nodeService {
 	klog.V(4).Infof("retrieving node info from metadata service")
 	metadata, err := cloud.NewMetadataService(cloud.DefaultKubernetesAPIClient, driverOptions.kubeconfig)
 	if err != nil {
-		panic(err)
+		klog.Fatalf("Failed to get metadata service: %v", err)
 	}
 
 	pvsCloud, err := NewPowerVSCloudFunc(metadata.GetCloudInstanceId(), metadata.GetZone(), driverOptions.debug)
 	if err != nil {
-		panic(err)
+		klog.Fatalf("Failed to get powervs cloud: %v", err)
 	}
 
 	return nodeService{