mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	fix vet error in pkg/controller/route/route_controller_test.go
pkg/controller/route/route_controller_test.go:101: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:102: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:105: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:106: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:118: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:121: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:122: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:135: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:136: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:148: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:149: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:150: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:151: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:154: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:155: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:167: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:168: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:171: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:172: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:185: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:197: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:198: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:199: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:202: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:203: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:215: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:216: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:217: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:220: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:221: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields pkg/controller/route/route_controller_test.go:222: *k8s.io/kubernetes/vendor/k8s.io/cloud-provider.Route composite literal uses unkeyed fields
This commit is contained in:
		@@ -98,12 +98,12 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -115,11 +115,11 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -132,8 +132,8 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{},
 | 
								initialRoutes: []*cloudprovider.Route{},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -145,14 +145,14 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-03", "node-3", "10.120.2.0/24", false},
 | 
									{Name: cluster + "-03", TargetNode: "node-3", DestinationCIDR: "10.120.2.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-04", "node-4", "10.120.3.0/24", false},
 | 
									{Name: cluster + "-04", TargetNode: "node-4", DestinationCIDR: "10.120.3.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -164,12 +164,12 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-03", "node-3", "10.120.2.0/24", false},
 | 
									{Name: cluster + "-03", TargetNode: "node-3", DestinationCIDR: "10.120.2.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -182,7 +182,7 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{},
 | 
								initialRoutes: []*cloudprovider.Route{},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, false},
 | 
								expectedNetworkUnavailable: []bool{true, false},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, nodeNoCidr}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, nodeNoCidr}}),
 | 
				
			||||||
@@ -194,13 +194,13 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-03", "", "10.120.2.0/24", true},
 | 
									{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.120.2.0/24", Blackhole: true},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
@@ -212,14 +212,14 @@ func TestReconcile(t *testing.T) {
 | 
				
			|||||||
				&node2,
 | 
									&node2,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			initialRoutes: []*cloudprovider.Route{
 | 
								initialRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-03", "", "10.1.2.0/24", true},
 | 
									{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.1.2.0/24", Blackhole: true},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedRoutes: []*cloudprovider.Route{
 | 
								expectedRoutes: []*cloudprovider.Route{
 | 
				
			||||||
				{cluster + "-01", "node-1", "10.120.0.0/24", false},
 | 
									{Name: cluster + "-01", TargetNode: "node-1", DestinationCIDR: "10.120.0.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-02", "node-2", "10.120.1.0/24", false},
 | 
									{Name: cluster + "-02", TargetNode: "node-2", DestinationCIDR: "10.120.1.0/24", Blackhole: false},
 | 
				
			||||||
				{cluster + "-03", "", "10.1.2.0/24", true},
 | 
									{Name: cluster + "-03", TargetNode: "", DestinationCIDR: "10.1.2.0/24", Blackhole: true},
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			expectedNetworkUnavailable: []bool{true, true},
 | 
								expectedNetworkUnavailable: []bool{true, true},
 | 
				
			||||||
			clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
								clientset:                  fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{node1, node2}}),
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user