🌱 Bump golang to 1.22.9

.github/workflows/build-images-action.yml

@@ -8,27 +8,18 @@ on:
     tags:
     - 'v*'
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
-  build:
-    name: Build container images
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-
+  build_CAPM3:
+    name: Build CAPM3 image
     if: github.repository == 'metal3-io/cluster-api-provider-metal3'
-    steps:
-    - name: build capm3 image
-      uses: toptal/jenkins-job-trigger-action@137fff703dd260b52b53d3ba1960396415abc568 # 1.0.2
-      with:
-        jenkins_url: "https://jenkins.nordix.org/"
-        jenkins_user: "[email protected]"
-        jenkins_token: ${{ secrets.JENKINS_TOKEN }}
-        job_name: "metal3_cluster-api-provider-metal3_container_image_building"
-        job_params: |
-          {
-            "BUILD_CONTAINER_IMAGE_GIT_REFERENCE": "${{ github.ref }}"
-          }
-        job_timeout: "1000"
+    uses: metal3-io/project-infra/.github/workflows/container-image-build.yml@main
+    with:
+      image-name: 'cluster-api-provider-metal3'
+      pushImage: true
+    secrets:
+      QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
+      SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/dependabot.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
     - name: Check out code into the Go module directory
-      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Calculate go version
       id: vars
       run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
     - name: Set up Go
-      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2

.github/workflows/golangci-lint.yml

@@ -21,16 +21,16 @@ jobs:
         - api
 
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Calculate go version
       id: vars
       run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
     - name: Set up Go
-      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
     - name: golangci-lint-${{matrix.working-directory}}
-      uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
+      uses: golangci/golangci-lint-action@d6238b002a20823d52840fda27e2d4891c5952dc # v4.0.1
       with:
         version: v1.56.2
         working-directory: ${{matrix.working-directory}}

.github/workflows/kubesec.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'metal3-io/cluster-api-provider-metal3'
     steps:
     - name: Checkout code
-      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Collect all yaml
       id: list_yaml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Run kubesec scanner
       uses: controlplaneio/kubesec-action@43d0ddff5ffee89a6bb9f29b64cd865411137b14 # v0.0.2
@@ -63,6 +63,6 @@ jobs:
 
     - name: Upload Kubesec scan results to GitHub Security tab
       if: ${{ steps.save_result.outputs.result != '[]' }}
-      uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      uses: github/codeql-action/upload-sarif@a12c274149a487a5539a726cb05bc6d1b7e0b5f2 # v3.24.11
       with:
         sarif_file: ${{ matrix.value }}.sarif

.github/workflows/lint-docs.yaml

@@ -17,7 +17,7 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368 # v1
       with:
         use-quiet-mode: 'yes'

.github/workflows/release.yaml

@@ -21,18 +21,18 @@ jobs:
     - name: Export RELEASE_TAG var
       run: echo "RELEASE_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
     - name: checkout code
-      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         fetch-depth: 0
     - name: Install go
-      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: '1.21'
     - name: Generate release artifacts and notes
       run: |
         make release
     - name: Release
