Merge branch 'main' into role-request

Author: mergify[bot]

.github/CODEOWNERS

@@ -1,2 +1,2 @@
-/.github/settings.yml @detiber @displague @micahhausler
-/.github/CODEOWNERS @detiber @displague @micahhausler
+/.github/settings.yml @displague @micahhausler @chrisdoherty4
+/.github/CODEOWNERS @displague @micahhausler @chrisdoherty4

.github/settings.yml

@@ -2,16 +2,16 @@
 # See https://docs.github.com/en/rest/reference/repos#add-a-repository-collaborator for available options
 collaborators:
   # Maintainers, should also be added to the .github/CODEOWNERS file as owners of this settings.yml file.
-  - username: detiber
-    permission: maintain
   - username: displague
     permission: maintain
   - username: micahhausler
     permission: maintain
+  - username: chrisdoherty4
+    permission: maintain
   # Approvers
   - username: tstromberg
     permission: push
-  - username: chrisdoherty4
+  - username: detiber
     permission: push
   - username: abhinavmpandey08
     permission: push

.github/workflows/ci.yaml

@@ -14,35 +14,36 @@ jobs:
       matrix:
         target: ["verify", "lint", "test"]
     steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - uses: ./.github/actions/setup-go
-    - uses: actions/cache@v3
-      with:
-        path: hack/tools/bin
-        key: ${{ runner.os }}-tools-bin-${{ matrix.target }}-${{ hashFiles('Makefile') }}
-        restore-keys: |
-          ${{ runner.os }}-tools-bin-${{ matrix.target }}-
-          ${{ runner.os }}-tools-bin-
-    - uses: actions/cache@v3
-      if: ${{ matrix.target == 'test' }}
-      with:
-        path: /tmp/kubebuilder-tools-*.tar.gz
-        key: ${{ runner.os }}-tmp-${{ matrix.target }}-${{ hashFiles('scripts/fetch_ext_bins.sh') }}
-        restore-keys: |
-          ${{ runner.os }}-tmp-${{ matrix.target }}-
-          ${{ runner.os }}-tmp-
-    - name: ${{ matrix.target }}
-      run: make ${{ matrix.target }}
+      - name: checkout
+        uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-go
+      - uses: actions/cache@v3
+        with:
+          path: hack/tools/bin
+          key: ${{ runner.os }}-tools-bin-${{ matrix.target }}-${{ hashFiles('Makefile') }}
+          restore-keys: |
+            ${{ runner.os }}-tools-bin-${{ matrix.target }}-
+            ${{ runner.os }}-tools-bin-
+      - uses: actions/cache@v3
+        if: ${{ matrix.target == 'test' }}
+        with:
+          path: /tmp/kubebuilder-tools-*.tar.gz
+          key: ${{ runner.os }}-tmp-${{ matrix.target }}-${{ hashFiles('scripts/fetch_ext_bins.sh') }}
+          restore-keys: |
+            ${{ runner.os }}-tmp-${{ matrix.target }}-
+            ${{ runner.os }}-tmp-
+      - name: ${{ matrix.target }}
+        run: make ${{ matrix.target }}
   codespell:
     name: Codespell
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
       - name: Codespell
-        uses: codespell-project/actions-codespell@master
+        uses: codespell-project/actions-codespell@v1.0
         with:
           check_filenames: true
           check_hidden: true
-          skip: './.git,./go.mod,./go.sum'
+          skip: "./.git,./go.mod,./go.sum"
+          ignore_words_list: ro