Merge branch 'kubernetes-sigs:main' into master

.github/ISSUE_TEMPLATE/cleanup_request.md

@@ -0,0 +1,31 @@
+---
+name: 'Cleanup request'
+about: Propose a cleanup task for this project.
+
+---
+
+/kind cleanup
+
+**What needs cleanup:**
+[A clear and concise description of what needs to be cleaned up.]
+<!--
+Examples of cleanup tasks:
+- Remove unused code
+- Refactor code
+- Increase test coverage
+- Fix typos/broken links
+- Bump dependency versions
+-->
+
+**Describe the solution you'd like**
+[Description of how you would like the cleanup to be done.]
+
+Files to change: 2
+
+- [ ] File 1
+  - Specific lines to cleanup
+- [ ] File 2
+  - Specific lines to cleanup
+
+**Anything else you would like to add:**
+[Miscellaneous information that will assist in solving the issue.]

.github/codecov.yml

@@ -0,0 +1,12 @@
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 1%
+        informational: true
+    patch:
+      default:
+        target: auto
+        threshold: 1%
+        informational: true

.github/pull_request_template.md

@@ -1,4 +1,4 @@
- <!-- If this is your first PR, welcome! Please make sure you read the [contributing guidelines](../CONTRIBUTING.md). -->
+ <!-- If this is your first PR, welcome! Please make sure you read the [contributing guidelines](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/CONTRIBUTING.md). -->
 
  <!-- Please label this pull request according to what type of issue you are addressing (see ../CONTRIBUTING.md) -->
 **What type of PR is this?**
@@ -22,8 +22,9 @@ Add one of the following kinds:
 Fixes #
 
 **Special notes for your reviewer**:
+<!-- Refer to https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/docs/book/src/developers/releasing.md#release-support for more information about which changes are eligible for backport -->
 
-_Please confirm that if this PR changes any image versions, then that's the sole change this PR makes._
+- [ ] cherry-pick candidate
 
 **TODOs**:
 <!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR. -->

.github/workflows/cover.yaml

@@ -2,6 +2,7 @@
 
 name: codecov
 on:
+  pull_request:
   push:
     branches:
     - main
@@ -10,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4.0.1
       with:
-        go-version: '^1.19'
+        go-version: '1.20'
     - run: "PATH=/usr/local/go/bin:$PATH make test-cover"
     - uses: codecov/codecov-action@v3
       with:

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

@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4.0.1
       with:
-        go-version: '1.19'
+        go-version: '1.20'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3 # tag=v3.2.0
@@ -37,7 +37,7 @@ jobs:
       run: make modules
     - name: Update generated code
       run: make generate
-    - uses: EndBug/add-and-commit@61a88be553afe4206585b31aa72387c64295d08b # tag=v9.1.1
+    - uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # tag=v9.1.3
       name: Commit changes
       with:
         author_name: dependabot[bot]

.github/workflows/release.yaml

@@ -18,9 +18,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4.0.1
         with:
-          go-version: '^1.19'
+          go-version: '^1.20'
       - name: generate release artifacts
         run: |
           make release

.github/workflows/scan.yml

@@ -0,0 +1,22 @@
+name: scan-images
+
+on:
+  schedule:
+    - cron: "0 12 * * 1"
+
+# Remove all permissions from GITHUB_TOKEN except metadata.
+permissions: {}
+
+jobs:
+  scan:
+    name: Trivy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
+      - name: Setup go
+        uses: actions/[email protected] # tag=v3.4.0
+        with:
+          go-version: 1.20
+      - name: Run verify container script
+        run: make verify-container-images

.golangci.yml

@@ -74,38 +74,28 @@ linters-settings:
       - pkg: sigs.k8s.io/controller-runtime
         alias: ctrl
       # CAPI
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
-        alias: clusterv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
-        alias: clusterv1alpha4
       - pkg: sigs.k8s.io/cluster-api/api/v1beta1
         alias: clusterv1
       # CAPI exp
-      - pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha3
-        alias: expv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha4
-        alias: expv1alpha4
       - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
         alias: expv1
       # CAPZ
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3
-        alias: infrav1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4
-        alias: infrav1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1beta1
         alias: infrav1
       # CAPZ exp
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3
-        alias: infrav1alpha3exp
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha4
-        alias: infrav1alpha4exp
       - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1
         alias: infrav1exp
       - pkg: sigs.k8s.io/cluster-api-provider-azure/util/webhook
         alias: webhookutils
       # Azure
       - pkg: github.com/Azure/go-autorest/autorest/azure
         alias: azureautorest
+      # ASO
+      - pkg: github.com/Azure/azure-service-operator/v2/api/resources/v1api20200601
+        alias: asoresourcesv1
+      # Deprecated
+      - pkg: github.com/Azure/go-autorest/autorest/to
+        alias: deprecated-use-k8s.io-utils-pointer
   gocritic:
     enabled-tags:
       - "experimental"
@@ -127,20 +117,18 @@ linters-settings:
         arguments:
           - disableStutteringCheck
   staticcheck:
-    go: "1.19"
+    go: "1.20"
   stylecheck:
-    go: "1.19"
+    go: "1.20"
   unused:
-    go: "1.19"
+    go: "1.20"
 
 issues:
   exclude-rules:
     - path: '(\w*)conversion.go'
       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: api/v1alpha3/azureclusteridentity_types.go
-      text: "methods on the same type should have the same receiver name"
     - path: ^test/
       linters:
         - dogsled

.markdownlinkcheck.json

@@ -1,7 +1,8 @@
 {
-    "ignorePatterns": [{
-        "pattern": "^https://calendar.google.com/calendar"
-    }],
+    "ignorePatterns": [
+        { "pattern": "^https://calendar.google.com/calendar" },
+        { "pattern": "^../reference/" }
+    ],
     "httpHeaders": [{
         "comment": "Workaround as suggested here: https://github.com/tcort/markdown-link-check/issues/201",
         "urls": ["https://docs.github.com/"],

Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -18,7 +18,7 @@
 ARG ARCH
 
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy