Merge pull request #260 from Fedosin/rebase-bot-master

Bug 2087043: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:main into master

.codespellignore

@@ -0,0 +1,5 @@
+aks
+witht
+geting
+ot
+intepreted

.gitattributes

@@ -0,0 +1,5 @@
+# Specify generated cluster templates as generated files
+**/cluster-template-*.yaml linguist-generated
+
+*.sh text eol=lf
+*.yaml text eol=lf

.github/workflows/codespell.yml

@@ -0,0 +1,14 @@
+name: Codespell
+on:
+  pull_request:
+jobs:
+  codespell:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: codespell-project/actions-codespell@master
+      with:
+        skip: .git,_artifacts,*.sum
+        ignore_words_file: .codespellignore
+        check_filenames: true
+        check_hidden: true

.gitignore

@@ -54,6 +54,7 @@ bazel-*
 .tiltbuild
 /tilt.d
 tilt-settings.json
+tilt-settings.yaml
 tilt_config.json
 
 # e2e output
@@ -75,3 +76,6 @@ hack/boilerplate/*.pyc
 
 # release notes
 _releasenotes
+
+# calico manifests archive
+release-*/manifests/calico-*.yaml

.golangci.yml

@@ -1,22 +1,23 @@
 run:
   deadline: 5m
-  skip-dirs:
-    - mock*
   skip-files:
-  - "zz_generated.*\\.go$"
-  - ".*conversion.*\\.go$"
+  - 'zz_generated\.(\w*)\.go$'
+  build-tags:
+    - e2e
 linters:
   disable-all: true
   enable:
     - asciicheck
     - bodyclose
-    - deadcode
+    - containedctx
     - depguard
     - dogsled
     - errcheck
     - errorlint
     - exportloopref
+    - gci
     - goconst
+    - gocritic
     - gocyclo
     - godot
     - gofmt
@@ -30,24 +31,24 @@ linters:
     - misspell
     - nakedret
     - nilerr
+    - noctx
     - nolintlint
     - prealloc
+    - predeclared
     - revive
     - rowserrcheck
     - staticcheck
-    - structcheck
+    - stylecheck
+    - thelper
     - typecheck
     - unconvert
+    - unparam
     - unused
-    - varcheck
     - whitespace
   # Run with --fast=false for more extensive checks
   fast: true
 
 linters-settings:
-  ifshort:
-    # Maximum length of variable declaration measured in number of characters, after which linter won't suggest using short syntax.
-    max-decl-chars: 50
   importas:
     no-unaliased: true
     alias:
@@ -65,6 +66,37 @@ linters-settings:
       # Controller Runtime
       - 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
+  gocritic:
+    enabled-tags:
+      - "experimental"
   godot:
     #   declarations - for top level declaration comments (default);
     #   toplevel     - for top level comments;
@@ -77,24 +109,38 @@ linters-settings:
     excludes:
     - G307 # Deferring unsafe method "Close" on type "\*os.File"
     - G108 # Profiling endpoint is automatically exposed on /debug/pprof
+  revive:
+    rules:
+      - name: exported
+        arguments:
+          - disableStutteringCheck
   staticcheck:
-    go: "1.16"
+    go: "1.18"
+  stylecheck:
+    go: "1.18"
+  unused:
+    go: "1.18"
 
 issues:
   exclude-rules:
-    - path: internal/test/
+    - 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:
-        - golint
-    - path: cloudtest\.go
-      linters:
-        - golint
-    - path: api/v1alpha3/types\.go
-      linters:
-        - golint
-    - path: _test\.go
-      linters:
-        - unused
+        - dogsled
+        - goconst
+        - godot
+        - prealloc
+    - path: ^test/
+      text: exported (.+) should have comment( \(or a comment on this block\))? or be unexported
+    - source: \"github.com/onsi/(ginkgo|gomega)\"
+      text: "should not use dot imports"
   include:
-  - EXC0002 # include "missing comments" issues from golint
+  - EXC0012  # revive: check for comments
+  - EXC0014  # revive: check for comments
   max-issues-per-linter: 0
   max-same-issues: 0

.markdownlinkcheck.json

@@ -2,6 +2,13 @@
     "ignorePatterns": [{
         "pattern": "^https://calendar.google.com/calendar"
     }],
+    "httpHeaders": [{
+        "comment": "Workaround as suggested here: https://github.com/tcort/markdown-link-check/issues/201",
+        "urls": ["https://docs.github.com/"],
+        "headers": {
+            "Accept-Encoding": "zstd, br, gzip, deflate"
+        }
+    }],
     "timeout": "5s",
     "retryOn429": true,
     "retryCount": 5,

CONTRIBUTING.md

@@ -34,20 +34,20 @@ If you're new to the project and want to help, but don't know where to start, we
     1. See the [Development Guide](https://capz.sigs.k8s.io/developers/development.html) for more instructions on setting up your environment and testing changes locally.
 3. Submit a pull request.
     1. All PRs should be labeled with one of the following kinds
-         - `/kind feature` for PRs releated to adding new features/tests
-         - `/kind bug` for PRs releated to bug fixes and patches
-         - `/kind api-change` for PRs releated to adding, removing, or otherwise changing an API
-         - `/kind cleanup` for PRs releated to code refactoring and cleanup
+         - `/kind feature` for PRs related to adding new features/tests
+         - `/kind bug` for PRs related to bug fixes and patches
+         - `/kind api-change` for PRs related to adding, removing, or otherwise changing an API
+         - `/kind cleanup` for PRs related to code refactoring and cleanup
          - `/kind deprecation` for PRs related to a feature/enhancement marked for deprecation.
-         - `/kind design` for PRs releated to design proposals
-         - `/kind documentation` for PRs releated to documentation
-         - `/kind failing-test` for PRs releated to to a consistently or frequently failing test.
+         - `/kind design` for PRs related to design proposals
+         - `/kind documentation` for PRs related to documentation
+         - `/kind failing-test` for PRs related to a consistently or frequently failing test.
          - `/kind flake` for PRs related to a flaky test.
-         - `/kind other` for PRs releated to updating dependencies, minor changes or other
+         - `/kind other` for PRs related to updating dependencies, minor changes or other
      2. If the PR requires additional action from users switching to a new release, include the string "action required" in the PR release-notes.
      3. All code changes must be covered by unit tests and E2E tests.
      4. All new features should come with user documentation.
- 4. Once the PR has been reviewed and is ready to be merged, commits should be [squashed](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md#squash-commits). 
+ 4. Once the PR has been reviewed and is ready to be merged, commits should be [squashed](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md#squash-commits).
     1. Ensure that commit message(s) are be meaningful and commit history is readable.
 
 All changes must be code reviewed. Coding conventions and standards are explained in the official [developer docs](https://github.com/kubernetes/community/tree/master/contributors/devel). Expect reviewers to request that you avoid common [go style mistakes](https://github.com/golang/go/wiki/CodeReviewComments) in your PRs.

Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.1-experimental
+# syntax=docker/dockerfile:1.4
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.18 as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy