mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-16 06:32:32 +00:00
Node addresses
This commit is contained in:
@@ -121,13 +121,6 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, boo
|
||||
return nil, false, err
|
||||
}
|
||||
|
||||
// This is hacky, but minion HostIP has been moved from spec to status since v1beta2. When updating
|
||||
// minion from older client, HostIP will be lost. Fix it here temporarily until we strip out status
|
||||
// info from user input.
|
||||
if minion.Status.HostIP == "" {
|
||||
minion.Status.HostIP = oldMinion.Status.HostIP
|
||||
}
|
||||
|
||||
if errs := validation.ValidateMinionUpdate(oldMinion, minion); len(errs) > 0 {
|
||||
return nil, false, kerrors.NewInvalid("minion", minion.Name, errs)
|
||||
}
|
||||
|
@@ -121,7 +121,9 @@ func TestMinionRegistryValidatesCreate(t *testing.T) {
|
||||
Labels: validSelector,
|
||||
},
|
||||
Status: api.NodeStatus{
|
||||
HostIP: "something",
|
||||
Addresses: []api.NodeAddress{
|
||||
{Type: api.NodeLegacyHostIP, Address: "something"},
|
||||
},
|
||||
},
|
||||
},
|
||||
"invalid-labels": {
|
||||
@@ -158,7 +160,9 @@ func TestCreate(t *testing.T) {
|
||||
// valid
|
||||
&api.Node{
|
||||
Status: api.NodeStatus{
|
||||
HostIP: "something",
|
||||
Addresses: []api.NodeAddress{
|
||||
{Type: api.NodeLegacyHostIP, Address: "something"},
|
||||
},
|
||||
},
|
||||
},
|
||||
// invalid
|
||||
|
Reference in New Issue
Block a user