Merge branch 'master' into book-v3

kubernetes-sigs · Jan 16, 2023 · f5faef7 · f5faef7
2 parents ce1a6bc + 26f605e
commit f5faef7
Show file tree

Hide file tree

Showing 468 changed files with 1,716 additions and 3,798 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           go-version: '~1.19'
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
+        uses: goreleaser/goreleaser-action@v4
         with:
           version: v1.11.2
           args: release -f ./build/.goreleaser.yml --rm-dist

diff --git a/RELEASE.md b/RELEASE.md
@@ -86,13 +86,8 @@ The releases occur in an account in the Google Cloud (See [here](https://console
 
 ### To build the Kubebuilder CLI binaries:
 
-A trigger `build-kb-release` is configured to call [build/cloudbuild.yaml](build/cloudbuild.yaml).
-This trigger will be executed when any new tag be published. 
-The tags must be built from the release branch (Currently, `release-3`).
-
-Also, we have a trigger to generate snapshots builds from the master branch.
-This trigger will call [build/cloudbuild_snapshot.yaml](build/cloudbuild_snapshot.yaml)
-when any change needs to be performed on master.
+A trigger GitHub action [release](.github/workflows/release.yml) is trigged when a new tag is pushed.
+This action will caall the job [./build/.goreleaser.yml](./build/.goreleaser.yml).
 
 ### To build the Kubebuilder-tools: (Artifacts required to use ENV TEST)
 

diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
@@ -44,7 +44,7 @@ builds:
       - darwin_amd64
       - darwin_arm64
     env:
-      - KUBERNETES_VERSION=1.25.0
+      - KUBERNETES_VERSION=1.26.0
       - CGO_ENABLED=0
 
 # Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.

diff --git a/build/build_kubebuilder.sh b/build/build_kubebuilder.sh
diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml
diff --git a/build/cloudbuild_local.yaml b/build/cloudbuild_local.yaml
diff --git a/build/cloudbuild_snapshot.yaml b/build/cloudbuild_snapshot.yaml
diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md
@@ -6,8 +6,6 @@
 
 [Architecture](./architecture.md)
 
-[FAQ](./faq.md)
-
 ---
 
 - [Tutorial: Building CronJob](cronjob-tutorial/cronjob-tutorial.md)
@@ -134,6 +132,8 @@
 
 ---
 
+[FAQ](./faq.md)
+
 [Appendix: The TODO Landing Page](./TODO.md)
 
 [plugins]: ./plugins/plugins.md
diff --git a/docs/book/src/component-config-tutorial/testdata/project/Makefile b/docs/book/src/component-config-tutorial/testdata/project/Makefile
@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/docs/book/src/cronjob-tutorial/testdata/emptycontroller.go b/docs/book/src/cronjob-tutorial/testdata/emptycontroller.go
@@ -55,6 +55,16 @@ needed to run.  As we add more functionality, we'll need to revisit these.
 // +kubebuilder:rbac:groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=batch.tutorial.kubebuilder.io,resources=cronjobs/status,verbs=get;update;patch
 
+/*
+The `ClusterRole` manifest at `config/rbac/role.yaml` is generated from the above markers via controller-gen with the following command:
+*/
+
+// make manifests
+
+/*
+NOTE: If you receive an error, please run the specified command in the error and re-run `make manifests`.
+*/
+
 /*
 `Reconcile` actually performs the reconciling for a single named object.
 Our [Request](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/reconcile?tab=doc#Request) just has a name, but we can use the client to fetch