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.
55 lines
1.8 KiB
Go
55 lines
1.8 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 kubelet
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
)
|
|
|
|
const ConfigSourceAnnotationKey = "kubernetes/config.source"
|
|
|
|
// PodOperation defines what changes will be made on a pod configuration.
|
|
type PodOperation int
|
|
|
|
const (
|
|
// This is the current pod configuration
|
|
SET PodOperation = iota
|
|
// Pods with the given ids are new to this source
|
|
ADD
|
|
// Pods with the given ids have been removed from this source
|
|
REMOVE
|
|
// Pods with the given ids have been updated in this source
|
|
UPDATE
|
|
)
|
|
|
|
// PodUpdate defines an operation sent on the channel. You can add or remove single services by
|
|
// sending an array of size one and Op == ADD|REMOVE (with REMOVE, only the ID is required).
|
|
// For setting the state of the system to a given state for this source configuration, set
|
|
// Pods as desired and Op to SET, which will reset the system state to that specified in this
|
|
// operation for this source channel. To remove all pods, set Pods to empty object and Op to SET.
|
|
type PodUpdate struct {
|
|
Pods []api.BoundPod
|
|
Op PodOperation
|
|
}
|
|
|
|
// GetPodFullName returns a name that uniquely identifies a pod across all config sources.
|
|
func GetPodFullName(pod *api.BoundPod) string {
|
|
return fmt.Sprintf("%s.%s.%s", pod.ID, pod.Namespace, pod.Annotations[ConfigSourceAnnotationKey])
|
|
}
|