Merge pull request #325 from RadekManak/rebase-no-aso-deployment

OCPCLOUD-2745: cluster-api-provider-azure:v1.17.1 (32cd4c7) into master + deploy aso crds

Author: openshift-merge-bot[bot]

.github/dependabot.yml

@@ -12,6 +12,9 @@ updates:
     time: "09:00"
     # Use America/New_York Standard Time (UTC -05:00)
     timezone: "America/New_York"
+  groups:
+    all-github-actions:
+      patterns: [ "*" ]
   commit-message:
     prefix: "dependabot"
     include: scope
@@ -37,6 +40,8 @@ updates:
     - dependency-name: "sigs.k8s.io/controller-runtime"
     # Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
     - dependency-name: "k8s.io/*"
+    - dependency-name: "github.com/prometheus/*"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor"] # Consume only patch updates.
     - dependency-name: "go.etcd.io/*"
     - dependency-name: "google.golang.org/grpc"
     - dependency-name: "sigs.k8s.io/cloud-provider-azure"

.github/workflows/codeql.yml

@@ -41,16 +41,16 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/dependabot-code-gen.yml

@@ -20,16 +20,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         egress-policy: audit
     - name: Set up Go 1.x
-      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: '1.21'
+        go-version: '1.22'
       id: go
     - name: Check out code into the Go module directory
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # tag=v4.0.2
       name: Restore go cache
       with:

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
+        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4

.github/workflows/scan.yml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: Check out code
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
       - name: Setup go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.21
+          go-version: 1.22
       - name: Run verify container script
         run: make verify-container-images

.github/workflows/scorecards.yml

@@ -31,17 +31,17 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -63,14 +63,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           sarif_file: results.sarif

.gitignore

@@ -84,3 +84,12 @@ release-*/manifests/calico-*.yaml
 # mentioned in the capz book
 /sp.json
 /cluster.yaml
+
+# CI workload-identity
+jwks.json
+*.pub
+*.key
+azure_identity_id
+azure_wi_back_compat
+openid-configuration.json
+aks-mgmt.config

.golangci.yml

@@ -123,11 +123,11 @@ linters-settings:
         arguments:
           - disableStutteringCheck
   staticcheck:
-    go: "1.21"
+    go: "1.22"
   stylecheck:
-    go: "1.21"
+    go: "1.22"
   unused:
-    go: "1.21"
+    go: "1.22"
 
 issues:
   exclude-rules:

CHANGELOG/v1.13.6.md

@@ -2,9 +2,9 @@
 
 ### Bug or Regression
 
-- [`AZURE_SYNC_PERIOD`](https://azure.github.io/azure-service-operator/guide/aso-controller-settings-options/#azure_sync_period) for ASO now defaults to `1h` instead of "effectively never" ([#4782](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4782), [@k8s-infra-cherrypick-robot](https://github.com/k8s-infra-cherrypick-robot))
+- [`AZURE_SYNC_PERIOD`](https://azure.github.io/azure-service-operator/guide/aso-controller-settings-options/#azure_sync_period) for ASO now defaults to `1h` instead of "effectively never" ([#4782](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4782), [@nojnhuh](https://github.com/nojnhuh))
 - Don't allow fleetsMembers to have capital letters. Default fleet spec.group. ([#4820](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4820), [@willie-yao](https://github.com/willie-yao))
-- Use correct resource group for Bastion with custom vnet ([#4817](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4817), [@k8s-infra-cherrypick-robot](https://github.com/k8s-infra-cherrypick-robot))
+- Use correct resource group for Bastion with custom vnet ([#4817](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4817), [@willie-yao](https://github.com/willie-yao))
 
 ## Dependencies
 

CHANGELOG/v1.14.4.md

@@ -0,0 +1,19 @@
+## Changes by Kind
+
+### Bug or Regression
+
+- Don't allow fleetsMembers to have capital letters. Default fleet spec.group. ([#4818](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4818), [@willie-yao](https://github.com/willie-yao))
+- [`AZURE_SYNC_PERIOD`](https://azure.github.io/azure-service-operator/guide/aso-controller-settings-options/#azure_sync_period) for ASO now defaults to `1h` instead of "effectively never" ([#4783](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4783), [@nojnhuh](https://github.com/nojnhuh))
+- Allow upper-case Azure resource names ([#4815](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4815), [@willie-yao](https://github.com/willie-yao))
+- Use correct resource group for Bastion with custom vnet ([#4816](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4816), [@willie-yao](https://github.com/willie-yao))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+_Nothing has changed._
+
+### Removed
+_Nothing has changed._