-      uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # v2.0.4
+      uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
       with:
         draft: true
         files: out/*

CONTRIBUTING.md

@@ -146,8 +146,9 @@ is defined above.
 
 | Minor Release | API Version  | Supported Until                              |
 | ------------- | ------------ | -------------------------------------------- |
+| v1.7.x        | **v1beta1**  | when v1.9.0 will be released                 |
 | v1.6.x        | **v1beta1**  | when v1.8.0 will be released                 |
-| v1.5.x        | **v1beta1**  | when v1.7.0 will be released                 |
+| v1.5.x        | **v1beta1**  | EOL since 2024-04-18                         |
 | v1.4.x        | **v1beta1**  | EOL since 2024-01-10                         |
 | v1.3.x        | **v1beta1**  | EOL since 2023-09-27                         |
 | v1.2.x        | **v1beta1**  | EOL since 2023-05-17                         |

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Support FROM override
-ARG BUILD_IMAGE=docker.io/golang:1.21.9@sha256:7d0dcbe5807b1ad7272a598fbf9d7af15b5e2bed4fd6c4c2b5b3684df0b317dd
+ARG BUILD_IMAGE=docker.io/golang:1.22.9@sha256:97ccb917d1dfe5b12cb4cfea1fb37989b28d3a87d28e89f27a71336c4700a87f
 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f
 
 # Build the manager binary on golang image

Makefile

@@ -20,7 +20,7 @@ SHELL:=/usr/bin/env bash
 
 .DEFAULT_GOAL:=help
 
-GO_VERSION ?= 1.21.9
+GO_VERSION ?= 1.22.9
 GO := $(shell type -P go)
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell $(GO) env GOPROXY)

OWNERS

@@ -1,24 +1,18 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 approvers:
- - furkatgofurov7
- - kashifest
- - lentzi90
- - mboukhalfa
+- cluster-api-provider-metal3-maintainers
 
 reviewers:
- - adilGhaffarDev
- - Rozzii
- - smoshiur1237
- - Sunnatillo
- - tuminoid
- - zhouhao3
+- cluster-api-provider-metal3-maintainers
+- cluster-api-provider-metal3-reviewers
 
 emeritus_approvers:
- - fmuyassarov
- - maelk
- - Xenwar
+- fmuyassarov
+- furkatgofurov7
+- maelk
+- Xenwar
 
 emeritus_reviewers:
- - jan-est
- - namnx228
+- jan-est
+- namnx228

OWNERS_ALIASES

@@ -0,0 +1,16 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+
+aliases:
+  cluster-api-provider-metal3-maintainers:
+  - adilGhaffarDev
+  - kashifest
+  - lentzi90
+  - mboukhalfa
+  - smoshiur1237
+  - Sunnatillo
+  - tuminoid
+
+  cluster-api-provider-metal3-reviewers:
+  - dtantsur
+  - Rozzii
+  - zhouhao3

README.md

@@ -2,10 +2,11 @@
 
 [![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/metal3-io/badge)](https://clomonitor.io/projects/cncf/metal3-io)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/metal3-io/cluster-api-provider-metal3/badge)](https://securityscorecards.dev/viewer/?uri=github.com/metal3-io/cluster-api-provider-metal3)
-[![Ubuntu E2E Integration main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-ubuntu-e2e-integration-test-main&subject=Ubuntu%20e2e%20integration%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-ubuntu-e2e-integration-test-main/)
-[![CentOS E2E Integration main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-integration-test-main&subject=Centos%20e2e%20integration%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-integration-test-main/)
-[![Ubuntu E2E feature main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-ubuntu-e2e-feature-test-main/&subject=Ubuntu%20E2E%20feature%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-ubuntu-e2e-feature-test-main/)
-[![CentOS E2E feature main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-feature-test-main/&subject=CentOS%20E2E%20feature%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-feature-test-main/)
+[![Ubuntu E2E Integration 1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-ubuntu-e2e-integration-test-release-1-7&subject=Ubuntu%20E2E%20integration%201.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-ubuntu-e2e-integration-test-release-1-7/)
+[![CentOS E2E Integration 1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-integration-test-release-1-7&subject=Centos%20E2E%20integration%201.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-integration-test-release-1-7/)
+[![CentOS E2E feature 1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-feature-test-release-1-7-features/&subject=CentOS%20E2E%20feature%201.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-feature-test-release-1-7-features/)
+[![CentOS E2E pivot 1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-feature-test-release-1-7-pivoting/&subject=CentOS%20E2E%20pivot%201.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-feature-test-release-1-7-pivoting/)
+[![CentOS E2E remediation 1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-feature-test-release-1-7-remediation/&subject=CentOS%20E2E%20remediation%201.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-periodic-centos-e2e-feature-test-release-1-7-remediation/)
 
 Kubernetes-native declarative infrastructure for Metal3.
 
@@ -28,6 +29,7 @@ Metal3.
 | v1beta1       | v1beta1             | v1.4.X        |  v1.4.X        |
 | v1beta1       | v1beta1             | v1.5.X        |  v1.5.X        |
 | v1beta1       | v1beta1             | v1.6.X        |  v1.6.X        |
+| v1beta1       | v1beta1             | v1.7.X        |  v1.7.X        |
 
 ## Deploying the metal3 provider
 
@@ -46,9 +48,9 @@ need to be manually installed. Example flow of installing Metal3 provider:
    level of the logging verbose with a positive integer number, ie. -v5.
 
    ```shell
-   clusterctl init --core cluster-api:v1.7.0 \
-       --bootstrap kubeadm:v1.7.0 \
-       --control-plane kubeadm:v1.7.0 -v5
+   clusterctl init --core cluster-api:v1.7.4 \
+       --bootstrap kubeadm:v1.7.4 \
+       --control-plane kubeadm:v1.7.4 -v5
    ```
 
 1. Install Metal3 provider. This will install the latest version of Cluster API
@@ -62,7 +64,7 @@ need to be manually installed. Example flow of installing Metal3 provider:
    provider name as follows:
 
    ```shell
-   clusterctl init --infrastructure metal3:v1.6.0
+   clusterctl init --infrastructure metal3:v1.7.0
    ```
 
 1. Deploy Baremetal Operator manifests and CRDs. You need to install
@@ -140,6 +142,13 @@ To trigger e2e test on a PR, use the following phrases:
 - **/test-centos-e2e-integration-test-main** runs integration e2e
   tests with CAPM3 API version v1beta1 and branch main on CentOS
 
