Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Conversation

@cprivitere
Copy link
Contributor

What this PR does / why we need it:

  • Align version of kustomize to upstream cluster-api
  • Use upstream method to build kustomize with go install
  • Add yq to hack tools
  • Use yq to fix calico yaml formatting (this is the best upstream recommendation to fix kustomize yaml mangling)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # 709

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 26, 2024
@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 Jun 26, 2024
@cprivitere
Copy link
Contributor Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 27, 2024
- Align version of kustomize to upstream cluster-api
- Use upstream method to build kustomize with go install
- Add yq to hack tools
- Use yq to fix calico yaml formatting (this is the best upstream recommendation to fix kustomize yaml mangling)

Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com>
@cprivitere cprivitere force-pushed the cprivitere/issue709 branch from 60dc453 to dd5d715 Compare June 27, 2024 21:21
@cprivitere
Copy link
Contributor Author

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 27, 2024
@cprivitere
Copy link
Contributor Author

cprivitere commented Jun 27, 2024

Due to the change in the Makefile to add yq, the make verify test will fail. Please ignore it. See below

@cprivitere cprivitere requested a review from displague July 9, 2024 15:03
Copy link
Contributor

@displague displague left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 9, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cprivitere, displague

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 [cprivitere,displague]

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

@cprivitere cprivitere merged commit 7367492 into kubernetes-retired:main Jul 9, 2024
@cprivitere cprivitere deleted the cprivitere/issue709 branch July 9, 2024 18:50
@cprivitere
Copy link
Contributor Author

Due to the change in the Makefile to add yq, the make verify test will fail. Please ignore it.

This was incorrect, $(YQ) was missing from the make generate-templates line.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants