17f7dd8d6d
Some types will be looked up based on their internal type, which is passed directly to RESTMapping(). RESTMapping() will search the entire version list if no external types are passed, but OutputVersionMapper was bypassing that because the default type was always present. Change OutputVersionMapper to collapse empty versions, and when no external type is specified, try with the preferred version and then try without.
116 lines
3.4 KiB
Go
116 lines
3.4 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.
|
|
*/
|
|
|
|
// A set of common functions needed by cmd/kubectl and pkg/kubectl packages.
|
|
package kubectl
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
|
|
)
|
|
|
|
var apiVersionToUse = "v1beta1"
|
|
|
|
const kubectlAnnotationPrefix = "kubectl.kubernetes.io/"
|
|
|
|
type NamespaceInfo struct {
|
|
Namespace string
|
|
}
|
|
|
|
// TODO Move to labels package.
|
|
func formatLabels(labelMap map[string]string) string {
|
|
l := labels.Set(labelMap).String()
|
|
if l == "" {
|
|
l = "<none>"
|
|
}
|
|
return l
|
|
}
|
|
|
|
func listOfImages(spec *api.PodSpec) []string {
|
|
var images []string
|
|
for _, container := range spec.Containers {
|
|
images = append(images, container.Image)
|
|
}
|
|
return images
|
|
}
|
|
|
|
func makeImageList(spec *api.PodSpec) string {
|
|
return strings.Join(listOfImages(spec), ",")
|
|
}
|
|
|
|
// OutputVersionMapper is a RESTMapper that will prefer mappings that
|
|
// correspond to a preferred output version (if feasible)
|
|
type OutputVersionMapper struct {
|
|
meta.RESTMapper
|
|
OutputVersion string
|
|
}
|
|
|
|
// RESTMapping implements meta.RESTMapper by prepending the output version to the preferred version list.
|
|
func (m OutputVersionMapper) RESTMapping(kind string, versions ...string) (*meta.RESTMapping, error) {
|
|
preferred := []string{m.OutputVersion}
|
|
for _, version := range versions {
|
|
if len(version) > 0 {
|
|
preferred = append(preferred, version)
|
|
}
|
|
}
|
|
// if the caller wants to use the default version list, try with the preferred version, and on
|
|
// error, use the default behavior.
|
|
if len(preferred) == 1 {
|
|
if m, err := m.RESTMapper.RESTMapping(kind, preferred...); err == nil {
|
|
return m, nil
|
|
}
|
|
preferred = nil
|
|
}
|
|
return m.RESTMapper.RESTMapping(kind, preferred...)
|
|
}
|
|
|
|
// ShortcutExpander is a RESTMapper that can be used for Kubernetes
|
|
// resources.
|
|
type ShortcutExpander struct {
|
|
meta.RESTMapper
|
|
}
|
|
|
|
// VersionAndKindForResource implements meta.RESTMapper. It expands the resource first, then invokes the wrapped
|
|
// mapper.
|
|
func (e ShortcutExpander) VersionAndKindForResource(resource string) (defaultVersion, kind string, err error) {
|
|
resource = expandResourceShortcut(resource)
|
|
return e.RESTMapper.VersionAndKindForResource(resource)
|
|
}
|
|
|
|
// expandResourceShortcut will return the expanded version of resource
|
|
// (something that a pkg/api/meta.RESTMapper can understand), if it is
|
|
// indeed a shortcut. Otherwise, will return resource unmodified.
|
|
func expandResourceShortcut(resource string) string {
|
|
shortForms := map[string]string{
|
|
"po": "pods",
|
|
"rc": "replicationcontrollers",
|
|
// DEPRECATED: will be removed before 1.0
|
|
"se": "services",
|
|
"svc": "services",
|
|
"mi": "minions",
|
|
"ev": "events",
|
|
"limits": "limitRanges",
|
|
"quota": "resourceQuotas",
|
|
}
|
|
if expanded, ok := shortForms[resource]; ok {
|
|
return expanded
|
|
}
|
|
return resource
|
|
}
|