Merge pull request #298 from damdo/rebase-atop-v1.13.0

NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.13.0 (7ee3a6a) into master

.github/workflows/codeql.yml

@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
 
       # ℹ️ 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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           category: "/language:${{matrix.language}}"

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

@@ -18,18 +18,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         egress-policy: audit
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: '1.20'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # tag=v3.3.2
+    - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # tag=v3.3.3
       name: Restore go cache
       with:
         path: |

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3
+        uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5

.github/workflows/scan.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
       - name: Check out code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
       - name: Setup go
-        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version: 1.20
       - name: Run verify container script

.github/workflows/scorecards.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
@@ -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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           sarif_file: results.sarif

.gitignore

@@ -35,6 +35,9 @@ kubeconfig
 # Example and binary output directory
 /out
 
+# Mdbook build directory
+bookout
+
 # vscode
 .vscode
 *.code-workspace
@@ -74,9 +77,6 @@ hack/boilerplate/*.pyc
 # Helm chart caching
 .helm/
 
-# release notes
-_releasenotes
-
 # calico manifests archive
 release-*/manifests/calico-*.yaml
 

.golangci.yml

@@ -132,18 +132,14 @@ issues:
       text: "use underscores in Go names|receiver name (.+) should be consistent|methods on the same type should have the same receiver name"
     - path: 'mock(\w+)/doc.go$'
       text: "use underscores in package names|don't use an underscore in package name"
-    - path: ^test/
+    - path: (^test/|_test.go$)
       linters:
         - dogsled
         - goconst
         - godot
         - prealloc
-    - path: ^test/
+    - path: (^test/|_test.go$)
       text: exported (.+) should have comment( \(or a comment on this block\))? or be unexported
-    # Need to use the deprecated module "github.com/Azure/azure-sdk-for-go/services" till issue #2670 is addressed.
-    - linters:
-      - staticcheck
-      text: "github.com/Azure/azure-sdk-for-go/services/.* is deprecated"
     - source: \"github.com/onsi/(ginkgo/v2|gomega)\"
       text: "should not use dot imports"
   include:

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/pylint-dev/pylint
-  rev: v2.17.2
+  rev: v3.0.2
   hooks:
   - id: pylint
     exclude: ^hack/boilerplate/boilerplate.py$

