rebase 1.10.0

[liggitt]

Commit tracking of https://github.com/openshift/kubernetes/commits/origin-3.10-kubernetes-1.9.1 at https://docs.google.com/spreadsheets/d/11Dt-nmglDv5u5B9HDtMqyQBn6toMwFeD5dppCAuu5lg/edit#gid=0

[soltysh]

There's this error when running tests:

--- FAIL: TestDeleteEdges_locked (0.00s)
    --- FAIL: TestDeleteEdges_locked/edges_are_deleted,_non-orphans_and_destination_orphans_are_preserved (0.00s)
	Error Trace:	graph_test.go:152
    	Error:      	Not equal: 
    	            	expected: []graph.Node{(*node.namedVertex)(0xc420370210), (*node.namedVertex)(0xc4203701e0), (*node.namedVertex)(0xc4203702a0)}
    	            	actual: []graph.Node{(*node.namedVertex)(0xc420370030), (*node.namedVertex)(0xc420353f50), (*node.namedVertex)(0xc420353f80)}
    	            	
    	            	Diff:
    	            	--- Expected
    	            	+++ Actual
    	            	@@ -1,5 +1,5 @@
    	            	 ([]graph.Node) (len=3) {
    	            	- (*node.namedVertex)(node:node2),
    	            	+ (*node.namedVertex)(configmap:namespace1/configmap1),
    	            	  (*node.namedVertex)(node:node1),
    	            	- (*node.namedVertex)(configmap:namespace1/configmap1)
    	            	+ (*node.namedVertex)(node:node2)
    	            	 }
FAIL
FAIL	k8s.io/kubernetes/plugin/pkg/auth/authorizer/node	0.064s

[liggitt]

@soltysh not sure what branch you're looking at, but that's only on master (post-1.10), not in this branch...

[soltysh]

@liggitt I'll double check once again when I'm back later today. I swear I run it on the right branch 😉

[soltysh]

Yeah, I must have been building something completely different, but what worries me is that the current state is so tightly coupled with origin that it's impossible to build it and test it :/

[liggitt]

what worries me is that the current state is so tightly coupled with origin that it's impossible to build it and test it :/

not sure what you mean... I can run hack/local-up-cluster.sh and unit tests directly from this branch