f122fc94bf
GetServiceEnvironmentVariables (originally in pkg/registry/service/rest.go) is split into two parts: one that lists services, and one that turns a ServiceList into environment vars. This will allow a subsequent PR to add a call to the latter function with an existing ServiceList. The former part is moved into pkg/registry/pod/bound_pod_factory.go. The latter part is put in a new package, pkg/kubelet/envvars/envvars.go. The new package is under kubelet because the container enviroment is more associated with kubelet than with registry. Test code moved too.
62 lines
2.1 KiB
Go
62 lines
2.1 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 pod
|
|
|
|
import (
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/envvars"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service"
|
|
)
|
|
|
|
type BoundPodFactory interface {
|
|
// Make a container object for a given pod, given the machine that the pod is running on.
|
|
MakeBoundPod(machine string, pod *api.Pod) (*api.BoundPod, error)
|
|
}
|
|
|
|
type BasicBoundPodFactory struct {
|
|
// TODO: this should really point at the API rather than a registry
|
|
ServiceRegistry service.Registry
|
|
}
|
|
|
|
// getServiceEnvironmentVariables populates a list of environment variables that are use
|
|
// in the container environment to get access to services.
|
|
func getServiceEnvironmentVariables(ctx api.Context, registry service.Registry, machine string) ([]api.EnvVar, error) {
|
|
var result []api.EnvVar
|
|
services, err := registry.ListServices(ctx)
|
|
if err != nil {
|
|
return result, err
|
|
}
|
|
return envvars.FromServices(services), nil
|
|
}
|
|
|
|
func (b *BasicBoundPodFactory) MakeBoundPod(machine string, pod *api.Pod) (*api.BoundPod, error) {
|
|
envVars, err := getServiceEnvironmentVariables(api.NewContext(), b.ServiceRegistry, machine)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
boundPod := &api.BoundPod{}
|
|
if err := api.Scheme.Convert(pod, boundPod); err != nil {
|
|
return nil, err
|
|
}
|
|
for ix, container := range boundPod.Spec.Containers {
|
|
boundPod.Spec.Containers[ix].Env = append(container.Env, envVars...)
|
|
}
|
|
// Make a dummy self link so that references to this bound pod will work.
|
|
boundPod.SelfLink = "/api/v1beta1/boundPods/" + boundPod.Name
|
|
return boundPod, nil
|
|
}
|