Merge branch 'kubernetes-sigs:main' into flatcar-sysext-with-lb

Author: cringdahl

.github/dependabot.yml

@@ -23,7 +23,6 @@ updates:
 - directories:
   - "/"
   - "/hack/tools"
-  - "/orc"
   package-ecosystem: "gomod"
   schedule:
     interval: "weekly"
@@ -47,10 +46,67 @@ updates:
     update-types: ["version-update:semver-major", "version-update:semver-minor"]
   # We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
   - dependency-name: "sigs.k8s.io/structured-merge-diff/*"
+  # For now we deploy CAPI from an unreleased commit
+  - dependency-name: "sigs.k8s.io/cluster-api*"
+  # These dependencies are skipped because they require a newer version of go:
+  - dependency-name: "github.com/a8m/envsubst"
   labels:
     - "area/dependency"
     - "ok-to-test"
 ## main branch config ends here
+## release-0.12 branch config starts here
+# github-actions
+- directory: "/"
+  package-ecosystem: "github-actions"
+  schedule:
+    interval: "weekly"
+    day: "monday"
+  target-branch: release-0.12
+  groups:
+    all-github-actions:
+      patterns: [ "*" ]
+  commit-message:
+    prefix: ":seedling:"
+    include: scope
+  labels:
+  - "area/dependency"
+  - "ok-to-test"
+# Go directories
+- directories:
+  - "/"
+  - "/hack/tools"
+  package-ecosystem: "gomod"
+  schedule:
+    interval: "weekly"
+    day: "monday"
+  target-branch: release-0.12
+  groups:
+    all-go-mod-patch-and-minor:
+      patterns: [ "*" ]
+      update-types: [ "patch", "minor" ]
+  commit-message:
+    prefix: ":seedling:"
+    include: scope
+  ignore:
+  # Ignore CAPI major and minor bumps
+  - dependency-name: "sigs.k8s.io/cluster-api*"
+    update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  # Ignore controller-runtime major and minor bumps as its upgraded manually.
+  - dependency-name: "sigs.k8s.io/controller-runtime"
+    update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  # Ignore k8s major and minor bumps and its transitives modules
+  - dependency-name: "k8s.io/*"
+    update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  - dependency-name: "sigs.k8s.io/controller-tools"
+    update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  # We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
+  - dependency-name: "sigs.k8s.io/structured-merge-diff/*"
+  # These dependencies are skipped because they require a newer version of go:
+  - dependency-name: "github.com/a8m/envsubst"
+  labels:
+    - "area/dependency"
+    - "ok-to-test"
+## release-0.12 branch config ends here
 ## release-0.11 branch config starts here
 # github-actions
 - directory: "/"
@@ -99,6 +155,12 @@ updates:
     update-types: ["version-update:semver-major", "version-update:semver-minor"]
   # We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
   - dependency-name: "sigs.k8s.io/structured-merge-diff/*"
+  # These dependencies are skipped because they require a newer version of go:
+  - dependency-name: "golang.org/x/crypto"
+  - dependency-name: "github.com/a8m/envsubst"
+  - dependency-name: "golang.org/x/text"
+  - dependency-name: "github.com/onsi/ginkgo/v2"
+  - dependency-name: "github.com/onsi/gomega"
   labels:
     - "area/dependency"
     - "ok-to-test"

.github/workflows/pr-dependabot.yaml

@@ -24,10 +24,10 @@ jobs:
       id: vars
       run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
     - name: Set up Go
-      uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
+      uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # tag=v5.4.0
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
-    - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag=v4.2.0
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag=v4.2.3
       name: Restore go cache
       with:
         path: |

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
       - name: Calculate go version
         run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
       - name: Set up Go
-        uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # tag=v5.4.0
         with:
           go-version: ${{ env.go_version }}
       - name: generate release artifacts
