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

Add k8s field to base component #1465

Merged
merged 1 commit into from
Jun 9, 2020
Merged

Add k8s field to base component #1465

merged 1 commit into from
Jun 9, 2020

Conversation

ostromart
Copy link
Contributor

Part of the fix for istio/istio#24476.

@istio-policy-bot
Copy link

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Jun 9, 2020
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 9, 2020
@istio-testing istio-testing merged commit 2f6a9b1 into istio:master Jun 9, 2020
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #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

@istio-testing istio-testing mentioned this pull request Jun 27, 2020
Closed
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1487

ostromart added a commit to ostromart/api that referenced this pull request Jun 29, 2020
@ostromart
Add k8s field to base component (istio#1465)
16809fc
@ostromart ostromart mentioned this pull request Jun 29, 2020
Merged
istio-testing pushed a commit that referenced this pull request Jun 30, 2020
@ostromart
Add k8s field to base component (#1465) (#1491)
5ffa410
@galindro galindro mentioned this pull request Sep 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardwxn richardwxn richardwxn approved these changes

@smawson smawson smawson approved these changes

@dcberg dcberg Awaiting requested review from dcberg

@duderino duderino Awaiting requested review from duderino

@linsun linsun Awaiting requested review from linsun

@louiscryan louiscryan Awaiting requested review from louiscryan

@rshriram rshriram Awaiting requested review from rshriram

Assignees
No one assigned
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ostromart @istio-policy-bot @istio-testing @smawson @richardwxn @googlebot @morvencao