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

[release-1.6] Add k8s field to base component #1487

Closed
istio-testing opened this issue Jun 27, 2020 · 0 comments
Closed

[release-1.6] Add k8s field to base component #1487

istio-testing opened this issue Jun 27, 2020 · 0 comments
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#1465 failed to apply on top of branch "release-1.6":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	operator/v1alpha1/istio.operator.v1alpha1.pb.html
M	operator/v1alpha1/operator.pb.go
M	operator/v1alpha1/operator.proto
M	python/istio_api/operator/v1alpha1/operator_pb2.py
Falling back to patching base and 3-way merge...
Auto-merging python/istio_api/operator/v1alpha1/operator_pb2.py
CONFLICT (content): Merge conflict in python/istio_api/operator/v1alpha1/operator_pb2.py
Auto-merging operator/v1alpha1/operator.proto
CONFLICT (content): Merge conflict in operator/v1alpha1/operator.proto
Auto-merging operator/v1alpha1/operator.pb.go
CONFLICT (content): Merge conflict in operator/v1alpha1/operator.pb.go
Auto-merging operator/v1alpha1/istio.operator.v1alpha1.pb.html
Patch failed at 0001 Add k8s field to base component

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants