Skip to content

[release-1.31] Use UInt32Value for min_cluster_size to fix client-go JSON apply #3755

Description

@istio-testing

Manual cherrypick required.

#3754 failed to apply on top of branch "release-1.31":

Applying: Use UInt32Value for min_cluster_size to fix client-go JSON apply
Using index info to reconstruct a base tree...
M	kubernetes/customresourcedefinitions.gen.yaml
M	networking/v1alpha3/destination_rule.pb.go
M	networking/v1alpha3/destination_rule.pb.html
M	networking/v1alpha3/destination_rule.proto
Falling back to patching base and 3-way merge...
Auto-merging networking/v1alpha3/destination_rule.proto
Auto-merging networking/v1alpha3/destination_rule.pb.html
Auto-merging networking/v1alpha3/destination_rule.pb.go
CONFLICT (content): Merge conflict in networking/v1alpha3/destination_rule.pb.go
Auto-merging kubernetes/customresourcedefinitions.gen.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Use UInt32Value for min_cluster_size to fix client-go JSON apply

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions