test prow

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,15 +1,30 @@
 ---
 name: Feature enhancement request
-about: Suggest an idea for this project
-
+about: Propose a new feature or suggest improvements to an existing one.
 ---
-
 /kind feature
 /area provider/ibmcloud
 
-**Describe the solution you'd like**
-[A clear and concise description of what you want to happen.]
+## User Story
+**What would you like to be added?**
+
+> Example: "As a [developer/user/operator], I would like to [high-level description] for [reasons]."
+
+## Detailed Feature Description
+Provide a clear and concise description of the new feature or the improvement to an existing feature.
+
+## Context & Motivation
+**What problem does this solve, and why is it important?**
+Explain the motivation behind this request. How does this feature improve the project? What specific use cases does it address?
+
+## Proposed Solution
+**How should this be implemented?**
+Describe potential approaches for implementing this feature. If possible, provide links to related documentation or prior discussions.
 
+## Alternatives Considered
+**Have you considered any alternatives?**
+List any alternative solutions or workarounds you've considered and explain why they may or may not be suitable.
 
-**Anything else you would like to add:**
-[Miscellaneous information that will assist in solving the issue.]
+## Additional Information
+**Anything else you would like to add?**
+Include screenshots, references, or additional context that can assist in understanding and implementing the request.

.github/ISSUE_TEMPLATE/release.md

@@ -1,6 +1,6 @@
 ---
 name: Release tracker
-about: Create an issue to track tasks for a Cluster API version update
+about: Create an issue to track tasks to be done after CAPIBM major version release
 title: Release tracker for v<>
 
 ---
@@ -15,5 +15,13 @@ After every CAPIBM major version release:
 - [ ] [Update release support data in docs](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/docs/book/src/developer/release-support-guidelines.md)
 - [ ] [Update docs with reference to latest release](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/README.md#compatibility-with-cluster-api-and-kubernetes-versions)
 - [ ] Update and add documentation link for new release branch in Netlify
-- [ ] Add new presubmit job for latest release kubernetes/test-infra for CAPIBM jobs
-- [ ] Bump machine images in CI to use relevent Kubernetes version
+- [ ] Add new presubmit job for latest release branch in [kubernetes/test-infra](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/cluster-api-provider-ibmcloud)
+    - [ ] Update kubekins-e2e image to relevent Kubernetes version
+- [ ] Add E2E CI jobs for latest release branch in [ppc64le-cloud/test-infra](https://github.com/ppc64le-cloud/test-infra/blob/master/config/jobs/periodic/cluster-api-provider-ibmcloud/test-e2e-capi-ibmcloud-periodics.yaml)
+    - [ ] Bump machine images in CI to relevent Kubernetes version
+    - [ ] Update kubekins-e2e image to relevent Kubernetes version
+
+> Note:
+> 1. An example for infrastructure provider version upgrade, if we cut a release for version
+> 0.9.0, update the infratructure provider version to 0.10.0 on the main branch.
+> 2. Keep the version upgrades in check for the main branch and the two latest releases.

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

@@ -13,19 +13,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, release-0.9, release-0.8 ]
+        branch: [ main, release-0.11, release-0.10 ]
     name: Trivy
     runs-on: ubuntu-24.04
     steps:
     - name: Check out code
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
       with:
         ref: ${{ matrix.branch }}
     - name: Calculate go version
       id: vars
       run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
     - name: Set up Go
-      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
     - name: Run verify security target

.golangci.yml

@@ -9,8 +9,7 @@ linters:
   - dogsled
   - errcheck
   - errchkjson
-  - execinquery
-  - exportloopref
+  - copyloopvar
   - gci
   - goconst
   - gocritic
@@ -89,8 +88,10 @@ linters-settings:
         alias: capiv1alpha3
       - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
         alias: capiv1alpha4
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
         alias: capiv1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
+        alias: clusterv1
       # CAPI-IBMCLOUD
       - pkg: sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1
         alias: infrav1beta1
@@ -100,10 +101,6 @@ linters-settings:
     allow-unused: false
     allow-leading-space: false
     require-specific: true
-  staticcheck:
-    go: "1.22"
-  stylecheck:
-    go: "1.22"
   gosec:
     excludes:
     - G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -126,7 +123,7 @@ linters-settings:
     - whyNoLint
     - wrapperFunc
   unused:
-    go: "1.22"
+    go: "1.24"
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
@@ -208,12 +205,13 @@ issues:
     - gocritic
     text: "deferInLoop: Possible resource leak, 'defer' is called in the 'for' loop"
     path: _test\.go
+  exclude-files:
+  - "zz_generated.*\\.go$"
 
 run:
-  timeout: 10m
+  go: "1.24"
+  timeout: 20m
   build-tags:
   - tools
   - e2e
-  skip-files:
-  - "zz_generated.*\\.go$"
   allow-parallel-runners: true

Dockerfile

@@ -40,6 +40,7 @@ COPY controllers/ controllers/
 COPY cloud/ cloud/
 COPY pkg/ pkg/
 COPY util/ util/
+COPY internal/ internal/
 
 # Build
 ARG TARGETOS

Makefile

@@ -49,23 +49,47 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
 CONVERSION_VERIFIER := $(TOOLS_BIN_DIR)/conversion-verifier
 SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup-envtest
 GOVULNCHECK := $(TOOLS_BIN_DIR)/govulncheck
-TRIVY := $(TOOLS_BIN_DIR)/trivy
+RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
 
 STAGING_REGISTRY ?= gcr.io/k8s-staging-capi-ibmcloud
 STAGING_BUCKET ?= artifacts.k8s-staging-capi-ibmcloud.appspot.com
 BUCKET ?= $(STAGING_BUCKET)
 PROD_REGISTRY := registry.k8s.io/capi-ibmcloud
 REGISTRY ?= $(STAGING_REGISTRY)
 RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null)
