✨ (kustomize/v2) Remove deprecated syntax usage by replacing patchesStrategicMerge with patches

[Sajiyah-Salat]

Fixes #3372

See that the default scaffolds:

Warning:
'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run
"kustomize edit fix' to update
your Kustomization automatically.

Therefore I replaced patchesStrategicMerge by patches in the kustomize/v2 templates code.

[Sajiyah-Salat]

I have run make generate. why its failing?

[NikhilSharmaWe]

@Sajiyah-Salat Try to make this change again in an up-to-date branch (upstream/master) and run make generate. After running make generate you will see that these files are also updated:

• docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml
• pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go
• testdata/project-v4-config/config/crd/kustomization.yaml
• testdata/project-v4-declarative-v1/config/crd/kustomization.yaml
• testdata/project-v4-multigroup/config/crd/kustomization.yaml
• testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml
• testdata/project-v4/config/crd/kustomization.yaml

then commit the changes.

Not sure why oryxBuildBinary is added, so lets try it again.

[NikhilSharmaWe]

@Sajiyah-Salat It seems fine now.
Could you please squash the commits?

[Sajiyah-Salat]

$git push
To https://github.com/Sajiyah-Salat/kubebuilder.git
 ! [rejected]          sajiyah#3372 -> sajiyah#3372 (non-fast-forward)
error: failed to push some refs to 'https://github.com/Sajiyah-Salat/kubebuilder.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

squashing always comes with frustration. I have squashed the commits. i have tried pulling as well. still its giving the following error

[NikhilSharmaWe]

@Sajiyah-Salat This might be because your local branch is not up to date with the origin branch.

Try this:

1. git fetch origin
2. git reset --hard origin/sajiyah#3372
3. git reset commitID-of-last-commit-before-yours
4. git add .
5. git commit -m "patchesStrategicMerge to patches"

[NikhilSharmaWe]

/approve

[camilamacedo86]

Thank you for your contribution.

• Please, remove oryxBuildBinary
• Also, after the change in the boilerplate, the samples under testdata and docs should be automatically updated by running make generate
• Also, we have a standard for the titles because they will be used to generate the release notes. So, in this case I am changing the title of this PR accordingly so that you can better check it and I hope that you do not mind.

Note Details about this review: https://github.com/kubernetes-sigs/kubebuilder/pull/3374/files#r1181174158

Please, ensure that you read the Contributing to know how to contribute with the project. Also, feel free to contribute to this doc if you see that it is missing or has outdated info.

[camilamacedo86]

That is great 🥇
Thank you for the contribution 🚀

See that testdata CI is falling because it seems that docs are not successfully update.
Note that:

• You must to run make generate after you do the changes
• You must have in your local environment your fork cloned in the same module path as described here in the contributing guide : https://github.com/kubernetes-sigs/kubebuilder/blob/master/CONTRIBUTING.md#how-to-build-kubebuilder-locally . So that when you run make install a binary build from the source code will be added to your GOPATH/bin and when you run make generate it will regenerate the samples under testdata and docs samples using it.

Also, ensure that you have your branch updated (rebased) with the master.

Missing properly update the testdata

[Sajiyah-Salat]

The mistake I did is I deleted oryxBuildBinary and directly pushed it to branch without running make generate. Now when I run make generate and git status it says everything is upto date. What to do?
About the env: I use codespaces if needed as my most of the work is in docs part.

[lauchokyip]

@Sajiyah-Salat This might be because your local branch is not up to date with the origin branch.

Try this:

1. git fetch origin
2. git reset --hard origin/sajiyah#3372
3. git reset commitID-of-last-commit-before-yours
4. git add .
5. git commit -m "patchesStrategicMerge to patches"

@NikhilSharmaWe git reset --hard is not a good practice and should be avoided because it will erase your local history
@Sajiyah-Salat Please checkout this guide to learn about Git Workflow (https://www.kubernetes.dev/docs/guide/github-workflow/)

[NikhilSharmaWe]

@lauchokyip Yes, I understand that but just wanted @Sajiyah-Salat to make the correct changes with simplicity, just for this case.

[Sajiyah-Salat]

I think the tests have some issues. I have run make generate. Following files suggested by @NikhilSharmaWe Changed as well. Still its failing. Why?

[camilamacedo86]

HI @Sajiyah-Salat,

Did you have your branch rebased with master?
Can you try:

1 _ update the master branch

$ git checkout master
$ git pull upstream master # I do not know how did you set the git to looking for the remote source. I use upstream

2 - rebase with your branch

$ git checkout
$ git rebase master

3 - run make install # It will ensure that you have the bin with the source code changes
4 - run make generate # It will generate the samples under testdata and docs

[camilamacedo86]

Great @Sajiyah-Salat !!!!

/approved
/lgtm

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, NikhilSharmaWe, Sajiyah-Salat

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:

• OWNERS [camilamacedo86]

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

[Sajiyah-Salat]

wooh.... after a long time. Thank you for guiding me through out.