@@ -37,7 +37,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
       - name: Release
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # tag=v2.2.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # tag=v2.2.1
         with:
           draft: true
           files: out/*

.github/workflows/update-golangci-lint.yaml

@@ -0,0 +1,53 @@
+name: Update golangci-lint version
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/update-golangci-lint.yaml'
+  schedule:
+    - cron: '0 0 * * *' # Runs every day at midnight UTC
+  workflow_dispatch: # Allows manual triggering
+
+permissions:
+  pull-requests: write
+
+jobs:
+  update-golangci-lint:
+    runs-on: ubuntu-latest
+    outputs:
+      latest_version: ${{ steps.get_version.outputs.latest_version }}
+      current_version: ${{ steps.check_version.outputs.current_version }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get latest golangci-lint version
+        id: get_version
+        run: |
+          export LATEST_VERSION=$(curl -s https://api.github.com/repos/golangci/golangci-lint/releases/latest | jq -r .tag_name)
+          echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
+          echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_OUTPUT
+      - name: Check current version in Makefile
+        id: check_version
+        run: |
+          export CURRENT_VERSION=$(grep 'GOLANGCI_LINT_VERSION ?=' hack/tools/Makefile | cut -d '=' -f2 | tr -d ' ')
+          echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
+          echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_OUTPUT
+      - name: Update Makefile if needed
+        if: ${{ steps.check_version.outputs.current_version != steps.get_version.outputs.latest_version }}
+        run: |
+          sed -i "s/GOLANGCI_LINT_VERSION ?= .*/GOLANGCI_LINT_VERSION ?= ${{ steps.get_version.outputs.latest_version }}/" hack/tools/Makefile
+      - name: Create Pull Request
+        if: ${{ steps.check_version.outputs.current_version != steps.get_version.outputs.latest_version }}
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # tag=v7.0.8
+        with:
+          commit-message: "This commit updates golangci-lint to version v${{ steps.get_version.outputs.latest_version }}."
+          title: ":seedling: chore: bump golangci-lint to v${{ steps.get_version.outputs.latest_version }}"
+          body: |
+            This PR was generated by GH workflow `update-golangci-lint` and
+            updates golangci-lint to version v${{ steps.get_version.outputs.latest_version }}.
+          branch: update-golangci-lint-${{ steps.get_version.outputs.latest_version }}
+          labels: "area/dependency"
+          add-paths: |
+            - hack/tools/Makefile

.golangci.yml

@@ -101,10 +101,6 @@ linters-settings:
       # CAPO
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1
         alias: infrav1alpha1
-      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
-        alias: infrav1alpha6
-      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
-        alias: infrav1alpha7
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
         alias: infrav1
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
@@ -182,7 +178,7 @@ issues:
   - "zz_generated.*\\.go$"
 
 run:
-  go: "1.22"
+  go: "1.23"
   timeout: 10m
   build-tags:
   - e2e

CONTRIBUTING.md

@@ -41,12 +41,13 @@ Cluster API Provider OpenStack maintains the most recent release/releases for al
 - For the current stable API version (v1beta1) we support the two most recent minor releases; older minor releases are immediately unsupported when a new major/minor release is available.
 - For older API versions we only support the most recent minor release until the API version reaches EOL.
 - We will maintain test coverage for all supported minor releases and for one additional release for the current stable API version in case we have to do an emergency patch release.
-  For example, if v0.10 and v0.11 are currently supported, we will also maintain test coverage for v0.9 for one additional release cycle. When v0.12 is released, tests for v0.9 will be removed.
+  For example, if v0.11 and v0.12 are currently supported, we will also maintain test coverage for v0.10 for one additional release cycle. When v0.13 is released, tests for v0.10 will be removed.
 
 | Minor Release | API Version  | Supported Until                                |
 |---------------|--------------|------------------------------------------------|
+| v0.12.x       | **v1beta1**  | when v0.14.0 will be released                  |
 | v0.11.x       | **v1beta1**  | when v0.13.0 will be released                  |
-| v0.10.x       | **v1beta1**  | when v0.12.0 will be released                  |
+| v0.10.x       | **v1beta1**  | EOL to be defined (v0.12.0 release date)       |
 | v0.9.x        | **v1alpha7** | EOL since 2024-10-24 - v0.11.0 release date    |
 | v0.8.x        | **v1alpha7** | EOL since 2024-04-17 - v0.10.0 release date    |
 
@@ -56,6 +57,7 @@ Cluster API Provider OpenStack maintains the most recent release/releases for al
 
 | Minor Release | v1beta1       | v1alpha7   | v1alpha6   | v1alpha5   |
 |---------------|---------------|------------|------------|------------|
+| v0.12.x       | **supported** | not served |            |            |
 | v0.11.x       | **supported** | deprecated | not served |            |
 | v0.10.x       | **supported** | supported  | deprecated | not served |
 | v0.9.x        |               | supported  | supported  | deprecated |

Dockerfile

@@ -13,19 +13,17 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22.0 as builder
+ARG GO_VERSION
+FROM golang:${GO_VERSION} AS builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
 ARG goproxy=https://proxy.golang.org
 ENV GOPROXY=$goproxy
 
 # Copy the Go Modules manifests
-RUN mkdir orc
 COPY go.mod go.mod
 COPY go.sum go.sum
-COPY orc/go.mod orc/go.mod
-COPY orc/go.sum orc/go.sum
 
 # Cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer