Skip to content

Commit f5faef7

Browse files
Merge branch 'master' into book-v3
2 parents ce1a6bc + 26f605e commit f5faef7

File tree

468 files changed

+1716
-3798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

468 files changed

+1716
-3798
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
go-version: '~1.19'
2121
- name: Run GoReleaser
22-
uses: goreleaser/goreleaser-action@v3
22+
uses: goreleaser/goreleaser-action@v4
2323
with:
2424
version: v1.11.2
2525
args: release -f ./build/.goreleaser.yml --rm-dist

RELEASE.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,8 @@ The releases occur in an account in the Google Cloud (See [here](https://console
8686

8787
### To build the Kubebuilder CLI binaries:
8888

89-
A trigger `build-kb-release` is configured to call [build/cloudbuild.yaml](build/cloudbuild.yaml).
90-
This trigger will be executed when any new tag be published.
91-
The tags must be built from the release branch (Currently, `release-3`).
92-
93-
Also, we have a trigger to generate snapshots builds from the master branch.
94-
This trigger will call [build/cloudbuild_snapshot.yaml](build/cloudbuild_snapshot.yaml)
95-
when any change needs to be performed on master.
89+
A trigger GitHub action [release](.github/workflows/release.yml) is trigged when a new tag is pushed.
90+
This action will caall the job [./build/.goreleaser.yml](./build/.goreleaser.yml).
9691

9792
### To build the Kubebuilder-tools: (Artifacts required to use ENV TEST)
9893

build/.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ builds:
4444
- darwin_amd64
4545
- darwin_arm64
4646
env:
47-
- KUBERNETES_VERSION=1.25.0
47+
- KUBERNETES_VERSION=1.26.0
4848
- CGO_ENABLED=0
4949

5050
# Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.

build/build_kubebuilder.sh

Lines changed: 0 additions & 111 deletions
This file was deleted.

build/cloudbuild.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

build/cloudbuild_local.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

build/cloudbuild_snapshot.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

docs/book/src/SUMMARY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
[Architecture](./architecture.md)
88

9-
[FAQ](./faq.md)
10-
119
---
1210

1311
- [Tutorial: Building CronJob](cronjob-tutorial/cronjob-tutorial.md)
@@ -134,6 +132,8 @@
134132

135133
---
136134

135+
[FAQ](./faq.md)
136+
137137
[Appendix: The TODO Landing Page](./TODO.md)
138138

139139
[plugins]: ./plugins/plugins.md

docs/book/src/component-config-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.25.0
5+
ENVTEST_K8S_VERSION = 1.26.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

docs/book/src/cronjob-tutorial/testdata/emptycontroller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ needed to run. As we add more functionality, we'll need to revisit these.
5555
// +kubebuilder:rbac:groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
5656
// +kubebuilder:rbac:groups=batch.tutorial.kubebuilder.io,resources=cronjobs/status,verbs=get;update;patch
5757

58+
/*
59+
The `ClusterRole` manifest at `config/rbac/role.yaml` is generated from the above markers via controller-gen with the following command:
60+
*/
61+
62+
// make manifests
63+
64+
/*
65+
NOTE: If you receive an error, please run the specified command in the error and re-run `make manifests`.
66+
*/
67+
5868
/*
5969
`Reconcile` actually performs the reconciling for a single named object.
6070
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

0 commit comments

Comments
 (0)