Merge https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud:v0.13.0 (64a173c) into main

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.22
+  tag: rhel-9-release-golang-1.24-openshift-4.20

.github/workflows/weekly-security-scan.yaml

@@ -13,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, release-0.11, release-0.10 ]
+        branch: [ main, release-0.12, release-0.11 ]
     name: Trivy
     runs-on: ubuntu-24.04
     steps:
     - name: Check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag=v5.0.0
       with:
         ref: ${{ matrix.branch }}
     - name: Calculate go version

.golangci.yml

@@ -196,6 +196,21 @@ linters:
           - gocritic
         path: _test\.go
         text: 'deferInLoop: Possible resource leak, ''defer'' is called in the ''for'' loop'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m)\.IBMPowerVSCluster.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m)\.IBMPowerVSImage.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m|params)\.IBMPowerVSMachine.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: endpoints.(FetchRCEndpoint|FetchPVSEndpoint) is deprecated: Use FetchEndpoints instead.'
     paths:
       - zz_generated.*\.go$
       - third_party$

Makefile

@@ -84,7 +84,7 @@ RELEASE_NOTES_DIR := CHANGELOG
 OUTPUT_TYPE ?= type=registry
 
 # Go
-GO_VERSION ?=1.24.6
+GO_VERSION ?=1.24.11
 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
 
 # Trivy
@@ -105,7 +105,7 @@ PULL_POLICY ?= Always
 # Set build time variables including version details
 LDFLAGS := $(shell ./hack/version.sh)
 
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.0
 
 # main controller
 CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller

README.md

@@ -45,11 +45,11 @@ cluster on IBM Cloud.
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-|                                         |Cluster API v1alpha4 (v0.4) |Cluster API v1beta1 (v1.x) |
-|:----------------------------------------|:---------------:|:--------------:|
-| CAPIBM v1alpha4 (v0.1.x)                | ✓               |                |
-| CAPIBM v1beta1 (v0.2.x, v0.3.x)         |                 | ✓              |
-| CAPIBM v1beta2 (v0.[4-11].x, main)      |                 | ✓              |
+|                                         |Cluster API v1alpha4 (v0.4) |Cluster API v1beta1 (v1.[0-11].x) |Cluster API v1beta2 (v1.11.x) |
+|:----------------------------------------|:---------------:|:--------------:|:--------------:|
+| CAPIBM v1alpha4 (v0.1.x)                | ✓               |                |                |
+| CAPIBM v1beta1 (v0.2.x, v0.3.x)         |                 | ✓              |                |
+| CAPIBM v1beta2 (v0.[4-12].x, main)      |                 | ✓              |                |
 
 
 (See [Kubernetes support matrix][cluster-api-supported-v] of Cluster API versions).

api/v1beta1/types.go

@@ -92,8 +92,10 @@ type Subnet struct {
 // VPCEndpoint describes a VPCEndpoint.
 type VPCEndpoint struct {
 	Address *string `json:"address"`
-	// +optional
+
 	// Deprecated: This field has no function and is going to be removed in the next release.
+	//
+	// +optional
 	FIPID *string `json:"floatingIPID,omitempty"`
 	// +optional
 	LBID *string `json:"loadBalancerIPID,omitempty"`

api/v1beta2/ibmpowervscluster_types.go

@@ -32,8 +32,10 @@ const (
 
 // IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster.
 type IBMPowerVSClusterSpec struct {
-	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
+
 	// Deprecated: use ServiceInstance instead
+	//
+	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 
 	// Network is the reference to the Network to use for this cluster.

api/v1beta2/ibmpowervsimage_types.go

@@ -37,8 +37,9 @@ type IBMPowerVSImageSpec struct {
 	// +kubebuilder:validation:MinLength=1
 	ClusterName string `json:"clusterName"`
 
-	// ServiceInstanceID is the id of the power cloud instance where the image will get imported.
 	// Deprecated: use ServiceInstance instead
+	//
+	// ServiceInstanceID is the id of the power cloud instance where the image will get imported.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 
 	// serviceInstance is the reference to the Power VS workspace on which the server instance(VM) will be created.

api/v1beta2/ibmpowervsmachine_types.go

@@ -48,8 +48,9 @@ type IBMPowerVSMachineSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
 	// Deprecated: use ServiceInstance instead
+	//
+	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 
 	// serviceInstance is the reference to the Power VS workspace on which the server instance(VM) will be created.

api/v1beta2/ibmvpcmachine_types.go

@@ -78,6 +78,14 @@ type IBMVPCMachineSpec struct {
 	// SSHKeys is the SSH pub keys that will be used to access VM.
 	// ID will take higher precedence over Name if both specified.
 	SSHKeys []*IBMVPCResourceReference `json:"sshKeys,omitempty"`
+
+	// additionalVolumes is the list of additional volumes attached to the instance
+	// There is a hard limit of 12 volume attachments per instance:
+	// https://cloud.ibm.com/docs/vpc?topic=vpc-attaching-block-storage&interface=api#vol-attach-limits
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:MaxItems=12
+	// +kubebuilder:validation:XValidation:rule="oldSelf.all(x, x in self)",message="Values may only be added"
+	AdditionalVolumes []*VPCVolume `json:"additionalVolumes,omitempty"`
 }
 
 // IBMVPCResourceReference is a reference to a specific VPC resource by ID or Name
@@ -95,7 +103,7 @@ type IBMVPCResourceReference struct {
 	Name *string `json:"name,omitempty"`
 }
 
-// VPCVolume defines the volume information for the instance.
+// VPCVolume defines the volume information.
 type VPCVolume struct {
 	// DeleteVolumeOnInstanceDelete If set to true, when deleting the instance the volume will also be deleted.
 	// Default is set as true
@@ -108,14 +116,15 @@ type VPCVolume struct {
 	// +optional
 	Name string `json:"name,omitempty"`
 
-	// SizeGiB is the size of the virtual server's boot disk in GiB.
+	// SizeGiB is the size of the virtual server's disk in GiB.
 	// Default to the size of the image's `minimum_provisioned_size`.
 	// +optional
 	SizeGiB int64 `json:"sizeGiB,omitempty"`
 
-	// Profile is the volume profile for the bootdisk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
+	// Profile is the volume profile for the disk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
 	// for more information.
 	// Default to general-purpose
+	// NOTE: If a profile other than custom is specified, the Iops and SizeGiB fields will be ignored
 	// +kubebuilder:validation:Enum="general-purpose";"5iops-tier";"10iops-tier";"custom"
 	// +kubebuilder:default=general-purpose
 	// +optional
@@ -190,6 +199,9 @@ type IBMVPCMachineV1Beta2Status struct {
 	// +listMapKey=type
 	// +kubebuilder:validation:MaxItems=32
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// AdditionalVolumeIDs is a list of Volume IDs as per IBMCloud
+	// +optional
+	AdditionalVolumeIDs []string `json:"additionalVolumeIDs,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1beta2/types.go

@@ -563,8 +563,9 @@ type Subnet struct {
 // VPCEndpoint describes a VPCEndpoint.
 type VPCEndpoint struct {
 	Address *string `json:"address"`
-	// +optional
 	// Deprecated: This field has no function and is going to be removed in the next release.
+	//
+	// +optional
 	FIPID *string `json:"floatingIPID,omitempty"`
 	// +optional
 	LBID *string `json:"loadBalancerIPID,omitempty"`

cloud/scope/machine.go

@@ -1162,3 +1162,80 @@ func (m *MachineScope) APIServerPort() int32 {
 	}
 	return infrav1.DefaultAPIServerPort
 }
+
+// GetVolumeAttachments returns the volume attachments for the instance.
+func (m *MachineScope) GetVolumeAttachments() ([]vpcv1.VolumeAttachment, error) {
+	options := vpcv1.ListInstanceVolumeAttachmentsOptions{
+		InstanceID: &m.IBMVPCMachine.Status.InstanceID,
+	}
+	result, _, err := m.IBMVPCClient.GetVolumeAttachments(&options)
+	if err != nil {
+		return nil, fmt.Errorf("error while getting volume attachments: %w", err)
+	}
+	return result.VolumeAttachments, nil
+}
+
+// GetVolumeState returns the volume's state.
+func (m *MachineScope) GetVolumeState(volumeID string) (string, error) {
+	options := vpcv1.GetVolumeOptions{
+		ID: &volumeID,
+	}
+	result, _, err := m.IBMVPCClient.GetVolume(&options)
+	if err != nil {
+		return "", fmt.Errorf("could not fetch volume status: %w", err)
+	}
+	return *result.Status, err
+}
+
+// CreateVolume creates a new Volume and attaches it to the instance.
+func (m *MachineScope) CreateVolume(vpcVolume *infrav1.VPCVolume) (string, error) {
+	volumeOptions := vpcv1.CreateVolumeOptions{}
+	var resourceGroupID string
+	if m.IBMVPCCluster.Status.ResourceGroup != nil {
+		resourceGroupID = m.IBMVPCCluster.Status.ResourceGroup.ID
+	} else {
+		resourceGroupID = m.IBMVPCCluster.Spec.ResourceGroup
+	}
+	// TODO: EncryptionKeyCRN is not supported for now, the field is omitted from the manifest
+	volumeOptions.VolumePrototype = &vpcv1.VolumePrototype{
+		ResourceGroup: &vpcv1.ResourceGroupIdentityByID{
+			ID: &resourceGroupID,
+		},
+		Profile: &vpcv1.VolumeProfileIdentityByName{
+			Name: &vpcVolume.Profile,
+		},
+		Zone: &vpcv1.ZoneIdentity{
+			Name: &m.IBMVPCMachine.Spec.Zone,
+		},
+		Capacity: &vpcVolume.SizeGiB,
+	}
+
+	if vpcVolume.Profile == "custom" {
+		volumeOptions.VolumePrototype.(*vpcv1.VolumePrototype).Iops = &vpcVolume.Iops
+	}
+
+	volumeResult, _, err := m.IBMVPCClient.CreateVolume(&volumeOptions)
+	if err != nil {
+		return "", fmt.Errorf("error while creating volume: %w", err)
+	}
+
+	return *volumeResult.ID, nil
+}
+
+// AttachVolume attaches the given volume to the instance.
+func (m *MachineScope) AttachVolume(deleteOnInstanceDelete bool, volumeID, volumeName string) error {
+	attachmentOptions := vpcv1.CreateInstanceVolumeAttachmentOptions{
+		InstanceID: &m.IBMVPCMachine.Status.InstanceID,
+		Volume: &vpcv1.VolumeAttachmentPrototypeVolume{
+			ID: &volumeID,
+		},
+		DeleteVolumeOnInstanceDelete: &deleteOnInstanceDelete,
+		Name:                         &volumeName,
+	}
+
+	_, _, err := m.IBMVPCClient.AttachVolumeToInstance(&attachmentOptions)
+	if err != nil {
+		err = fmt.Errorf("error while attaching volume to instance: %w", err)
+	}
+	return err
+}