CHANGELOG/README.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+This folder contains release notes for past releases. Changes to this folder in the main branch trigger a GitHub Action that creates release tags and a draft release.
+
+See [release documentation](https://capz.sigs.k8s.io/developers/releasing) for more information.

CHANGELOG/v1.11.7.md

@@ -0,0 +1,162 @@
+## Changes by Kind
+
+### Other (Cleanup or Flake)
+
+- Bump CAPI to v1.5.4 ([#4348](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4348), [@mboersma](https://github.com/mboersma))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- cloud.google.com/go/bigquery: v1.53.0 → v1.8.0
+- cloud.google.com/go/datastore: v1.13.0 → v1.1.0
+- cloud.google.com/go/firestore: v1.11.0 → v1.9.0
+- cloud.google.com/go/longrunning: v0.5.1 → v0.4.1
+- cloud.google.com/go/pubsub: v1.33.0 → v1.3.1
+- cloud.google.com/go: v0.110.6 → v0.110.0
+- github.com/docker/docker: [v24.0.5+incompatible → v24.0.7+incompatible](https://github.com/docker/docker/compare/v24.0.5...v24.0.7)
+- github.com/felixge/httpsnoop: [v1.0.3 → v1.0.4](https://github.com/felixge/httpsnoop/compare/v1.0.3...v1.0.4)
+- github.com/go-logr/logr: [v1.2.4 → v1.3.0](https://github.com/go-logr/logr/compare/v1.2.4...v1.3.0)
+- github.com/golang/glog: [v1.1.0 → v1.1.2](https://github.com/golang/glog/compare/v1.1.0...v1.1.2)
+- github.com/google/cel-go: [v0.12.6 → v0.12.7](https://github.com/google/cel-go/compare/v0.12.6...v0.12.7)
+- github.com/google/go-cmp: [v0.5.9 → v0.6.0](https://github.com/google/go-cmp/compare/v0.5.9...v0.6.0)
+- github.com/rogpeppe/go-internal: [v1.10.0 → v1.11.0](https://github.com/rogpeppe/go-internal/compare/v1.10.0...v1.11.0)
+- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc: v0.35.0 → v0.46.0
+- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp: v0.44.0 → v0.46.0
+- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc: v1.19.0 → v1.20.0
+- go.opentelemetry.io/otel/exporters/otlp/otlptrace: v1.19.0 → v1.20.0
+- go.opentelemetry.io/otel/metric: v1.19.0 → v1.20.0
+- go.opentelemetry.io/otel/sdk: v1.19.0 → v1.20.0
+- go.opentelemetry.io/otel/trace: v1.19.0 → v1.20.0
+- go.opentelemetry.io/otel: v1.19.0 → v1.20.0
+- go.uber.org/goleak: v1.2.1 → v1.3.0
+- golang.org/x/oauth2: v0.10.0 → v0.11.0
+- golang.org/x/sys: v0.13.0 → v0.14.0
+- google.golang.org/genproto/googleapis/api: f966b18 → b8732ec
+- google.golang.org/genproto/googleapis/rpc: f966b18 → b8732ec
+- google.golang.org/genproto: f966b18 → b8732ec
+- google.golang.org/grpc: v1.58.3 → v1.59.0
+- k8s.io/api: v0.27.2 → v0.27.7
+- k8s.io/apiextensions-apiserver: v0.27.2 → v0.27.7
+- k8s.io/apimachinery: v0.27.2 → v0.27.7
+- k8s.io/apiserver: v0.27.2 → v0.27.7
+- k8s.io/client-go: v0.27.2 → v0.27.7
+- k8s.io/code-generator: v0.27.2 → v0.27.7
+- k8s.io/component-base: v0.27.2 → v0.27.7
+- k8s.io/kms: v0.27.2 → v0.27.7
+- sigs.k8s.io/cluster-api/test: v1.5.3 → v1.5.4
+- sigs.k8s.io/cluster-api: v1.5.3 → v1.5.4
+- sigs.k8s.io/controller-runtime: v0.15.1 → v0.15.3
+
+### Removed
+- cloud.google.com/go/accessapproval: v1.7.1
+- cloud.google.com/go/accesscontextmanager: v1.8.1
+- cloud.google.com/go/aiplatform: v1.48.0
+- cloud.google.com/go/analytics: v0.21.3
+- cloud.google.com/go/apigateway: v1.6.1
+- cloud.google.com/go/apigeeconnect: v1.6.1
+- cloud.google.com/go/apigeeregistry: v0.7.1
+- cloud.google.com/go/appengine: v1.8.1
+- cloud.google.com/go/area120: v0.8.1
+- cloud.google.com/go/artifactregistry: v1.14.1
+- cloud.google.com/go/asset: v1.14.1
+- cloud.google.com/go/assuredworkloads: v1.11.1
+- cloud.google.com/go/automl: v1.13.1
+- cloud.google.com/go/baremetalsolution: v1.1.1
+- cloud.google.com/go/batch: v1.3.1
+- cloud.google.com/go/beyondcorp: v1.0.0
+- cloud.google.com/go/billing: v1.16.0
+- cloud.google.com/go/binaryauthorization: v1.6.1
+- cloud.google.com/go/certificatemanager: v1.7.1
+- cloud.google.com/go/channel: v1.16.0
+- cloud.google.com/go/cloudbuild: v1.13.0
+- cloud.google.com/go/clouddms: v1.6.1
+- cloud.google.com/go/cloudtasks: v1.12.1
+- cloud.google.com/go/contactcenterinsights: v1.10.0
+- cloud.google.com/go/container: v1.24.0
+- cloud.google.com/go/containeranalysis: v0.10.1
+- cloud.google.com/go/datacatalog: v1.16.0
+- cloud.google.com/go/dataflow: v0.9.1
+- cloud.google.com/go/dataform: v0.8.1
+- cloud.google.com/go/datafusion: v1.7.1
+- cloud.google.com/go/datalabeling: v0.8.1
+- cloud.google.com/go/dataplex: v1.9.0
+- cloud.google.com/go/dataproc/v2: v2.0.1
+- cloud.google.com/go/dataqna: v0.8.1
+- cloud.google.com/go/datastream: v1.10.0
+- cloud.google.com/go/deploy: v1.13.0
+- cloud.google.com/go/dialogflow: v1.40.0
+- cloud.google.com/go/dlp: v1.10.1
+- cloud.google.com/go/documentai: v1.22.0
+- cloud.google.com/go/domains: v0.9.1
+- cloud.google.com/go/edgecontainer: v1.1.1
+- cloud.google.com/go/errorreporting: v0.3.0
+- cloud.google.com/go/essentialcontacts: v1.6.2
+- cloud.google.com/go/eventarc: v1.13.0
+- cloud.google.com/go/filestore: v1.7.1
+- cloud.google.com/go/functions: v1.15.1
+- cloud.google.com/go/gkebackup: v1.3.0
+- cloud.google.com/go/gkeconnect: v0.8.1
+- cloud.google.com/go/gkehub: v0.14.1
+- cloud.google.com/go/gkemulticloud: v1.0.0
+- cloud.google.com/go/gsuiteaddons: v1.6.1
+- cloud.google.com/go/iam: v1.1.1
+- cloud.google.com/go/iap: v1.8.1
+- cloud.google.com/go/ids: v1.4.1
+- cloud.google.com/go/iot: v1.7.1
+- cloud.google.com/go/kms: v1.15.0
+- cloud.google.com/go/language: v1.10.1
+- cloud.google.com/go/lifesciences: v0.9.1
+- cloud.google.com/go/logging: v1.7.0
+- cloud.google.com/go/managedidentities: v1.6.1
+- cloud.google.com/go/maps: v1.4.0
+- cloud.google.com/go/mediatranslation: v0.8.1
+- cloud.google.com/go/memcache: v1.10.1
+- cloud.google.com/go/metastore: v1.12.0
+- cloud.google.com/go/monitoring: v1.15.1
+- cloud.google.com/go/networkconnectivity: v1.12.1
+- cloud.google.com/go/networkmanagement: v1.8.0
+- cloud.google.com/go/networksecurity: v0.9.1
+- cloud.google.com/go/notebooks: v1.9.1
+- cloud.google.com/go/optimization: v1.4.1
+- cloud.google.com/go/orchestration: v1.8.1
+- cloud.google.com/go/orgpolicy: v1.11.1
+- cloud.google.com/go/osconfig: v1.12.1
+- cloud.google.com/go/oslogin: v1.10.1
+- cloud.google.com/go/phishingprotection: v0.8.1
+- cloud.google.com/go/policytroubleshooter: v1.8.0
+- cloud.google.com/go/privatecatalog: v0.9.1
+- cloud.google.com/go/pubsublite: v1.8.1
+- cloud.google.com/go/recaptchaenterprise/v2: v2.7.2
+- cloud.google.com/go/recommendationengine: v0.8.1
+- cloud.google.com/go/recommender: v1.10.1
+- cloud.google.com/go/redis: v1.13.1
+- cloud.google.com/go/resourcemanager: v1.9.1
+- cloud.google.com/go/resourcesettings: v1.6.1
+- cloud.google.com/go/retail: v1.14.1
+- cloud.google.com/go/run: v1.2.0
+- cloud.google.com/go/scheduler: v1.10.1
+- cloud.google.com/go/secretmanager: v1.11.1
+- cloud.google.com/go/security: v1.15.1
+- cloud.google.com/go/securitycenter: v1.23.0
+- cloud.google.com/go/servicedirectory: v1.11.0
+- cloud.google.com/go/shell: v1.7.1
+- cloud.google.com/go/spanner: v1.47.0
+- cloud.google.com/go/speech: v1.19.0
+- cloud.google.com/go/storagetransfer: v1.10.0
+- cloud.google.com/go/talent: v1.6.2
+- cloud.google.com/go/texttospeech: v1.7.1
+- cloud.google.com/go/tpu: v1.6.1
+- cloud.google.com/go/trace: v1.10.1
+- cloud.google.com/go/translate: v1.8.2
+- cloud.google.com/go/video: v1.19.0
+- cloud.google.com/go/videointelligence: v1.11.1
+- cloud.google.com/go/vision/v2: v2.7.2
+- cloud.google.com/go/vmmigration: v1.7.1
+- cloud.google.com/go/vmwareengine: v1.0.0
+- cloud.google.com/go/vpcaccess: v1.7.1
+- cloud.google.com/go/webrisk: v1.9.1
+- cloud.google.com/go/websecurityscanner: v1.6.1
+- cloud.google.com/go/workflows: v1.11.1

CHANGELOG/v1.11.8.md

@@ -0,0 +1,19 @@
+## Changes by Kind
+
+### Bug or Regression
+
+- ASO environment variables can now be set to refer to a non-public (e.g. government) cloud instance and set ASO's periodic resync interval: https://azure.github.io/azure-service-operator/guide/aso-controller-settings-options/ ([#4412](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4412), [@nojnhuh](https://github.com/nojnhuh))
+
+### Other (Cleanup or Flake)
+
+- Bump CAPI to v1.5.5 ([#4465](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4465), [@mboersma](https://github.com/mboersma))
+
+## Dependencies
+
+### Changed
+- golang.org/x/crypto: v0.14.0 → v0.17.0
+- golang.org/x/sys: v0.14.0 → v0.15.0
+- golang.org/x/term: v0.13.0 → v0.15.0
+- golang.org/x/text: v0.13.0 → v0.14.0
+- sigs.k8s.io/cluster-api/test: v1.5.4 → v1.5.5
+- sigs.k8s.io/cluster-api: v1.5.4 → v1.5.5

CHANGELOG/v1.12.1.md

@@ -0,0 +1,24 @@
+## Changes by Kind
+
+### Bug or Regression
+
+- Fix: DNSPrefix error on existing tenant cluster (#4368, @mihaiandreiratoiu)
+- Support AKS BYOCNI by allowing networkPlugin: none (#4318, @illrill)
+
+### Other (Cleanup or Flake)
+
+- Bump CAPI to v1.5.4 (#4344, @mboersma)
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/felixge/httpsnoop: [v1.0.3 → v1.0.4](https://github.com/felixge/httpsnoop/compare/v1.0.3...v1.0.4)
+- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp: v0.44.0 → v0.46.0
+- sigs.k8s.io/cluster-api/test: v1.5.3 → v1.5.4
+- sigs.k8s.io/cluster-api: v1.5.3 → v1.5.4
+
+### Removed
+_Nothing has changed._