892942af8f
There are three values that uniquely identify a pod on a host - the configuration source (etcd, file, http), the pod name, and the pod namespace. This change ensures that configuration properly makes those names unique by changing podFullName to contain both name (currently ID in v1beta1, Name in v1beta3) and namespace. The Kubelet does not properly handle information requests for pods not in the default namespace at this time.
312 lines
9.3 KiB
Go
312 lines
9.3 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"sync"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
apierrs "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/config"
|
|
"github.com/golang/glog"
|
|
)
|
|
|
|
// PodConfigNotificationMode describes how changes are sent to the update channel.
|
|
type PodConfigNotificationMode int
|
|
|
|
const (
|
|
// PodConfigNotificationSnapshot delivers the full configuration as a SET whenever
|
|
// any change occurs.
|
|
PodConfigNotificationSnapshot = iota
|
|
// PodConfigNotificationSnapshotAndUpdates delivers an UPDATE message whenever pods are
|
|
// changed, and a SET message if there are any additions or removals.
|
|
PodConfigNotificationSnapshotAndUpdates
|
|
// PodConfigNotificationIncremental delivers ADD, UPDATE, and REMOVE to the update channel.
|
|
PodConfigNotificationIncremental
|
|
)
|
|
|
|
// PodConfig is a configuration mux that merges many sources of pod configuration into a single
|
|
// consistent structure, and then delivers incremental change notifications to listeners
|
|
// in order.
|
|
type PodConfig struct {
|
|
pods *podStorage
|
|
mux *config.Mux
|
|
|
|
// the channel of denormalized changes passed to listeners
|
|
updates chan kubelet.PodUpdate
|
|
}
|
|
|
|
// NewPodConfig creates an object that can merge many configuration sources into a stream
|
|
// of normalized updates to a pod configuration.
|
|
func NewPodConfig(mode PodConfigNotificationMode) *PodConfig {
|
|
updates := make(chan kubelet.PodUpdate, 1)
|
|
storage := newPodStorage(updates, mode)
|
|
podConfig := &PodConfig{
|
|
pods: storage,
|
|
mux: config.NewMux(storage),
|
|
updates: updates,
|
|
}
|
|
return podConfig
|
|
}
|
|
|
|
// Channel creates or returns a config source channel. The channel
|
|
// only accepts PodUpdates
|
|
func (c *PodConfig) Channel(source string) chan<- interface{} {
|
|
return c.mux.Channel(source)
|
|
}
|
|
|
|
// Updates returns a channel of updates to the configuration, properly denormalized.
|
|
func (c *PodConfig) Updates() <-chan kubelet.PodUpdate {
|
|
return c.updates
|
|
}
|
|
|
|
// Sync requests the full configuration be delivered to the update channel.
|
|
func (c *PodConfig) Sync() {
|
|
c.pods.Sync()
|
|
}
|
|
|
|
// podStorage manages the current pod state at any point in time and ensures updates
|
|
// to the channel are delivered in order. Note that this object is an in-memory source of
|
|
// "truth" and on creation contains zero entries. Once all previously read sources are
|
|
// available, then this object should be considered authoritative.
|
|
type podStorage struct {
|
|
podLock sync.RWMutex
|
|
// map of source name to pod name to pod reference
|
|
pods map[string]map[string]*api.BoundPod
|
|
mode PodConfigNotificationMode
|
|
|
|
// ensures that updates are delivered in strict order
|
|
// on the updates channel
|
|
updateLock sync.Mutex
|
|
updates chan<- kubelet.PodUpdate
|
|
}
|
|
|
|
// TODO: PodConfigNotificationMode could be handled by a listener to the updates channel
|
|
// in the future, especially with multiple listeners.
|
|
// TODO: allow initialization of the current state of the store with snapshotted version.
|
|
func newPodStorage(updates chan<- kubelet.PodUpdate, mode PodConfigNotificationMode) *podStorage {
|
|
return &podStorage{
|
|
pods: make(map[string]map[string]*api.BoundPod),
|
|
mode: mode,
|
|
updates: updates,
|
|
}
|
|
}
|
|
|
|
// Merge normalizes a set of incoming changes from different sources into a map of all Pods
|
|
// and ensures that redundant changes are filtered out, and then pushes zero or more minimal
|
|
// updates onto the update channel. Ensures that updates are delivered in order.
|
|
func (s *podStorage) Merge(source string, change interface{}) error {
|
|
s.updateLock.Lock()
|
|
defer s.updateLock.Unlock()
|
|
|
|
adds, updates, deletes := s.merge(source, change)
|
|
|
|
// deliver update notifications
|
|
switch s.mode {
|
|
case PodConfigNotificationIncremental:
|
|
if len(deletes.Pods) > 0 {
|
|
s.updates <- *deletes
|
|
}
|
|
if len(adds.Pods) > 0 {
|
|
s.updates <- *adds
|
|
}
|
|
if len(updates.Pods) > 0 {
|
|
s.updates <- *updates
|
|
}
|
|
|
|
case PodConfigNotificationSnapshotAndUpdates:
|
|
if len(updates.Pods) > 0 {
|
|
s.updates <- *updates
|
|
}
|
|
if len(deletes.Pods) > 0 || len(adds.Pods) > 0 {
|
|
s.updates <- kubelet.PodUpdate{s.MergedState().([]api.BoundPod), kubelet.SET}
|
|
}
|
|
|
|
case PodConfigNotificationSnapshot:
|
|
if len(updates.Pods) > 0 || len(deletes.Pods) > 0 || len(adds.Pods) > 0 {
|
|
s.updates <- kubelet.PodUpdate{s.MergedState().([]api.BoundPod), kubelet.SET}
|
|
}
|
|
|
|
default:
|
|
panic(fmt.Sprintf("unsupported PodConfigNotificationMode: %#v", s.mode))
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (s *podStorage) merge(source string, change interface{}) (adds, updates, deletes *kubelet.PodUpdate) {
|
|
s.podLock.Lock()
|
|
defer s.podLock.Unlock()
|
|
|
|
adds = &kubelet.PodUpdate{Op: kubelet.ADD}
|
|
updates = &kubelet.PodUpdate{Op: kubelet.UPDATE}
|
|
deletes = &kubelet.PodUpdate{Op: kubelet.REMOVE}
|
|
|
|
pods := s.pods[source]
|
|
if pods == nil {
|
|
pods = make(map[string]*api.BoundPod)
|
|
}
|
|
|
|
update := change.(kubelet.PodUpdate)
|
|
switch update.Op {
|
|
case kubelet.ADD, kubelet.UPDATE:
|
|
if update.Op == kubelet.ADD {
|
|
glog.V(4).Infof("Adding new pods from source %s : %v", source, update.Pods)
|
|
} else {
|
|
glog.V(4).Infof("Updating pods from source %s : %v", source, update.Pods)
|
|
}
|
|
|
|
filtered := filterInvalidPods(update.Pods, source)
|
|
for _, ref := range filtered {
|
|
name := podUniqueName(ref)
|
|
if existing, found := pods[name]; found {
|
|
if !reflect.DeepEqual(existing.Spec, ref.Spec) {
|
|
// this is an update
|
|
existing.Spec = ref.Spec
|
|
updates.Pods = append(updates.Pods, *existing)
|
|
continue
|
|
}
|
|
// this is a no-op
|
|
continue
|
|
}
|
|
// this is an add
|
|
if ref.Annotations == nil {
|
|
ref.Annotations = make(map[string]string)
|
|
}
|
|
ref.Annotations[kubelet.ConfigSourceAnnotationKey] = source
|
|
pods[name] = ref
|
|
adds.Pods = append(adds.Pods, *ref)
|
|
}
|
|
|
|
case kubelet.REMOVE:
|
|
glog.V(4).Infof("Removing a pod %v", update)
|
|
for _, value := range update.Pods {
|
|
name := podUniqueName(&value)
|
|
if existing, found := pods[name]; found {
|
|
// this is a delete
|
|
delete(pods, name)
|
|
deletes.Pods = append(deletes.Pods, *existing)
|
|
continue
|
|
}
|
|
// this is a no-op
|
|
}
|
|
|
|
case kubelet.SET:
|
|
glog.V(4).Infof("Setting pods for source %s : %v", source, update)
|
|
// Clear the old map entries by just creating a new map
|
|
oldPods := pods
|
|
pods = make(map[string]*api.BoundPod)
|
|
|
|
filtered := filterInvalidPods(update.Pods, source)
|
|
for _, ref := range filtered {
|
|
name := podUniqueName(ref)
|
|
if existing, found := oldPods[name]; found {
|
|
pods[name] = existing
|
|
if !reflect.DeepEqual(existing.Spec, ref.Spec) {
|
|
// this is an update
|
|
existing.Spec = ref.Spec
|
|
updates.Pods = append(updates.Pods, *existing)
|
|
continue
|
|
}
|
|
// this is a no-op
|
|
continue
|
|
}
|
|
if ref.Annotations == nil {
|
|
ref.Annotations = make(map[string]string)
|
|
}
|
|
ref.Annotations[kubelet.ConfigSourceAnnotationKey] = source
|
|
pods[name] = ref
|
|
adds.Pods = append(adds.Pods, *ref)
|
|
}
|
|
|
|
for name, existing := range oldPods {
|
|
if _, found := pods[name]; !found {
|
|
// this is a delete
|
|
deletes.Pods = append(deletes.Pods, *existing)
|
|
}
|
|
}
|
|
|
|
default:
|
|
glog.Warningf("Received invalid update type: %v", update)
|
|
|
|
}
|
|
|
|
s.pods[source] = pods
|
|
return adds, updates, deletes
|
|
}
|
|
|
|
func filterInvalidPods(pods []api.BoundPod, source string) (filtered []*api.BoundPod) {
|
|
names := util.StringSet{}
|
|
for i := range pods {
|
|
var errors []error
|
|
name := podUniqueName(&pods[i])
|
|
if names.Has(name) {
|
|
errors = append(errors, apierrs.NewFieldDuplicate("name", pods[i].ID))
|
|
} else {
|
|
names.Insert(name)
|
|
}
|
|
if errs := validation.ValidateBoundPod(&pods[i]); len(errs) != 0 {
|
|
errors = append(errors, errs...)
|
|
}
|
|
if len(errors) > 0 {
|
|
glog.Warningf("Pod %d (%s) from %s failed validation, ignoring: %v", i+1, pods[i].ID, source, errors)
|
|
continue
|
|
}
|
|
filtered = append(filtered, &pods[i])
|
|
}
|
|
return
|
|
}
|
|
|
|
// Sync sends a copy of the current state through the update channel.
|
|
func (s *podStorage) Sync() {
|
|
s.updateLock.Lock()
|
|
defer s.updateLock.Unlock()
|
|
s.updates <- kubelet.PodUpdate{s.MergedState().([]api.BoundPod), kubelet.SET}
|
|
}
|
|
|
|
// Object implements config.Accessor
|
|
func (s *podStorage) MergedState() interface{} {
|
|
s.podLock.RLock()
|
|
defer s.podLock.RUnlock()
|
|
var pods []api.BoundPod
|
|
for _, sourcePods := range s.pods {
|
|
for _, podRef := range sourcePods {
|
|
pod, err := api.Scheme.Copy(podRef)
|
|
if err != nil {
|
|
glog.Errorf("unable to copy pod: %v", err)
|
|
}
|
|
pods = append(pods, *pod.(*api.BoundPod))
|
|
}
|
|
}
|
|
return pods
|
|
}
|
|
|
|
// podUniqueName returns a value for a given pod that is unique across a source,
|
|
// which is the combination of namespace and ID.
|
|
func podUniqueName(pod *api.BoundPod) string {
|
|
namespace := pod.Namespace
|
|
if len(namespace) == 0 {
|
|
namespace = api.NamespaceDefault
|
|
}
|
|
return fmt.Sprintf("%s.%s", pod.ID, namespace)
|
|
}
|