Skip to content

CNI: Add missing fields#21421

Merged
istio-testing merged 1 commit intoistio:masterfrom
jwendell:add-cni-fields
Feb 24, 2020
Merged

CNI: Add missing fields#21421
istio-testing merged 1 commit intoistio:masterfrom
jwendell:add-cni-fields

Conversation

@jwendell
Copy link
Copy Markdown
Member

In some CNI vendors those fields are mandatory.

In some CNI vendors those fields are mandatory.
@jwendell jwendell requested a review from a team as a code owner February 24, 2020 19:01
@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 Feb 24, 2020
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 24, 2020
@istio-testing istio-testing merged commit a943e0a into istio:master Feb 24, 2020
@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #21421 failed to apply on top of branch "release-1.5":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	operator/cmd/mesh/testdata/manifest-generate/output/component_hub_tag.golden.yaml
M	operator/pkg/vfs/assets.gen.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/vfs/assets.gen.go
CONFLICT (content): Merge conflict in operator/pkg/vfs/assets.gen.go
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/component_hub_tag.yaml
Patch failed at 0001 CNI: Add missing fields

jwendell added a commit to jwendell/istio that referenced this pull request Feb 24, 2020
In some CNI vendors those fields are mandatory.

Manual cherry-pick of istio#21421
istio-testing pushed a commit that referenced this pull request Feb 25, 2020
In some CNI vendors those fields are mandatory.

Manual cherry-pick of #21421
istio-testing pushed a commit to istio/installer that referenced this pull request Apr 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

5 participants