Closed luksa closed 2 months ago
/test integ-helm-2-5
/retest
/retest
/retest
/retest
/retest
/test maistra-istio-unit-2-5
In response to a cherrypick label: #1022 failed to apply on top of branch "maistra-2.6":
Applying: OSSM-6615 Make sure IOR ignores services without selectors
Using index info to reconstruct a base tree...
M pilot/pkg/config/kube/ior/controller.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/config/kube/ior/controller.go
Applying: Add test
Using index info to reconstruct a base tree...
M pilot/pkg/config/kube/ior/ior_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/config/kube/ior/ior_test.go
CONFLICT (content): Merge conflict in pilot/pkg/config/kube/ior/ior_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Add test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
IOR finds a matching service for a pod by checking each service's label selector. However, this also matches services with an empty selector, which is wrong. These services should be ignored by IOR since an empty label selector indicates that the service endpoints are managed externally and not that the service should match all pods.