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.

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

chore(*) generate DeepCopy interfaces (backport #2222) #2289

Merged
merged 1 commit into from
Jul 6, 2021
Merged

chore(*) generate DeepCopy interfaces (backport #2222) #2289

merged 1 commit into from
Jul 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 5, 2021

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

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

You are currently cherry-picking commit fb4d537c.
  (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:   pkg/plugins/resources/k8s/native/Makefile
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/circuitbreaker_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/circuitbreaker_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_insight_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_insight_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/externalservice_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/externalservice_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/faultinjection_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/faultinjection_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/healthcheck_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/healthcheck_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_insight_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_insight_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/proxytemplate_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/proxytemplate_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/ratelimit_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/ratelimit_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/retry_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/retry_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/service_insight_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/service_insight_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/suite_test.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/timeout_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/timeout_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/trafficlogging_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/trafficlogging_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/trafficpermission_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/trafficpermission_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/trafficroute_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/trafficroute_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/traffictrace_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/traffictrace_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/zone_ingress_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/zone_ingress_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/zone_insight_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/zone_insight_types_deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/api/v1alpha1/zone_types.go
	deleted:    pkg/plugins/resources/k8s/native/api/v1alpha1/zone_types_deepcopy.go
	new file:   pkg/plugins/resources/k8s/native/api/v1alpha1/zz_generated.deepcopy.go
	modified:   pkg/plugins/resources/k8s/native/hack/boilerplate.go.txt
	modified:   pkg/plugins/resources/k8s/native/pkg/model/resources.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mk/generate.mk

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify bot requested a review from a team as a code owner July 5, 2021 10:23
@mergify mergify bot added the conflicts label Jul 5, 2021
@jpeach
Copy link
Contributor

jpeach commented Jul 5, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 5, 2021

Command rebase: success

Branch has been successfully rebased

@bartsmykla bartsmykla force-pushed the mergify/bp/release-1.2/pr-2222 branch from 4f46935 to 6a225c8 Compare July 5, 2021 22:08
@jpeach
Copy link
Contributor

jpeach commented Jul 6, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 6, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

Rebasing (1/1)

error: could not apply 6a225c8... chore(*) generate DeepCopy interfaces (#2222)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a225c8... chore(*) generate DeepCopy interfaces (#2222)
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/zone_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/zone_insight_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/zone_ingress_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/traffictrace_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/trafficroute_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/trafficpermission_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/trafficlogging_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/timeout_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/service_insight_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/retry_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/ratelimit_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/proxytemplate_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/mesh_insight_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/healthcheck_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/faultinjection_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/externalservice_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/dataplane_insight_types_deepcopy.go
Removing pkg/plugins/resources/k8s/native/api/v1alpha1/circuitbreaker_types_deepcopy.go
Auto-merging mk/generate.mk
CONFLICT (content): Merge conflict in mk/generate.mk


err-code: 7B962

@jpeach
chore(*) generate DeepCopy interfaces (#2222)
22f3b75 
Enable DeepCopy interface generation for Kubernetes resources. This takes
advantage of the fact that if a type already implementes the DeepCopy
interface, deepcopy-gen will use it. This means that we can wrap the
raw protbuf message fields in a type that supports the interface and
then generate everything else.

This updates #2130.

Signed-off-by: James Peach <james.peach@konghq.com>
(cherry picked from commit fb4d537)
@jpeach jpeach force-pushed the mergify/bp/release-1.2/pr-2222 branch from 6a225c8 to 22f3b75 Compare July 6, 2021 00:24
@jpeach jpeach merged commit e33125a into release-1.2 Jul 6, 2021
@jpeach jpeach deleted the mergify/bp/release-1.2/pr-2222 branch July 6, 2021 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jpeach