github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use networking v1beta1 for kubectl describe

Browse Source
This commit is contained in:
Antonio Ojea
2024-06-29 10:04:47 +00:00
parent ca2d0857b6
commit c1d06c0ae4
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
staging/src/k8s.io/kubectl/pkg/describe/describe.go
View File

@@ -45,7 +45,6 @@ import (
discoveryv1beta1 "k8s.io/api/discovery/v1beta1" 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"
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
networkingv1beta1 "k8s.io/api/networking/v1beta1" networkingv1beta1 "k8s.io/api/networking/v1beta1"
policyv1 "k8s.io/api/policy/v1" policyv1 "k8s.io/api/policy/v1"
policyv1beta1 "k8s.io/api/policy/v1beta1" policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -216,8 +215,8 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]ResourceDescr
{Group: networkingv1beta1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c}, {Group: networkingv1beta1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c},
{Group: networkingv1.GroupName, Kind: "Ingress"}: &IngressDescriber{c}, {Group: networkingv1.GroupName, Kind: "Ingress"}: &IngressDescriber{c},
{Group: networkingv1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c}, {Group: networkingv1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c},
{Group: networkingv1alpha1.GroupName, Kind: "ServiceCIDR"}: &ServiceCIDRDescriber{c}, {Group: networkingv1beta1.GroupName, Kind: "ServiceCIDR"}: &ServiceCIDRDescriber{c},
{Group: networkingv1alpha1.GroupName, Kind: "IPAddress"}: &IPAddressDescriber{c}, {Group: networkingv1beta1.GroupName, Kind: "IPAddress"}: &IPAddressDescriber{c},
{Group: batchv1.GroupName, Kind: "Job"}: &JobDescriber{c}, {Group: batchv1.GroupName, Kind: "Job"}: &JobDescriber{c},
{Group: batchv1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c}, {Group: batchv1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c},
{Group: batchv1beta1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c}, {Group: batchv1beta1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c},
@@ -2871,17 +2870,17 @@ type ServiceCIDRDescriber struct {
func (c *ServiceCIDRDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) { func (c *ServiceCIDRDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) {
var events *corev1.EventList var events *corev1.EventList
svcV1alpha1, err := c.client.NetworkingV1alpha1().ServiceCIDRs().Get(context.TODO(), name, metav1.GetOptions{}) svcV1beta1, err := c.client.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), name, metav1.GetOptions{})
if err == nil { if err == nil {
if describerSettings.ShowEvents { if describerSettings.ShowEvents {
events, _ = searchEvents(c.client.CoreV1(), svcV1alpha1, describerSettings.ChunkSize) events, _ = searchEvents(c.client.CoreV1(), svcV1beta1, describerSettings.ChunkSize)
} }
return c.describeServiceCIDRV1alpha1(svcV1alpha1, events) return c.describeServiceCIDRV1beta1(svcV1beta1, events)
} }
return "", err return "", err
} }
func (c *ServiceCIDRDescriber) describeServiceCIDRV1alpha1(svc *networkingv1alpha1.ServiceCIDR, events *corev1.EventList) (string, error) { func (c *ServiceCIDRDescriber) describeServiceCIDRV1beta1(svc *networkingv1beta1.ServiceCIDR, 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%v\n", svc.Name) w.Write(LEVEL_0, "Name:\t%v\n", svc.Name)
@@ -2920,17 +2919,17 @@ type IPAddressDescriber struct {
func (c *IPAddressDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) { func (c *IPAddressDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) {
var events *corev1.EventList var events *corev1.EventList
ipV1alpha1, err := c.client.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), name, metav1.GetOptions{}) ipV1beta1, err := c.client.NetworkingV1beta1().IPAddresses().Get(context.TODO(), name, metav1.GetOptions{})
if err == nil { if err == nil {
if describerSettings.ShowEvents { if describerSettings.ShowEvents {
events, _ = searchEvents(c.client.CoreV1(), ipV1alpha1, describerSettings.ChunkSize) events, _ = searchEvents(c.client.CoreV1(), ipV1beta1, describerSettings.ChunkSize)
} }
return c.describeIPAddressV1alpha1(ipV1alpha1, events) return c.describeIPAddressV1beta1(ipV1beta1, events)
} }
return "", err return "", err
} }
func (c *IPAddressDescriber) describeIPAddressV1alpha1(ip *networkingv1alpha1.IPAddress, events *corev1.EventList) (string, error) { func (c *IPAddressDescriber) describeIPAddressV1beta1(ip *networkingv1beta1.IPAddress, 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%v\n", ip.Name) w.Write(LEVEL_0, "Name:\t%v\n", ip.Name)

27
staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
View File

@@ -37,7 +37,6 @@ import (
discoveryv1 "k8s.io/api/discovery/v1" discoveryv1 "k8s.io/api/discovery/v1"
discoveryv1beta1 "k8s.io/api/discovery/v1beta1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
networkingv1beta1 "k8s.io/api/networking/v1beta1" networkingv1beta1 "k8s.io/api/networking/v1beta1"
policyv1 "k8s.io/api/policy/v1" policyv1 "k8s.io/api/policy/v1"
policyv1beta1 "k8s.io/api/policy/v1beta1" policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -6368,12 +6367,12 @@ func TestDescribeServiceCIDR(t *testing.T) {
input *fake.Clientset input *fake.Clientset
output string output string
}{ }{
"ServiceCIDR v1alpha1": { "ServiceCIDR v1beta1": {
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{ input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo.123", Name: "foo.123",
}, },
Spec: networkingv1alpha1.ServiceCIDRSpec{ Spec: networkingv1beta1.ServiceCIDRSpec{
CIDRs: []string{"10.1.0.0/16", "fd00:1:1::/64"}, CIDRs: []string{"10.1.0.0/16", "fd00:1:1::/64"},
}, },
}), }),
@@ -6384,12 +6383,12 @@ Annotations: <none>
CIDRs: 10.1.0.0/16, fd00:1:1::/64 CIDRs: 10.1.0.0/16, fd00:1:1::/64
Events: <none>` + "\n", Events: <none>` + "\n",
}, },
"ServiceCIDR v1alpha1 IPv4": { "ServiceCIDR v1beta1 IPv4": {
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{ input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo.123", Name: "foo.123",
}, },
Spec: networkingv1alpha1.ServiceCIDRSpec{ Spec: networkingv1beta1.ServiceCIDRSpec{
CIDRs: []string{"10.1.0.0/16"}, CIDRs: []string{"10.1.0.0/16"},
}, },
}), }),
@@ -6400,12 +6399,12 @@ Annotations: <none>
CIDRs: 10.1.0.0/16 CIDRs: 10.1.0.0/16
Events: <none>` + "\n", Events: <none>` + "\n",
}, },
"ServiceCIDR v1alpha1 IPv6": { "ServiceCIDR v1beta1 IPv6": {
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{ input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo.123", Name: "foo.123",
}, },
Spec: networkingv1alpha1.ServiceCIDRSpec{ Spec: networkingv1beta1.ServiceCIDRSpec{
CIDRs: []string{"fd00:1:1::/64"}, CIDRs: []string{"fd00:1:1::/64"},
}, },
}), }),
@@ -6439,13 +6438,13 @@ func TestDescribeIPAddress(t *testing.T) {
input *fake.Clientset input *fake.Clientset
output string output string
}{ }{
"IPAddress v1alpha1": { "IPAddress v1beta1": {
input: fake.NewSimpleClientset(&networkingv1alpha1.IPAddress{ input: fake.NewSimpleClientset(&networkingv1beta1.IPAddress{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo.123", Name: "foo.123",
}, },
Spec: networkingv1alpha1.IPAddressSpec{ Spec: networkingv1beta1.IPAddressSpec{
ParentRef: &networkingv1alpha1.ParentReference{ ParentRef: &networkingv1beta1.ParentReference{
Group: "mygroup", Group: "mygroup",
Resource: "myresource", Resource: "myresource",
Namespace: "mynamespace", Namespace: "mynamespace",