Skip to content
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.

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

chore: remove Apache license header from generated files (backport #5565) #5616

Merged
merged 4 commits into from
Jan 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2023

This is an automatic backport of pull request #5565 done by Mergify.
Cherry-pick of fdac0e2 has failed:

On branch mergify/bp/release-2.0/pr-5565
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit fdac0e281.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   mk/generate.mk
	deleted:    tools/policy-gen/boilerplate.go.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   api/common/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/donothingpolicy/api/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/donothingpolicy/k8s/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshaccesslog/api/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshaccesslog/k8s/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshcircuitbreaker/k8s/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshhealthcheck/api/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshhealthcheck/k8s/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshratelimit/api/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshratelimit/k8s/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshretry/api/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshretry/k8s/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshtimeout/api/v1alpha1/zz_generated.deepcopy.go
	deleted by us:   pkg/plugins/policies/meshtimeout/k8s/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshtrace/api/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshtrace/k8s/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/policies/meshtrafficpermission/k8s/v1alpha1/zz_generated.deepcopy.go
	both modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/zz_generated.deepcopy.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Mike Beaumont <[email protected]>
(cherry picked from commit fdac0e2)

# Conflicts:
#	api/common/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/donothingpolicy/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/donothingpolicy/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshaccesslog/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshaccesslog/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshcircuitbreaker/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshhealthcheck/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshhealthcheck/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshratelimit/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshratelimit/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshretry/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshretry/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtimeout/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtimeout/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtrace/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtrace/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/policies/meshtrafficpermission/k8s/v1alpha1/zz_generated.deepcopy.go
#	pkg/plugins/resources/k8s/native/api/v1alpha1/zz_generated.deepcopy.go
@mergify mergify bot requested a review from a team as a code owner January 9, 2023 15:01
@mergify mergify bot added the conflicts label Jan 9, 2023
Copy link
Contributor

@michaelbeaumont michaelbeaumont left a comment

Choose a reason for hiding this comment

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

This also has the changes to go in it it looks like

@lukidzi lukidzi force-pushed the mergify/bp/release-2.0/pr-5565 branch from 44d8fa8 to ff64134 Compare January 10, 2023 11:21
@lukidzi
Copy link
Contributor

lukidzi commented Jan 10, 2023

This also has the changes to go in it it looks like

Without upgrading golang check step fails. CircleCI is attaching the wrong cache with kuma tools and it won't pass

@michaelbeaumont michaelbeaumont merged commit 076d564 into release-2.0 Jan 10, 2023
@michaelbeaumont michaelbeaumont deleted the mergify/bp/release-2.0/pr-5565 branch January 10, 2023 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants