This job view page is being replaced by Spyglass soon. Check out the new job view.
PRrikatz: Fix IngressClass logic for newer releases
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-18 19:45
Elapsed0.00s
Revision
Refs 7341

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/ingress-nginx at dev-v1(33bf063af0076e85387a2414ca1911436e02ae7f)
# Checking out pulls:
#	7341(75027b54ca8caaec85628d8abff06f8f024b042f)
$ mkdir -p /home/prow/go/src/k8s.io/ingress-nginx
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 200 lines ...
Removing internal/ingress/annotations/class/main.go
Auto-merging charts/ingress-nginx/values.yaml
Auto-merging charts/ingress-nginx/templates/controller-deployment.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/templates/controller-deployment.yaml
Auto-merging charts/ingress-nginx/templates/controller-daemonset.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/templates/controller-daemonset.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1