+ifneq (,$(findstring -,$(RELEASE_TAG)))
+    PRE_RELEASE=true
+endif
+FULL_VERSION := $(RELEASE_TAG:v%=%)
+MAJOR_VERSION := $(shell echo $(FULL_VERSION) | sed -E 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/')
+MINOR_VERSION := $(shell echo $(FULL_VERSION) | sed -E 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/')
+PATCH_VERSION := $(shell echo $(FULL_VERSION) | sed -E 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/')
+# if the release tag is a .0 version, use the main branch
+ifeq ($(PATCH_VERSION),0)
+	RELEASE_BRANCH ?= main
+else
+	RELEASE_BRANCH ?= release-$(MAJOR_VERSION).$(MINOR_VERSION)
+endif
+PREVIOUS_TAG ?= $(shell git tag --merged $(GIT_REMOTE_NAME)/$(RELEASE_BRANCH) -l | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$$" | sort -V | tail -n 1 2>/dev/null)
+START_SHA ?= $(shell git rev-list -n 1 $(PREVIOUS_TAG) 2>/dev/null)
+END_SHA ?= $(shell git rev-parse $(GIT_REMOTE_NAME)/$(RELEASE_BRANCH) 2>/dev/null)
+GIT_REPO_NAME ?= cluster-api-provider-ibmcloud
+GIT_ORG_NAME ?= kubernetes-sigs
+GIT_REMOTE_NAME ?= upstream
+
 PULL_BASE_REF ?= $(RELEASE_TAG) # PULL_BASE_REF will be provided by Prow
 RELEASE_ALIAS_TAG ?= $(PULL_BASE_REF)
 RELEASE_DIR := out
+RELEASE_NOTES_DIR := CHANGELOG
 OUTPUT_TYPE ?= type=registry
 
 # Go
-GO_VERSION ?=1.22.10
+GO_VERSION ?=1.24.3
 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
 
+# Trivy
+TRIVY_VER := 0.61.1
+
 # kind
 CAPI_KIND_CLUSTER_NAME ?= capi-test
 
@@ -81,7 +105,7 @@ PULL_POLICY ?= Always
 # Set build time variables including version details
 LDFLAGS := $(shell ./hack/version.sh)
 
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
 
 # main controller
 CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller
@@ -181,7 +205,7 @@ generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code
 .PHONY: generate-templates
 generate-templates: $(KUSTOMIZE) ## Generate cluster templates
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template.yaml
-	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs-cloud-provider --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs-cloud-provider.yaml
+	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs.yaml
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs-clusterclass --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs-clusterclass.yaml
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-vpc-clusterclass --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-vpc-clusterclass.yaml
 
@@ -230,12 +254,12 @@ test: generate fmt vet setup-envtest $(GOTESTSUM) ## Run tests
 
 # Allow overriding the e2e configurations
 GINKGO_FOCUS ?= Workload cluster creation
-GINKGO_NODES ?= 3
+GINKGO_NODES ?= 1
 GINKGO_NOCOLOR ?= false
 GINKGO_TIMEOUT ?= 2h
 E2E_FLAVOR ?= powervs-md-remediation
 JUNIT_FILE ?= junit.e2e_suite.1.xml
-GINKGO_ARGS ?= -v --trace --tags=e2e --timeout=$(GINKGO_TIMEOUT) --focus=$(GINKGO_FOCUS) --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)"
+GINKGO_ARGS ?= -v --trace --tags=e2e --timeout=$(GINKGO_TIMEOUT) --focus="$(GINKGO_FOCUS)" --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)"
 ARTIFACTS ?= $(REPO_ROOT)/_artifacts
 SKIP_CLEANUP ?= false
 SKIP_CREATE_MGMT_CLUSTER ?= false
@@ -271,6 +295,9 @@ test-cover: setup-envtest## Run tests with code coverage and code generate repor
 $(RELEASE_DIR):
 	mkdir -p $@
 
+$(RELEASE_NOTES_DIR):
+	mkdir -p $@
+
 $(ARTIFACTS):
 	mkdir -p $@
 
@@ -302,13 +329,13 @@ check-github-token:
 .PHONY: release
 release: clean-release check-release-tag $(RELEASE_DIR)  ## Build and push container images using the latest git tag for the commit
 	git checkout "${RELEASE_TAG}"
-	CORE_CONTROLLER_IMG=$(PROD_REGISTRY)/$(CORE_IMAGE_NAME) $(MAKE) release-manifests
+	$(MAKE) release-manifests
 	$(MAKE) release-templates
 	$(MAKE) release-binaries
 
 .PHONY: release-manifests
 release-manifests: ## Build the manifests to publish with a release
-	$(MAKE) $(RELEASE_DIR)/$(CORE_MANIFEST_FILE).yaml TAG=$(RELEASE_TAG)
+	$(MAKE) $(RELEASE_DIR)/$(CORE_MANIFEST_FILE).yaml TAG=$(RELEASE_TAG) CORE_CONTROLLER_IMG=$(PROD_REGISTRY)/$(CORE_IMAGE_NAME)
 	# Add metadata to the release artifacts
 	cp metadata.yaml $(RELEASE_DIR)/metadata.yaml
 
@@ -322,6 +349,19 @@ release-staging: ## Build and push container images to the staging bucket
 	$(MAKE) release-binaries
 	$(MAKE) upload-staging-artifacts
 
+.PHONY: release-notes
+release-notes: $(RELEASE_NOTES) $(RELEASE_NOTES_DIR) ## Generate/update release notes.
+	@echo "generating release notes from $(PREVIOUS_TAG) to $(RELEASE_TAG) with start sha $(START_SHA) and end sha $(END_SHA)"
+	@if [ -n "${PRE_RELEASE}" ]; then \
+		echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/issues/new)." > $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md; \
+		$(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --branch $(RELEASE_BRANCH) --required-author "" --start-sha $(START_SHA) --end-sha $(END_SHA) --markdown-links true --dependencies false --output $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md; \
+		(cat $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md; echo ""; cat $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md) > $(RELEASE_NOTES_DIR)/tmp-release-notes.md; \
+		mv $(RELEASE_NOTES_DIR)/tmp-release-notes.md $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md; \
+		rm -f $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md; \
+	else \
+		$(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --branch $(RELEASE_BRANCH) --required-author "" --start-sha $(START_SHA) --end-sha $(END_SHA) --markdown-links true --output $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md; \
+	fi
+
 .PHONY: staging-manifests
 staging-manifests:
 	$(MAKE) $(RELEASE_DIR)/$(CORE_MANIFEST_FILE).yaml TAG=$(RELEASE_ALIAS_TAG)
@@ -514,8 +554,8 @@ verify-conversions: $(CONVERSION_VERIFIER) ## Verifies expected API conversion a
 	$(CONVERSION_VERIFIER)
 
 .PHONY: verify-container-images
-verify-container-images: $(TRIVY) ## Verify container images
-	TRACE=$(TRACE) ./hack/verify-container-images.sh
+verify-container-images: ## Verify container images
+	TRACE=$(TRACE) ./hack/verify-container-images.sh $(TRIVY_VER)
 
 .PHONY: verify-govulncheck
 verify-govulncheck: $(GOVULNCHECK) ## Verify code for vulnerabilities

README.md

@@ -47,9 +47,9 @@ This provider's versions are compatible with the following versions of Cluster A
 
 |                                         |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-9].x, main)         |                 | ✓              |
