Merge pull request #125809 from aojea/cloud_hostname
add unit tests for hostname node.status.addresses
This commit is contained in:
		@@ -53,6 +53,154 @@ func Test_syncNode(t *testing.T) {
 | 
			
		||||
		updatedNode  *v1.Node
 | 
			
		||||
		expectedErr  bool
 | 
			
		||||
	}{
 | 
			
		||||
		{
 | 
			
		||||
			name: "node initialized with hostname",
 | 
			
		||||
			fakeCloud: &fakecloud.Cloud{
 | 
			
		||||
				EnableInstancesV2: false,
 | 
			
		||||
				InstanceTypes: map[types.NodeName]string{
 | 
			
		||||
					types.NodeName("node0"): "t1.micro",
 | 
			
		||||
				},
 | 
			
		||||
				ExtID: map[types.NodeName]string{
 | 
			
		||||
					types.NodeName("node0"): "12345",
 | 
			
		||||
				},
 | 
			
		||||
				Addresses: []v1.NodeAddress{
 | 
			
		||||
					{
 | 
			
		||||
						Type:    v1.NodeHostName,
 | 
			
		||||
						Address: "node0.cloud.internal",
 | 
			
		||||
					},
 | 
			
		||||
					{
 | 
			
		||||
						Type:    v1.NodeInternalIP,
 | 
			
		||||
						Address: "10.0.0.1",
 | 
			
		||||
					},
 | 
			
		||||
					{
 | 
			
		||||
						Type:    v1.NodeExternalIP,
 | 
			
		||||
						Address: "132.143.154.163",
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
				ErrByProviderID: nil,
 | 
			
		||||
				Err:             nil,
 | 
			
		||||
			},
 | 
			
		||||
			existingNode: &v1.Node{
 | 
			
		||||
				ObjectMeta: metav1.ObjectMeta{
 | 
			
		||||
					Name:              "node0",
 | 
			
		||||
					CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC),
 | 
			
		||||
				},
 | 
			
		||||
				Spec: v1.NodeSpec{
 | 
			
		||||
					Taints: []v1.Taint{
 | 
			
		||||
						{
 | 
			
		||||
							Key:    cloudproviderapi.TaintExternalCloudProvider,
 | 
			
		||||
							Value:  "true",
 | 
			
		||||
							Effect: v1.TaintEffectNoSchedule,
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
				Status: v1.NodeStatus{
 | 
			
		||||
					Addresses: []v1.NodeAddress{
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeHostName,
 | 
			
		||||
							Address: "nodeoverriden",
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
			updatedNode: &v1.Node{
 | 
			
		||||
				ObjectMeta: metav1.ObjectMeta{
 | 
			
		||||
					Name:              "node0",
 | 
			
		||||
					CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC),
 | 
			
		||||
				},
 | 
			
		||||
				Spec: v1.NodeSpec{
 | 
			
		||||
					ProviderID: "fake://12345",
 | 
			
		||||
				},
 | 
			
		||||
				Status: v1.NodeStatus{
 | 
			
		||||
					Addresses: []v1.NodeAddress{
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeHostName,
 | 
			
		||||
							Address: "node0.cloud.internal",
 | 
			
		||||
						},
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeInternalIP,
 | 
			
		||||
							Address: "10.0.0.1",
 | 
			
		||||
						},
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeExternalIP,
 | 
			
		||||
							Address: "132.143.154.163",
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			name: "node initialized with hostname and cloud provider missing hostname",
 | 
			
		||||
			fakeCloud: &fakecloud.Cloud{
 | 
			
		||||
				EnableInstancesV2: false,
 | 
			
		||||
				InstanceTypes: map[types.NodeName]string{
 | 
			
		||||
					types.NodeName("node0"): "t1.micro",
 | 
			
		||||
				},
 | 
			
		||||
				ExtID: map[types.NodeName]string{
 | 
			
		||||
					types.NodeName("node0"): "12345",
 | 
			
		||||
				},
 | 
			
		||||
				Addresses: []v1.NodeAddress{
 | 
			
		||||
					{
 | 
			
		||||
						Type:    v1.NodeInternalIP,
 | 
			
		||||
						Address: "10.0.0.1",
 | 
			
		||||
					},
 | 
			
		||||
					{
 | 
			
		||||
						Type:    v1.NodeExternalIP,
 | 
			
		||||
						Address: "132.143.154.163",
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
				ErrByProviderID: nil,
 | 
			
		||||
				Err:             nil,
 | 
			
		||||
			},
 | 
			
		||||
			existingNode: &v1.Node{
 | 
			
		||||
				ObjectMeta: metav1.ObjectMeta{
 | 
			
		||||
					Name:              "node0",
 | 
			
		||||
					CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC),
 | 
			
		||||
				},
 | 
			
		||||
				Spec: v1.NodeSpec{
 | 
			
		||||
					Taints: []v1.Taint{
 | 
			
		||||
						{
 | 
			
		||||
							Key:    cloudproviderapi.TaintExternalCloudProvider,
 | 
			
		||||
							Value:  "true",
 | 
			
		||||
							Effect: v1.TaintEffectNoSchedule,
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
				Status: v1.NodeStatus{
 | 
			
		||||
					Addresses: []v1.NodeAddress{
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeHostName,
 | 
			
		||||
							Address: "nodeoverriden",
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
			updatedNode: &v1.Node{
 | 
			
		||||
				ObjectMeta: metav1.ObjectMeta{
 | 
			
		||||
					Name:              "node0",
 | 
			
		||||
					CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC),
 | 
			
		||||
				},
 | 
			
		||||
				Spec: v1.NodeSpec{
 | 
			
		||||
					ProviderID: "fake://12345",
 | 
			
		||||
				},
 | 
			
		||||
				Status: v1.NodeStatus{
 | 
			
		||||
					Addresses: []v1.NodeAddress{
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeInternalIP,
 | 
			
		||||
							Address: "10.0.0.1",
 | 
			
		||||
						},
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeExternalIP,
 | 
			
		||||
							Address: "132.143.154.163",
 | 
			
		||||
						},
 | 
			
		||||
						{
 | 
			
		||||
							Type:    v1.NodeHostName,
 | 
			
		||||
							Address: "nodeoverriden",
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			name: "node initialized with provider ID",
 | 
			
		||||
			fakeCloud: &fakecloud.Cloud{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user