From 608bf0de1f589756895606b08295816c3ec68bc6 Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 2 Aug 2018 08:28:36 -0400 Subject: [PATCH] update polymorphichelpers for external types --- pkg/kubectl/polymorphichelpers/BUILD | 1 + .../mapbasedselectorforobject.go | 71 +++++++++++++++++++ .../polymorphichelpers/objectpauser.go | 34 +++++++++ .../polymorphichelpers/objectresumer.go | 34 +++++++++ .../polymorphichelpers/portsforobject.go | 51 ++++++++++++- .../polymorphichelpers/protocolsforobject.go | 53 +++++++++++++- 6 files changed, 240 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/polymorphichelpers/BUILD b/pkg/kubectl/polymorphichelpers/BUILD index 7cd53f52e52..9d6f085ae7c 100644 --- a/pkg/kubectl/polymorphichelpers/BUILD +++ b/pkg/kubectl/polymorphichelpers/BUILD @@ -31,6 +31,7 @@ go_library( "//pkg/controller:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/genericclioptions:go_default_library", + "//pkg/kubectl/scheme:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", diff --git a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go b/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go index dd12941babc..1be70191af3 100644 --- a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go +++ b/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go @@ -19,6 +19,11 @@ package polymorphichelpers import ( "fmt" + appsv1 "k8s.io/api/apps/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1beta2 "k8s.io/api/apps/v1beta2" + corev1 "k8s.io/api/core/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/extensions" @@ -33,16 +38,31 @@ func mapBasedSelectorForObject(object runtime.Object) (string, error) { switch t := object.(type) { case *api.ReplicationController: return kubectl.MakeLabels(t.Spec.Selector), nil + case *corev1.ReplicationController: + return kubectl.MakeLabels(t.Spec.Selector), nil + case *api.Pod: if len(t.Labels) == 0 { return "", fmt.Errorf("the pod has no labels and cannot be exposed") } return kubectl.MakeLabels(t.Labels), nil + case *corev1.Pod: + if len(t.Labels) == 0 { + return "", fmt.Errorf("the pod has no labels and cannot be exposed") + } + return kubectl.MakeLabels(t.Labels), nil + case *api.Service: if t.Spec.Selector == nil { return "", fmt.Errorf("the service has no pod selector set") } return kubectl.MakeLabels(t.Spec.Selector), nil + case *corev1.Service: + if t.Spec.Selector == nil { + return "", fmt.Errorf("the service has no pod selector set") + } + return kubectl.MakeLabels(t.Spec.Selector), nil + case *extensions.Deployment: // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals // operator, DoubleEquals operator and In operator with only one element in the set. @@ -50,6 +70,35 @@ func mapBasedSelectorForObject(object runtime.Object) (string, error) { return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) } return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *extensionsv1beta1.Deployment: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *appsv1.Deployment: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *appsv1beta2.Deployment: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *appsv1beta1.Deployment: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *extensions.ReplicaSet: // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals // operator, DoubleEquals operator and In operator with only one element in the set. @@ -57,6 +106,28 @@ func mapBasedSelectorForObject(object runtime.Object) (string, error) { return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) } return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *extensionsv1beta1.ReplicaSet: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *appsv1.ReplicaSet: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + case *appsv1beta2.ReplicaSet: + // TODO(madhusudancs): Make this smarter by admitting MatchExpressions with Equals + // operator, DoubleEquals operator and In operator with only one element in the set. + if len(t.Spec.Selector.MatchExpressions) > 0 { + return "", fmt.Errorf("couldn't convert expressions - \"%+v\" to map-based selector format", t.Spec.Selector.MatchExpressions) + } + return kubectl.MakeLabels(t.Spec.Selector.MatchLabels), nil + default: return "", fmt.Errorf("cannot extract pod selector from %T", object) } diff --git a/pkg/kubectl/polymorphichelpers/objectpauser.go b/pkg/kubectl/polymorphichelpers/objectpauser.go index f6fbde55893..8d77ee6e639 100644 --- a/pkg/kubectl/polymorphichelpers/objectpauser.go +++ b/pkg/kubectl/polymorphichelpers/objectpauser.go @@ -20,10 +20,15 @@ import ( "errors" "fmt" + appsv1 "k8s.io/api/apps/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1beta2 "k8s.io/api/apps/v1beta2" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/kubectl/scheme" ) // Currently only supports Deployments. @@ -35,6 +40,35 @@ func defaultObjectPauser(obj runtime.Object) ([]byte, error) { } obj.Spec.Paused = true return runtime.Encode(internalVersionJSONEncoder(), obj) + + case *extensionsv1beta1.Deployment: + if obj.Spec.Paused { + return nil, errors.New("is already paused") + } + obj.Spec.Paused = true + return runtime.Encode(scheme.Codecs.LegacyCodec(extensionsv1beta1.SchemeGroupVersion), obj) + + case *appsv1.Deployment: + if obj.Spec.Paused { + return nil, errors.New("is already paused") + } + obj.Spec.Paused = true + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1.SchemeGroupVersion), obj) + + case *appsv1beta2.Deployment: + if obj.Spec.Paused { + return nil, errors.New("is already paused") + } + obj.Spec.Paused = true + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1beta2.SchemeGroupVersion), obj) + + case *appsv1beta1.Deployment: + if obj.Spec.Paused { + return nil, errors.New("is already paused") + } + obj.Spec.Paused = true + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1beta1.SchemeGroupVersion), obj) + default: return nil, fmt.Errorf("pausing is not supported") } diff --git a/pkg/kubectl/polymorphichelpers/objectresumer.go b/pkg/kubectl/polymorphichelpers/objectresumer.go index 84d8dff91dc..d3119bc7b5c 100644 --- a/pkg/kubectl/polymorphichelpers/objectresumer.go +++ b/pkg/kubectl/polymorphichelpers/objectresumer.go @@ -20,8 +20,13 @@ import ( "errors" "fmt" + appsv1 "k8s.io/api/apps/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1beta2 "k8s.io/api/apps/v1beta2" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/kubectl/scheme" ) func defaultObjectResumer(obj runtime.Object) ([]byte, error) { @@ -32,6 +37,35 @@ func defaultObjectResumer(obj runtime.Object) ([]byte, error) { } obj.Spec.Paused = false return runtime.Encode(internalVersionJSONEncoder(), obj) + + case *extensionsv1beta1.Deployment: + if !obj.Spec.Paused { + return nil, errors.New("is not paused") + } + obj.Spec.Paused = false + return runtime.Encode(scheme.Codecs.LegacyCodec(extensionsv1beta1.SchemeGroupVersion), obj) + + case *appsv1.Deployment: + if !obj.Spec.Paused { + return nil, errors.New("is not paused") + } + obj.Spec.Paused = false + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1.SchemeGroupVersion), obj) + + case *appsv1beta2.Deployment: + if !obj.Spec.Paused { + return nil, errors.New("is not paused") + } + obj.Spec.Paused = false + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1beta2.SchemeGroupVersion), obj) + + case *appsv1beta1.Deployment: + if !obj.Spec.Paused { + return nil, errors.New("is not paused") + } + obj.Spec.Paused = false + return runtime.Encode(scheme.Codecs.LegacyCodec(appsv1beta1.SchemeGroupVersion), obj) + default: return nil, fmt.Errorf("resuming is not supported") } diff --git a/pkg/kubectl/polymorphichelpers/portsforobject.go b/pkg/kubectl/polymorphichelpers/portsforobject.go index 48318d30a98..26f00bf0852 100644 --- a/pkg/kubectl/polymorphichelpers/portsforobject.go +++ b/pkg/kubectl/polymorphichelpers/portsforobject.go @@ -20,6 +20,11 @@ import ( "fmt" "strconv" + appsv1 "k8s.io/api/apps/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1beta2 "k8s.io/api/apps/v1beta2" + corev1 "k8s.io/api/core/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/extensions" @@ -28,21 +33,45 @@ import ( func portsForObject(object runtime.Object) ([]string, error) { switch t := object.(type) { case *api.ReplicationController: + return getPortsInternal(t.Spec.Template.Spec), nil + case *corev1.ReplicationController: return getPorts(t.Spec.Template.Spec), nil + case *api.Pod: + return getPortsInternal(t.Spec), nil + case *corev1.Pod: return getPorts(t.Spec), nil + case *api.Service: + return getServicePortsInternal(t.Spec), nil + case *corev1.Service: return getServicePorts(t.Spec), nil + case *extensions.Deployment: + return getPortsInternal(t.Spec.Template.Spec), nil + case *extensionsv1beta1.Deployment: return getPorts(t.Spec.Template.Spec), nil + case *appsv1.Deployment: + return getPorts(t.Spec.Template.Spec), nil + case *appsv1beta2.Deployment: + return getPorts(t.Spec.Template.Spec), nil + case *appsv1beta1.Deployment: + return getPorts(t.Spec.Template.Spec), nil + case *extensions.ReplicaSet: + return getPortsInternal(t.Spec.Template.Spec), nil + case *extensionsv1beta1.ReplicaSet: + return getPorts(t.Spec.Template.Spec), nil + case *appsv1.ReplicaSet: + return getPorts(t.Spec.Template.Spec), nil + case *appsv1beta2.ReplicaSet: return getPorts(t.Spec.Template.Spec), nil default: return nil, fmt.Errorf("cannot extract ports from %T", object) } } -func getPorts(spec api.PodSpec) []string { +func getPortsInternal(spec api.PodSpec) []string { result := []string{} for _, container := range spec.Containers { for _, port := range container.Ports { @@ -53,7 +82,25 @@ func getPorts(spec api.PodSpec) []string { } // Extracts the ports exposed by a service from the given service spec. -func getServicePorts(spec api.ServiceSpec) []string { +func getServicePortsInternal(spec api.ServiceSpec) []string { + result := []string{} + for _, servicePort := range spec.Ports { + result = append(result, strconv.Itoa(int(servicePort.Port))) + } + return result +} + +func getPorts(spec corev1.PodSpec) []string { + result := []string{} + for _, container := range spec.Containers { + for _, port := range container.Ports { + result = append(result, strconv.Itoa(int(port.ContainerPort))) + } + } + return result +} + +func getServicePorts(spec corev1.ServiceSpec) []string { result := []string{} for _, servicePort := range spec.Ports { result = append(result, strconv.Itoa(int(servicePort.Port))) diff --git a/pkg/kubectl/polymorphichelpers/protocolsforobject.go b/pkg/kubectl/polymorphichelpers/protocolsforobject.go index de6d23d2a8e..3ab54b28e48 100644 --- a/pkg/kubectl/polymorphichelpers/protocolsforobject.go +++ b/pkg/kubectl/polymorphichelpers/protocolsforobject.go @@ -20,6 +20,11 @@ import ( "fmt" "strconv" + appsv1 "k8s.io/api/apps/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1beta2 "k8s.io/api/apps/v1beta2" + corev1 "k8s.io/api/core/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/extensions" @@ -29,21 +34,46 @@ func protocolsForObject(object runtime.Object) (map[string]string, error) { // TODO: replace with a swagger schema based approach (identify pod selector via schema introspection) switch t := object.(type) { case *api.ReplicationController: + return getProtocolsInternal(t.Spec.Template.Spec), nil + case *corev1.ReplicationController: return getProtocols(t.Spec.Template.Spec), nil + case *api.Pod: + return getProtocolsInternal(t.Spec), nil + case *corev1.Pod: return getProtocols(t.Spec), nil + case *api.Service: + return getServiceProtocolsInternal(t.Spec), nil + case *corev1.Service: return getServiceProtocols(t.Spec), nil + case *extensions.Deployment: + return getProtocolsInternal(t.Spec.Template.Spec), nil + case *extensionsv1beta1.Deployment: return getProtocols(t.Spec.Template.Spec), nil + case *appsv1.Deployment: + return getProtocols(t.Spec.Template.Spec), nil + case *appsv1beta2.Deployment: + return getProtocols(t.Spec.Template.Spec), nil + case *appsv1beta1.Deployment: + return getProtocols(t.Spec.Template.Spec), nil + case *extensions.ReplicaSet: + return getProtocolsInternal(t.Spec.Template.Spec), nil + case *extensionsv1beta1.ReplicaSet: return getProtocols(t.Spec.Template.Spec), nil + case *appsv1.ReplicaSet: + return getProtocols(t.Spec.Template.Spec), nil + case *appsv1beta2.ReplicaSet: + return getProtocols(t.Spec.Template.Spec), nil + default: return nil, fmt.Errorf("cannot extract protocols from %T", object) } } -func getProtocols(spec api.PodSpec) map[string]string { +func getProtocolsInternal(spec api.PodSpec) map[string]string { result := make(map[string]string) for _, container := range spec.Containers { for _, port := range container.Ports { @@ -54,7 +84,26 @@ func getProtocols(spec api.PodSpec) map[string]string { } // Extracts the protocols exposed by a service from the given service spec. -func getServiceProtocols(spec api.ServiceSpec) map[string]string { +func getServiceProtocolsInternal(spec api.ServiceSpec) map[string]string { + result := make(map[string]string) + for _, servicePort := range spec.Ports { + result[strconv.Itoa(int(servicePort.Port))] = string(servicePort.Protocol) + } + return result +} + +func getProtocols(spec corev1.PodSpec) map[string]string { + result := make(map[string]string) + for _, container := range spec.Containers { + for _, port := range container.Ports { + result[strconv.Itoa(int(port.ContainerPort))] = string(port.Protocol) + } + } + return result +} + +// Extracts the protocols exposed by a service from the given service spec. +func getServiceProtocols(spec corev1.ServiceSpec) map[string]string { result := make(map[string]string) for _, servicePort := range spec.Ports { result[strconv.Itoa(int(servicePort.Port))] = string(servicePort.Protocol)