+Release-1.7 branch:
+
+- **/test metal3-ubuntu-e2e-integration-test-release-1-7** runs integration e2e
+  tests with CAPM3 API version v1beta1 and branch release-1.7 on Ubuntu
+- **/test metal3-centos-e2e-integration-test-release-1-7** runs integration e2e
+  tests with CAPM3 API version v1beta1 and branch release-1.7 on CentOS
+
 Release-1.6 branch:
 
 - **/test metal3-ubuntu-e2e-integration-test-release-1-6** runs integration e2e
@@ -154,22 +163,15 @@ Release-1.5 branch:
 - **/test metal3-centos-e2e-integration-test-release-1-5** runs integration e2e
   tests with CAPM3 API version v1beta1 and branch release-1.5 on CentOS
 
-Release-1.4 branch:
-
-- **/test metal3-ubuntu-e2e-integration-test-release-1-4** runs integration e2e
-  tests with CAPM3 API version v1beta1 and branch release-1.4 on Ubuntu
-- **/test metal3-centos-e2e-integration-test-release-1-4** runs integration e2e
-  tests with CAPM3 API version v1beta1 and branch release-1.4 on CentOS
-
 ## Basic tests
 
 Unlike integration tests, basic tests focus on the target cluster creation
 without involving pivoting from the bootstrap cluster. To run basic tests use:
 
 - **/test metal3-ubuntu-e2e-basic-test-main** runs basic e2e tests with main
  branch on Ubuntu
-- **/test metal3-centos-e2e-basic-test-release-1-6** runs basic e2e tests on
- release-1.6 branch with centos
+- **/test metal3-centos-e2e-basic-test-release-1-7** runs basic e2e tests on
+ release-1.7 branch with centos
 
 ### Feature tests
 
@@ -180,6 +182,13 @@ On main branch:
 - **/test metal3-centos-e2e-feature-test-main** runs e2e feature tests with
   CAPM3 API version v1beta1 and branch main on CentOS
 
+Release-1.7 branch:
+
+- **/test metal3-ubuntu-e2e-feature-test-release-1-7** runs e2e feature tests
+  with CAPM3 API version v1beta1 and branch release-1.7 on Ubuntu
+- **/test metal3-centos-e2e-feature-test-release-1-7** runs e2e feature tests
+  with CAPM3 API version v1beta1 and branch release-1.7 on CentOS
+
 Release-1.6 branch:
 
 - **/test metal3-ubuntu-e2e-feature-test-release-1-6** runs e2e feature tests with
@@ -194,48 +203,46 @@ Release-1.5 branch:
 - **/test metal3-centos-e2e-feature-test-1-5** runs e2e feature tests with CAPM3
   API version v1beta1 and branch release-1.5 on CentOS
 
-Release-1.4 branch:
-
-- **/test metal3-ubuntu-e2e-feature-test-release-1-4** runs e2e feature tests
-  with CAPM3 API version v1beta1 and branch release-1.4 on Ubuntu
-- **/test metal3-centos-e2e-feature-test-release-1-4** runs e2e feature tests
-  with CAPM3 API version v1beta1 and branch release-1.4 on CentOS
-
 ### Upgrade tests
 
+#### Clusterctl upgrade tests
+
 CAPM3 tests upgrade from all supported release to the current one.
 We run upgrade test on main branch from different releases:
 
-z- **/test-e2e-upgrade-main-from-release-1-3** runs e2e upgrade tests from CAPM3
-  API version v1beta1/branch release-1.3 to CAPM3 API version v1beta1/branch
-  main on Ubuntu
+- **/test metal3-e2e-clusterctl-upgrade-test-main** runs e2e clusterctl
+  upgrade tests on main with Ubuntu
 
-- **/test-e2e-upgrade-main-from-release-1-4** runs e2e upgrade tests from CAPM3
-  API version v1beta1/branch release-1.4 to CAPM3 API version v1beta1/branch
-  main on Ubuntu
+- **/test metal3-e2e-clusterctl-upgrade-test-release-1-7** runs e2e clusterctl
+  upgrade tests on release-1.7 with Ubuntu
 
-- **/test-e2e-upgrade-main-from-release-1-5** runs e2e upgrade tests from CAPM3
-  API version v1beta1/branch release-1.5 to CAPM3 API version v1beta1/branch
-  main on Ubuntu
+- **/test metal3-e2e-clusterctl-upgrade-test-release-1-6** runs e2e clusterctl
+  upgrade tests on release-1.6 with Ubuntu
 
-- **/test-e2e-upgrade-main-from-release-1-6** runs e2e upgrade tests from CAPM3
-  API version v1beta1/branch release-1.6 to CAPM3 API version v1beta1/branch
-  main on Ubuntu
+- **/test metal3-e2e-clusterctl-upgrade-test-release-1-5** runs e2e clusterctl
+  upgrade tests on release-1.5 with Ubuntu
 
-### Keep VM
+#### K8s upgrade tests
 
-After the e2e test is completed, Jenkins executes another script to clean up the
-environment first and then deletes the VM. However, sometimes it may be
-desirable to keep the VM for debugging purposes. To avoid clean up and deletion
-operations, use `keep-` prefix e.g:
+CAPM3 tests upgrading kubernetes between last 3 releases.
+The trigger takes the format:
+`/test metal3-e2e-<from-minor-k8s-v>-<to-minor-k8s-v>-upgrade-test-<branch>`
 
-- **/keep-test-ubuntu-e2e-integration-main** run keep e2e tests with CAPM3 API
-  version v1beta1 and branch main on Ubuntu
+- **/test metal3-e2e-1-28-1-29-upgrade-test-main**
+- **/test metal3-e2e-1-27-1-28-upgrade-test-main**
+- **/test metal3-e2e-1-26-1-27-upgrade-test-main**
+- **/test metal3-e2e-1-28-1-29-upgrade-test-release-1-7**
+- **/test metal3-e2e-1-27-1-28-upgrade-test-release-1-7**
+- **/test metal3-e2e-1-26-1-27-upgrade-test-release-1-7**
+- **/test metal3-e2e-1-28-1-29-upgrade-test-release-1-6**
+- **/test metal3-e2e-1-27-1-28-upgrade-test-release-1-6**
+- **/test metal3-e2e-1-26-1-27-upgrade-test-release-1-6**
+- **/test metal3-e2e-1-28-1-29-upgrade-test-release-1-5**
+- **/test metal3-e2e-1-27-1-28-upgrade-test-release-1-5**
+- **/test metal3-e2e-1-26-1-27-upgrade-test-release-1-5**
 
 Note:
 
-- Triggers follow the pattern: `/[keep-|parallel-]test-<os>-e2e-<type>-<branch>`
-- Test VM created with `keep-` prefix will not be kept forever but deleted after
-  24 hours.
+- Triggers follow the pattern: `/test metal3-<image-os>-e2e-<test-type>-test-<branch>`
 
 More info about e2e test can be found [here](docs/e2e-test.md)

Tiltfile

@@ -129,7 +129,7 @@ def fixup_yaml_empty_arrays(yaml_str):
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.21 as tilt-helper
+FROM golang:1.22 as tilt-helper
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \