github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Validation of HostPorts and Manifest IDs

Browse Source 
Check that HostPorts are unique across the whole host and that Manifest IDs
are unique.
This commit is contained in:
Tim Hockin 2014-07-07 21:48:47 -07:00
parent ad88fa48a5
commit 2eb2784725
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/kubelet/kubelet.go
View File

@ -760,6 +760,20 @@ func (kl *Kubelet) SyncManifests(config []api.ContainerManifest) error {
return err return err
} }
// Check that all Port.HostPort values are unique across all manifests.
func checkHostPortConflicts(allManifests []api.ContainerManifest, newManifest *api.ContainerManifest) error {
allPorts := map[int]bool{}
extract := func(p *api.Port) int { return p.HostPort }
for i := range allManifests {
manifest := &allManifests[i]
err := api.AccumulateUniquePorts(manifest.Containers, allPorts, extract)
if err != nil {
return err
}
}
return api.AccumulateUniquePorts(newManifest.Containers, allPorts, extract)
}
// syncLoop is the main loop for processing changes. It watches for changes from // syncLoop is the main loop for processing changes. It watches for changes from
// four channels (file, etcd, server, and http) and creates a union of them. For // four channels (file, etcd, server, and http) and creates a union of them. For
// any new change seen, will run a sync against desired state and running state. If // any new change seen, will run a sync against desired state and running state. If
@ -777,14 +791,26 @@ func (kl *Kubelet) syncLoop(updateChannel <-chan manifestUpdate, handler SyncHan
} }
allManifests := []api.ContainerManifest{} allManifests := []api.ContainerManifest{}
allIds := util.StringSet{}
for src, srcManifests := range last { for src, srcManifests := range last {
for i := range srcManifests { for i := range srcManifests {
m := &srcManifests[i] m := &srcManifests[i]
if allIds.Has(m.ID) {
glog.Warningf("Manifest from %s has duplicate ID, ignoring: %v", src, m.ID)
continue
}
allIds.Insert(m.ID)
if err := api.ValidateManifest(m); err != nil { if err := api.ValidateManifest(m); err != nil {
glog.Warningf("Manifest from %s failed validation, ignoring: %v", src, err) glog.Warningf("Manifest from %s failed validation, ignoring: %v", src, err)
continue continue
} }
// Check for host-wide HostPort conflicts.
if err := checkHostPortConflicts(allManifests, m); err != nil {
glog.Warningf("Manifest from %s failed validation, ignoring: %v", src, err)
continue
}
} }
// TODO(thockin): There's no reason to collect manifests by value. Don't pessimize.
allManifests = append(allManifests, srcManifests...) allManifests = append(allManifests, srcManifests...)
} }

26
pkg/kubelet/kubelet_test.go
View File

@ -572,7 +572,32 @@ func TestMakePortsAndBindings(t *testing.T) {
} }
} }
} }
}
func TestCheckHostPortConflicts(t *testing.T) {
successCaseAll := []api.ContainerManifest{
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 80}}}}},
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 81}}}}},
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 82}}}}},
}
successCaseNew := api.ContainerManifest{
Containers: []api.Container{{Ports: []api.Port{{HostPort: 83}}}},
}
if err := checkHostPortConflicts(successCaseAll, &successCaseNew); err != nil {
t.Errorf("Expected success: %v", err)
}
failureCaseAll := []api.ContainerManifest{
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 80}}}}},
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 81}}}}},
{Containers: []api.Container{{Ports: []api.Port{{HostPort: 82}}}}},
}
failureCaseNew := api.ContainerManifest{
Containers: []api.Container{{Ports: []api.Port{{HostPort: 81}}}},
}
if err := checkHostPortConflicts(failureCaseAll, &failureCaseNew); err == nil {
t.Errorf("Expected failure")
}
} }
func TestExtractFromNonExistentFile(t *testing.T) { func TestExtractFromNonExistentFile(t *testing.T) {
@ -597,7 +622,6 @@ func TestExtractFromBadDataFile(t *testing.T) {
if err == nil { if err == nil {
t.Error("Unexpected non-error.") t.Error("Unexpected non-error.")
} }
} }
func TestExtractFromValidDataFile(t *testing.T) { func TestExtractFromValidDataFile(t *testing.T) {