kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Promoting EndpointSlices to beta 

Kubernetes-commit: a7e589a8c689d1a6c0c21d47c5e6c97267822875
This commit is contained in:
Rob Scott 2019-10-25 14:59:10 -07:00 committed by Kubernetes Publisher
parent b031036a44
commit 56eaaf1668
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/describe/versioned/describe.go
View File

@ -41,7 +41,7 @@ import (
certificatesv1beta1 "k8s.io/api/certificates/v1beta1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
coordinationv1 "k8s.io/api/coordination/v1" coordinationv1 "k8s.io/api/coordination/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discoveryv1alpha1 "k8s.io/api/discovery/v1alpha1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
networkingv1beta1 "k8s.io/api/networking/v1beta1" networkingv1beta1 "k8s.io/api/networking/v1beta1"
@ -171,7 +171,7 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]describe.Desc
{Group: corev1.GroupName, Kind: "Endpoints"}: &EndpointsDescriber{c}, {Group: corev1.GroupName, Kind: "Endpoints"}: &EndpointsDescriber{c},
{Group: corev1.GroupName, Kind: "ConfigMap"}: &ConfigMapDescriber{c}, {Group: corev1.GroupName, Kind: "ConfigMap"}: &ConfigMapDescriber{c},
{Group: corev1.GroupName, Kind: "PriorityClass"}: &PriorityClassDescriber{c}, {Group: corev1.GroupName, Kind: "PriorityClass"}: &PriorityClassDescriber{c},
{Group: discoveryv1alpha1.GroupName, Kind: "EndpointSlice"}: &EndpointSliceDescriber{c}, {Group: discoveryv1beta1.GroupName, Kind: "EndpointSlice"}: &EndpointSliceDescriber{c},
{Group: extensionsv1beta1.GroupName, Kind: "ReplicaSet"}: &ReplicaSetDescriber{c}, {Group: extensionsv1beta1.GroupName, Kind: "ReplicaSet"}: &ReplicaSetDescriber{c},
{Group: extensionsv1beta1.GroupName, Kind: "NetworkPolicy"}: &NetworkPolicyDescriber{c}, {Group: extensionsv1beta1.GroupName, Kind: "NetworkPolicy"}: &NetworkPolicyDescriber{c},
{Group: extensionsv1beta1.GroupName, Kind: "PodSecurityPolicy"}: &PodSecurityPolicyDescriber{c}, {Group: extensionsv1beta1.GroupName, Kind: "PodSecurityPolicy"}: &PodSecurityPolicyDescriber{c},
@ -2621,7 +2621,7 @@ type EndpointSliceDescriber struct {
} }
func (d *EndpointSliceDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) { func (d *EndpointSliceDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.DiscoveryV1alpha1().EndpointSlices(namespace) c := d.DiscoveryV1beta1().EndpointSlices(namespace)
eps, err := c.Get(name, metav1.GetOptions{}) eps, err := c.Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
@ -2636,7 +2636,7 @@ func (d *EndpointSliceDescriber) Describe(namespace, name string, describerSetti
return describeEndpointSlice(eps, events) return describeEndpointSlice(eps, events)
} }
func describeEndpointSlice(eps *discoveryv1alpha1.EndpointSlice, events *corev1.EventList) (string, error) { func describeEndpointSlice(eps *discoveryv1beta1.EndpointSlice, events *corev1.EventList) (string, error) {
return tabbedString(func(out io.Writer) error { return tabbedString(func(out io.Writer) error {
w := NewPrefixWriter(out) w := NewPrefixWriter(out)
w.Write(LEVEL_0, "Name:\t%s\n", eps.Name) w.Write(LEVEL_0, "Name:\t%s\n", eps.Name)

16
pkg/describe/versioned/describe_test.go
View File

@ -30,7 +30,7 @@ import (
autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
coordinationv1 "k8s.io/api/coordination/v1" coordinationv1 "k8s.io/api/coordination/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discoveryv1alpha1 "k8s.io/api/discovery/v1alpha1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
policyv1beta1 "k8s.io/api/policy/v1beta1" policyv1beta1 "k8s.io/api/policy/v1beta1"
storagev1 "k8s.io/api/storage/v1" storagev1 "k8s.io/api/storage/v1"
@ -2582,7 +2582,7 @@ func TestDescribeEvents(t *testing.T) {
}, events), }, events),
}, },
"EndpointSliceDescriber": &EndpointSliceDescriber{ "EndpointSliceDescriber": &EndpointSliceDescriber{
fake.NewSimpleClientset(&discoveryv1alpha1.EndpointSlice{ fake.NewSimpleClientset(&discoveryv1beta1.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "bar", Name: "bar",
Namespace: "foo", Namespace: "foo",
@ -3519,16 +3519,16 @@ func TestDescribeEndpointSlice(t *testing.T) {
protocolTCP := corev1.ProtocolTCP protocolTCP := corev1.ProtocolTCP
port80 := int32(80) port80 := int32(80)
fake := fake.NewSimpleClientset(&discoveryv1alpha1.EndpointSlice{ fake := fake.NewSimpleClientset(&discoveryv1beta1.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo.123", Name: "foo.123",
Namespace: "bar", Namespace: "bar",
}, },
AddressType: discoveryv1alpha1.AddressTypeIPv4, AddressType: discoveryv1beta1.AddressTypeIPv4,
Endpoints: []discoveryv1alpha1.Endpoint{ Endpoints: []discoveryv1beta1.Endpoint{
{ {
Addresses: []string{"1.2.3.4", "1.2.3.5"}, Addresses: []string{"1.2.3.4", "1.2.3.5"},
Conditions: discoveryv1alpha1.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, Conditions: discoveryv1beta1.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
TargetRef: &corev1.ObjectReference{Kind: "Pod", Name: "test-123"}, TargetRef: &corev1.ObjectReference{Kind: "Pod", Name: "test-123"},
Topology: map[string]string{ Topology: map[string]string{
"topology.kubernetes.io/zone": "us-central1-a", "topology.kubernetes.io/zone": "us-central1-a",
@ -3536,7 +3536,7 @@ func TestDescribeEndpointSlice(t *testing.T) {
}, },
}, { }, {
Addresses: []string{"1.2.3.6", "1.2.3.7"}, Addresses: []string{"1.2.3.6", "1.2.3.7"},
Conditions: discoveryv1alpha1.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, Conditions: discoveryv1beta1.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
TargetRef: &corev1.ObjectReference{Kind: "Pod", Name: "test-124"}, TargetRef: &corev1.ObjectReference{Kind: "Pod", Name: "test-124"},
Topology: map[string]string{ Topology: map[string]string{
"topology.kubernetes.io/zone": "us-central1-b", "topology.kubernetes.io/zone": "us-central1-b",
@ -3544,7 +3544,7 @@ func TestDescribeEndpointSlice(t *testing.T) {
}, },
}, },
}, },
Ports: []discoveryv1alpha1.EndpointPort{ Ports: []discoveryv1beta1.EndpointPort{
{ {
Protocol: &protocolTCP, Protocol: &protocolTCP,
Port: &port80, Port: &port80,