Merge branch 'master' into steve/fix-extending-cli-docs

Author: sklarsa

.github/dependabot.yml

@@ -5,7 +5,6 @@
 
 version: 2
 updates:
-
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     # Workflow files stored in the
@@ -47,3 +46,11 @@ updates:
     directory: "testdata/project-v4"
     schedule:
       interval: "weekly"
+
+  # Maintain dependencies for go in external plugin sample
+  - package-ecosystem: "gomod"
+    directory: "docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "ok-to-test"

.github/workflows/apidiff.yml

@@ -19,18 +19,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: '~1.20'
       - name: Execute go-apidiff
         uses: joelanford/[email protected]
         with:
           compare-imports: true
           print-compatible: true
-      - name: Report failure
-        uses: nashmaniac/[email protected]
-        # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
-        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
-        with:
-          title: 🐛 go-apidiff failed for ${{ github.sha }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/lint.yml

@@ -15,23 +15,14 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '~1.20'
       - name: Clone the code
         uses: actions/checkout@v3
       - name: Run linter
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.51
           only-new-issues: true # Show only new issues if it's a pull request
-      - name: Report failure
-        uses: nashmaniac/[email protected]
-        # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
-        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
-        with:
-          title: 🐛 Lint failed for ${{ github.sha }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
   yamllint:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '~1.19'
+          go-version: '~1.20'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

.github/workflows/testdata.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '~1.20'
       - name: Remove pre-installed kustomize
         # This step is needed as the following one tries to remove
         # kustomize for each test but has no permission to do so
@@ -27,12 +27,3 @@ jobs:
         run: make check-testdata
       - name: Verify docs update
         run: make check-docs
-      - name: Report failure
-        uses: nashmaniac/[email protected]
-        # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
-        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
-        with:
-          title: 🐛 Testadata verification failed for ${{ github.sha }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/unit-tests-legacy.yml

@@ -23,28 +23,10 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          # the go/v2 cannot be updated and is scaffold with golang 1.13
-          # (version used by its dep version of the controller-runtime)
-          # however, we are unable to downgrade the version here
-          # because we will face errors
-          # So we are keeping the latest version where it works
-          # and highlighting that must be fixed
-          # Therefore, we probably will deprecate go/v2 soon since we cannot upgrade it
-          # to use the versions of controller-runtime > v0.9
-          # and controller-tools > v0.6 as k8s > 1.21 then it might not be valid we spend effort on this fix
           go-version: "1.19"
       # This step is needed as the following one tries to remove
       # kustomize for each test but has no permission to do so
       - name: Remove pre-installed kustomize
         run: sudo rm -f /usr/local/bin/kustomize
       - name: Perform the test
         run: make test-legacy
-      - name: Report failure
-        uses: nashmaniac/[email protected]
-        # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
-        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
-        with:
-          title: 🐛 Unit tests failed on ${{ matrix.os }} for ${{ github.sha }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/unit-tests.yml

@@ -22,15 +22,15 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: '~1.20'
       # This step is needed as the following one tries to remove
       # kustomize for each test but has no permission to do so
       - name: Remove pre-installed kustomize
         run: sudo rm -f /usr/local/bin/kustomize
       - name: Perform the test
         run: make test
       - name: Report failure
-        uses: nashmaniac/create-issue-action@v1.1
+        uses: nashmaniac/create-issue-action@v1.2
         # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
         if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
@@ -59,12 +59,3 @@ jobs:
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: coverage-all.out
-      - name: Report failure
-        uses: nashmaniac/[email protected]
-        # Only report failures of pushes (PRs have are visible through the Checks section) to the default branch
-        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/master'
-        with:
-          title: 🐛 Coverage report failed for ${{ github.sha }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.golangci.yml

@@ -11,6 +11,10 @@ issues:
   exclude-rules:
     - linters: [gosec]
       path: "test/e2e/*"
+    - path: "hack/docs/*"
+      linters:
+        - lll
+        - gosec
 
 linters-settings:
   govet:

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please see https://git.k8s.io/community/CLA.md for more info.
 
 ## Prerequisites
 
-- [go](https://golang.org/dl/) version v1.16+.
+- [go](https://golang.org/dl/) version v1.20+.
 - [docker](https://docs.docker.com/install/) version 17.03+.
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.11.3+.
 - [kustomize](https://github.com/kubernetes-sigs/kustomize/blob/master/site/content/en/docs/Getting%20started/installation.md) v3.1.0+

OWNERS_ALIASES

@@ -4,9 +4,7 @@ aliases:
   # active folks who can be contacted to perform admin-related
   # tasks on the repo, or otherwise approve any PRs.
   kubebuilder-admins:
-    - pwittrock
     - camilamacedo86
-    - jmrodri
     - varshaprasad96
 
   # non-admin folks who can approve any PRs in the repo
@@ -15,16 +13,18 @@ aliases:
   # folks who can review and LGTM any PRs in the repo (doesn't include
   # approvers & admins -- those count too via the OWNERS file)
   kubebuilder-reviewers:
-    - joelanford
     - rashmigottipati
     - everettraven
     - Kavinjsir
 
   # folks who may have context on ancient history,
   # but are no longer directly involved
   kubebuilder-emeritus-approvers:
+  - adirio
   - directxman12
   - droot
-  - mengqiy
   - estroz
-  - adirio
+  - jmrodri
+  - joelanford
+  - mengqiy
+  - pwittrock