Merge pull request #4 from prajyot-workspace/update-ignition

COS related fixes

Author: Karthik-K-N

cloud/scope/powervs_cluster.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
@@ -61,9 +60,6 @@ const (
 	// PowerVS service and plan name
 	powerVSService     = "power-iaas"
 	powerVSServicePlan = "power-virtual-server-group"
-
-	//TODO: Remove this
-	APIKEY = ""
 )
 
 const (
@@ -1305,11 +1301,16 @@ func (s *PowerVSClusterScope) ReconcileCOSInstance() error {
 		s.SetStatus(COSInstance, infrav1beta2.ResourceReference{ID: cosServiceInstanceStatus.GUID, ControllerCreated: pointer.Bool(true)})
 	}
 
-	apiKey := os.Getenv("IBMCLOUD_API_KEY")
-	if apiKey == "" {
+	props, err := authenticator.GetProperties()
+	if err != nil {
+		s.Error(err, "error while fetching service properties")
+		return err
+	}
+
+	apiKey := props["APIKEY"]
+	if len(apiKey) == 0 {
 		fmt.Printf("ibmcloud api key is not provided, set %s environmental variable", "IBMCLOUD_API_KEY")
 	}
-	apiKey = APIKEY
 
 	cosClient, err := cos.NewService(cos.ServiceOptions{}, s.IBMPowerVSCluster.Spec.CosInstance.BucketRegion, apiKey, *cosServiceInstanceStatus.GUID)
 	if err != nil {

cloud/scope/powervs_machine.go

@@ -24,7 +24,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"os"
 	"path"
 	"regexp"
 	"strconv"
@@ -56,6 +55,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
+	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/cos"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
@@ -378,36 +378,14 @@ func (m *PowerVSMachineScope) createIgnitionData(data []byte) (string, error) {
 		return "", fmt.Errorf("got empty data")
 	}
 
-	serviceInstanceName := fmt.Sprintf("%s-%s", m.IBMPowerVSCluster.GetName(), "cosInstance")
-	serviceInstance, err := m.ResourceClient.GetInstanceByName(serviceInstanceName, cosResourceID, cosResourcePlanID)
+	cosClient, err := m.createCOSClient()
 	if err != nil {
-		m.Error(err, "failed to get cos service instance", "name", serviceInstanceName)
-		return "", err
-	}
-	if serviceInstance == nil {
-		m.Info("cos service instance is nil")
-		return "", err
-	}
-	if *serviceInstance.State != "active" {
-		m.Info("cos service instance is not in active state", "state", *serviceInstance.State)
-		return "", fmt.Errorf("cos instance not in active state, current state: %s", *serviceInstance.State)
+		m.Error(err, "failed to create cosClient")
+		return "", fmt.Errorf("failed to create cosClient %w", err)
 	}
 	key := m.bootstrapDataKey()
 	m.Info("bootstrap data key", "key", key)
 
-	//TODO(karthik-k-n): Fix me
-	apiKey := os.Getenv("IBMCLOUD_API_KEY")
-	if apiKey == "" {
-		fmt.Printf("ibmcloud api key is not provided, set %s environmental variable", "IBMCLOUD_API_KEY")
-	}
-	apiKey = APIKEY
-
-	cosClient, err := cos.NewService(cos.ServiceOptions{}, m.IBMPowerVSCluster.Spec.CosInstance.BucketRegion, apiKey, *serviceInstance.GUID)
-	if err != nil {
-		m.Error(err, "failed to create cos client")
-		return "", fmt.Errorf("failed to create cos client: %w", err)
-	}
-
 	bucket := m.IBMPowerVSCluster.Spec.CosInstance.BucketName
 	if _, err := cosClient.PutObject(&s3.PutObjectInput{
 		Body:   aws.ReadSeekCloser(bytes.NewReader(data)),
@@ -507,6 +485,71 @@ func (m *PowerVSMachineScope) DeleteMachine() error {
 	return nil
 }
 
+// DeleteMachineIgnition deletes the ignition associated with machine.
+func (m *PowerVSMachineScope) DeleteMachineIgnition() error {
+	cosClient, err := m.createCOSClient()
+	if err != nil {
+		m.Error(err, "failed to create cosClient")
+		return fmt.Errorf("failed to create cosClient %w", err)
+	}
+
+	bucket := m.IBMPowerVSCluster.Spec.CosInstance.BucketName
+	objs, _ := cosClient.ListObjects(&s3.ListObjectsInput{
+		Bucket: aws.String(bucket),
+	})
+
+	for _, j := range objs.Contents {
+		if strings.Contains(*j.Key, m.Name()) {
+			if _, err := cosClient.DeleteObject(&s3.DeleteObjectInput{
+				Bucket: aws.String(bucket),
+				Key:    j.Key,
+			}); err != nil {
+				m.Error(err, "failed to delete cos object")
+				record.Warnf(m.IBMPowerVSMachine, "FailedDeleteMachineIgnition", "Failed machine ignition deletion - %v", err)
+				return fmt.Errorf("failed to delete cos object %w", err)
+			}
+		}
+	}
+	record.Eventf(m.IBMPowerVSMachine, "SuccessfulDeleteMachineIgnition", "Deleted machine ignition %q", m.IBMPowerVSMachine.Name)
+	return nil
+}
+
+// createCOSClient creates a new cosClient from the supplied parameters.
+func (m *PowerVSMachineScope) createCOSClient() (*cos.Service, error) {
+	cosInstanceName := m.IBMPowerVSCluster.Spec.CosInstance.Name
+	serviceInstance, err := m.ResourceClient.GetInstanceByName(cosInstanceName, cosResourceID, cosResourcePlanID)
+	if err != nil {
+		m.Error(err, "failed to get cos service instance", "name", cosInstanceName)
+		return nil, err
+	}
+	if serviceInstance == nil {
+		m.Info("cos service instance is nil")
+		return nil, err
+	}
+	if *serviceInstance.State != "active" {
+		m.Info("cos service instance is not in active state", "state", *serviceInstance.State)
+		return nil, fmt.Errorf("cos instance not in active state, current state: %s", *serviceInstance.State)
+	}
+
+	props, err := authenticator.GetProperties()
+	if err != nil {
+		m.Error(err, "error while fetching service properties")
+		return nil, fmt.Errorf("error while fetching service properties: %w", err)
+	}
+	apiKey := props["APIKEY"]
+	if len(apiKey) == 0 {
+		fmt.Printf("ibmcloud api key is not provided, set %s environmental variable", "IBMCLOUD_API_KEY")
+	}
+
+	cosClient, err := cos.NewService(cos.ServiceOptions{}, m.IBMPowerVSCluster.Spec.CosInstance.BucketRegion, apiKey, *serviceInstance.GUID)
+	if err != nil {
+		m.Error(err, "failed to create cos client")
+		return nil, fmt.Errorf("failed to create cos client: %w", err)
+	}
+
+	return cosClient, nil
+}
+
 func (m *PowerVSMachineScope) GetRawBootstrapDataWithFormat() ([]byte, string, error) {
 	if m.Machine.Spec.Bootstrap.DataSecretName == nil {
 		return nil, "", errors.New("error retrieving bootstrap data: linked Machine's bootstrap.dataSecretName is nil")

controllers/ibmpowervsmachine_controller.go

@@ -182,6 +182,10 @@ func (r *IBMPowerVSMachineReconciler) reconcileDelete(scope *scope.PowerVSMachin
 		scope.Info("error deleting IBMPowerVSMachine")
 		return ctrl.Result{}, fmt.Errorf("error deleting IBMPowerVSMachine %v: %w", klog.KObj(scope.IBMPowerVSMachine), err)
 	}
+	if err := scope.DeleteMachineIgnition(); err != nil {
+		scope.Info("error deleting IBMPowerVSMachine ignition")
+		return ctrl.Result{}, fmt.Errorf("error deleting IBMPowerVSMachine ignition %v: %w", klog.KObj(scope.IBMPowerVSMachine), err)
+	}
 	// Remove the cached VM IP
 	err := scope.DHCPIPCacheStore.Delete(powervs.VMip{Name: scope.IBMPowerVSMachine.Name})
 	if err != nil {

pkg/cloud/services/authenticator/authenticator.go

@@ -48,3 +48,12 @@ func GetAuthenticator() (core.Authenticator, error) {
 	}
 	return auth, nil
 }
+
+// GetProperties returns a map containing configuration properties for the specified service that are retrieved from external configuration sources.
+func GetProperties() (map[string]string, error) {
+	properties, err := core.GetServiceProperties(serviceIBMCloud)
+	if err != nil {
+		return nil, fmt.Errorf("error while fetching service properties")
+	}
+	return properties, nil
+}

pkg/cloud/services/cos/cos.go

@@ -30,6 +30,7 @@ type Cos interface {
 	CreateBucketWithContext(ctx aws.Context, input *s3.CreateBucketInput, opts ...request.Option) (*s3.CreateBucketOutput, error)
 	PutObject(*s3.PutObjectInput) (*s3.PutObjectOutput, error)
 	GetObjectRequest(*s3.GetObjectInput) (*request.Request, *s3.GetObjectOutput)
-
+	ListObjects(input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error)
+	DeleteObject(input *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error)
 	PutPublicAccessBlock(input *s3.PutPublicAccessBlockInput) (*s3.PutPublicAccessBlockOutput, error)
 }

pkg/cloud/services/cos/service.go

@@ -67,6 +67,14 @@ func (s *Service) GetObjectRequest(input *s3.GetObjectInput) (*request.Request,
 	return s.client.GetObjectRequest(input)
 }
 
+func (s *Service) ListObjects(input *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) {
+	return s.client.ListObjects(input)
+}
+
+func (s *Service) DeleteObject(input *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error) {
+	return s.client.DeleteObject(input)
+}
+
 func (s *Service) PutPublicAccessBlock(input *s3.PutPublicAccessBlockInput) (*s3.PutPublicAccessBlockOutput, error) {
 	return s.client.PutPublicAccessBlock(input)
 }