Skip to content

📖 Update book-v3 with latest docs fixes and release-3.10 branch with conflicts solved #3349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 344 commits into from
Apr 21, 2023
Merged

📖 Update book-v3 with latest docs fixes and release-3.10 branch with conflicts solved #3349

merged 344 commits into from
Apr 21, 2023

Conversation

camilamacedo86
Copy link
Member

@camilamacedo86 camilamacedo86 commented Apr 21, 2023 •
edited
Loading

Description

We addressed some docs fixes into master, which was synced with release-3.10
So that we can merge release-3.10 to book-v3 to update the prod docs and solve the conflicts.

See that is the release-3.10 branch with the solved conflicts with book-v3 :

Screenshot 2023-04-21 at 10 07 00

k8s-ci-robot and others added 30 commits October 25, 2022 09:22
@k8s-ci-robot
Merge pull request #3040 from oscr/enable-revive-unused-parameter
2a0133c 
🌱 Enable revive unused-parameter check and fix findings
@k8s-ci-robot
Merge pull request #3041 from kubernetes-sigs/dependabot/go_modules/g…
6af8e88 
…ithub.com/onsi/ginkgo/v2-2.4.0

🌱 Bump github.com/onsi/ginkgo/v2 from 2.3.1 to 2.4.0
@k8s-ci-robot
Merge pull request #3039 from seemiller/patch-1
b1087a7 
📖 Fix grammar in comment
@k8s-ci-robot
Merge pull request #3043 from oscr/update-linter-in-github-workflow
e4e7f70 
🌱 Update github workflow to use same golangci-lint minor version as Makefile
@mikelsid
fix docker buildx args
057f627 
Signed-off-by: Mikhail Sidorov <[email protected]>
@k8s-ci-robot
Merge pull request #3046 from mikelsid/master
c73d4d5 
🐛  Fix docker buildx makefile target missing arg (.)
@h0tbird
🐛 (kustomize/v2-alpha): Fix typo issue in the labels added to the man…
0b36d0c 
…ifests (#3047)

* Fix typo in kubernets (missing 'e')

* make generate
@astraw99
Add KB project git-repo and edit icons
473be14
@astraw99
Add doc FAQ section
55034be
@k8s-ci-robot
Merge pull request #3050 from astraw99/ftr-add-git-icon
0cf3280 
🌱 Add KB project git-repo and edit icons
@k8s-ci-robot
Merge pull request #3044 from astraw99/ftr-add-faq
5f51f1d 
📖 Add kubebuilder FAQ section
@Kavinjsir
docs: supplement plugin creation
637f85a
@oscr
Update joelanford/go-apidiff (v0.4.0 -> v0.5.0)
49b863d
@k8s-ci-robot
Merge pull request #3051 from oscr/update-apidiff
69b64ae 
🌱  Update joelanford/go-apidiff (v0.4.0 -> v0.5.0)
@dependabot
Bump github.com/onsi/gomega from 1.22.1 to 1.23.0
f297975 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.22.1 to 1.23.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.22.1...v1.23.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@k8s-ci-robot
Merge pull request #3008 from Kavinjsir/docs/external-plugin
8dfecb9 
📖  docs: supplement plugin creation
@k8s-ci-robot
Merge pull request #3053 from kubernetes-sigs/dependabot/go_modules/g…
15bd05e 
…ithub.com/onsi/gomega-1.23.0

🌱 Bump github.com/onsi/gomega from 1.22.1 to 1.23.0
@dependabot
Bump github.com/onsi/gomega from 1.23.0 to 1.24.0
3b6ec86 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@k8s-ci-robot
Merge pull request #3064 from kubernetes-sigs/dependabot/go_modules/g…
59a59ba 
…ithub.com/onsi/gomega-1.24.0

🌱 Bump github.com/onsi/gomega from 1.23.0 to 1.24.0
@dependabot
Bump github.com/onsi/ginkgo/v2 from 2.4.0 to 2.5.0
f59d6c3 
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@k8s-ci-robot
Merge pull request #3063 from kubernetes-sigs/dependabot/go_modules/g…
6f1f8c4 
…ithub.com/onsi/ginkgo/v2-2.5.0

🌱 Bump github.com/onsi/ginkgo/v2 from 2.4.0 to 2.5.0
@dependabot
Bump github.com/spf13/afero from 1.9.2 to 1.9.3
39443ab 
Bumps [github.com/spf13/afero](https://github.com/spf13/afero) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/spf13/afero/releases)
- [Commits](spf13/afero@v1.9.2...v1.9.3)

---
updated-dependencies:
- dependency-name: github.com/spf13/afero
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Bump golang.org/x/tools from 0.2.0 to 0.3.0
7036a6b 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@k8s-ci-robot
Merge pull request #3070 from kubernetes-sigs/dependabot/go_modules/g…
fc538cf 
…ithub.com/spf13/afero-1.9.3

🌱 Bump github.com/spf13/afero from 1.9.2 to 1.9.3
@k8s-ci-robot
Merge pull request #3071 from kubernetes-sigs/dependabot/go_modules/g…
766db4a 
…olang.org/x/tools-0.3.0

🌱 Bump golang.org/x/tools from 0.2.0 to 0.3.0
@dependabot
Bump github.com/onsi/gomega from 1.24.0 to 1.24.1
4e2983a 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.24.0 to 1.24.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.24.0...v1.24.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@ebiiim
fix typo in Makefile
2ea935f
@k8s-ci-robot
Merge pull request #3072 from kubernetes-sigs/dependabot/go_modules/g…
e41da7e 
…ithub.com/onsi/gomega-1.24.1

🌱 : Bump github.com/onsi/gomega from 1.24.0 to 1.24.1
@k8s-ci-robot
Merge pull request #3073 from ebiiim/fix-typo
bff13b2 
🐛 fix a minor typo in Makefile
@coriaedu
✨ add version check for makefile template tools (#3077)
6cbdc16 
* add version check for makefile template tools

Prevent running controller-gen and kustomize commands with a version that does
not match the one specified in the corresponding CONTROLLER_TOOLS_VERSION or 
KUSTOMIZE_VERSION vars

Addresses #3068

* Update makefile target descriptions

* Updated descriptions for `kustomize` and `controller-gen` targets.
* Reformatted `controller-gen` recipe to reduce line length

Signed-off-by: Eduardo Coria <[email protected]>

* update makefile samples

Signed-off-by: Eduardo Coria <[email protected]>

Signed-off-by: Eduardo Coria <[email protected]>
@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 21, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 21, 2023
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Apr 21, 2023 •
edited
Loading

CLA Missing ID CLA Not Signed

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 21, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 21, 2023
@k8s-ci-robot
Copy link
Contributor

Keywords which can automatically close issues and at(@) or hashtag(#) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@camilamacedo86
Copy link
Member Author

/easycla

@camilamacedo86
Copy link
Member Author

The errors with the CLA are a bug since we can check that those commits were merged previously against a master branch and successfully passed in the CLA check. I raised a ticket tracking the bug https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/SUPPORT-17860 so that we can move forward and not be blocked within.

@camilamacedo86
Copy link
Member Author

camilamacedo86 commented Apr 21, 2023 •
edited
Loading

Moving forward, we will be able to fix the book-v3/prod docs asap since the docs fixed are those most required to be checked for the changes addressed in the latest release, 3.10.0. Therefore, it is good we have it fixed as soon as possible not to affect the end-users. (To avoid confusion and mistakes)

@camilamacedo86 camilamacedo86 added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. labels Apr 21, 2023
@camilamacedo86
Copy link
Member Author

/easycla

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 21, 2023
@camilamacedo86
Copy link
Member Author

/skip easycla

@camilamacedo86 camilamacedo86 added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 21, 2023
@camilamacedo86 camilamacedo86 merged commit 315e90f into book-v3 Apr 21, 2023
@camilamacedo86 camilamacedo86 deleted the release-3.10-resolved-conflicts-book-v3 branch April 21, 2023 09:40
@jarias-lfx jarias-lfx mentioned this pull request Apr 21, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@everettraven everettraven Awaiting requested review from everettraven

@jmrodri jmrodri Awaiting requested review from jmrodri

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.