+| CAPIBM v1alpha4 (v0.1.x)                | ✓               |                |
+| CAPIBM v1beta1 (v0.2.x, v0.3.x)         |                 | ✓              |
+| CAPIBM v1beta2 (v0.[4-11].x, main)      |                 | ✓              |
 
 
 (See [Kubernetes support matrix][cluster-api-supported-v] of Cluster API versions).
@@ -87,3 +87,5 @@ See also our [contributor guide](CONTRIBUTING.md) and the Kubernetes [community
 Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
 
 <!-- ANCHOR_END: Community -->
+test
+test

RELEASE.md

@@ -11,7 +11,7 @@
 The Kubernetes cluster-api-provider-ibmcloud is released on an as-needed basis. The process is as follows:
 
 1. An issue is proposing a new release with a changelog since the last release
-1. All [OWNERS](OWNERS) must LGTM this release
-1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`
-1. The release issue is closed
-1. An announcement email is sent to `kubernetes-dev@googlegroups.com` with the subject `[ANNOUNCE] cluster-api-provider-ibmcloud $VERSION is released`
+2. All [OWNERS](OWNERS) must LGTM this release
+3. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`
+4. The release issue is closed
+5. An announcement email is sent to `kubernetes-dev@googlegroups.com` with the subject `[ANNOUNCE] cluster-api-provider-ibmcloud $VERSION is released`

api/v1beta1/conditions_consts.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -42,7 +42,7 @@ const (
 
 const (
 	// InstanceReadyCondition reports on current status of the instance. Ready indicates the instance is in a Running state.
-	InstanceReadyCondition capiv1beta1.ConditionType = "InstanceReady"
+	InstanceReadyCondition clusterv1.ConditionType = "InstanceReady"
 )
 
 const (
@@ -60,10 +60,10 @@ const (
 
 const (
 	// ImageReadyCondition reports on current status of the image. Ready indicates the image is in a active state.
-	ImageReadyCondition capiv1beta1.ConditionType = "ImageReady"
+	ImageReadyCondition clusterv1.ConditionType = "ImageReady"
 
 	// ImageImportedCondition reports on current status of the image import job. Ready indicates the import job is finished.
-	ImageImportedCondition capiv1beta1.ConditionType = "ImageImported"
+	ImageImportedCondition clusterv1.ConditionType = "ImageImported"
 )
 
 const (
@@ -73,5 +73,5 @@ const (
 
 const (
 	// LoadBalancerReadyCondition reports on current status of the load balancer. Ready indicates the load balancer is in a active state.
-	LoadBalancerReadyCondition capiv1beta1.ConditionType = "LoadBalancerReady"
+	LoadBalancerReadyCondition clusterv1.ConditionType = "LoadBalancerReady"
 )

api/v1beta1/ibmpowervs_conversion.go

@@ -208,3 +208,8 @@ func Convert_v1beta2_IBMPowerVSClusterStatus_To_v1beta1_IBMPowerVSClusterStatus(
 func Convert_v1beta2_IBMPowerVSImageSpec_To_v1beta1_IBMPowerVSImageSpec(in *infrav1beta2.IBMPowerVSImageSpec, out *IBMPowerVSImageSpec, s apiconversion.Scope) error {
 	return autoConvert_v1beta2_IBMPowerVSImageSpec_To_v1beta1_IBMPowerVSImageSpec(in, out, s)
 }
+
+func Convert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(in *infrav1beta2.IBMPowerVSMachineStatus, out *IBMPowerVSMachineStatus, s apiconversion.Scope) error {
+	// CAPI V1Beta2 was added in CAPIBM v1beta2
+	return autoConvert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(in, out, s)
+}

api/v1beta1/ibmpowervscluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -44,7 +44,7 @@ type IBMPowerVSClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint capiv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 }
 
 // IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.