Skip to content

Commit c1d06c0

Browse files
aojeaaojea
committed
use networking v1beta1 for kubectl describe
1 parent ca2d085 commit c1d06c0

File tree

2 files changed

+23
-25
lines changed

2 files changed

+23
-25
lines changed

‎staging/src/k8s.io/kubectl/pkg/describe/describe.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
4646
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
4747
networkingv1 "k8s.io/api/networking/v1"
48-
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
4948
networkingv1beta1 "k8s.io/api/networking/v1beta1"
5049
policyv1 "k8s.io/api/policy/v1"
5150
policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -216,8 +215,8 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]ResourceDescr
216215
{Group: networkingv1beta1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c},
217216
{Group: networkingv1.GroupName, Kind: "Ingress"}: &IngressDescriber{c},
218217
{Group: networkingv1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c},
219-
{Group: networkingv1alpha1.GroupName, Kind: "ServiceCIDR"}: &ServiceCIDRDescriber{c},
220-
{Group: networkingv1alpha1.GroupName, Kind: "IPAddress"}: &IPAddressDescriber{c},
218+
{Group: networkingv1beta1.GroupName, Kind: "ServiceCIDR"}: &ServiceCIDRDescriber{c},
219+
{Group: networkingv1beta1.GroupName, Kind: "IPAddress"}: &IPAddressDescriber{c},
221220
{Group: batchv1.GroupName, Kind: "Job"}: &JobDescriber{c},
222221
{Group: batchv1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c},
223222
{Group: batchv1beta1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c},
@@ -2871,17 +2870,17 @@ type ServiceCIDRDescriber struct {
28712870
func (c *ServiceCIDRDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) {
28722871
var events *corev1.EventList
28732872

2874-
svcV1alpha1, err := c.client.NetworkingV1alpha1().ServiceCIDRs().Get(context.TODO(), name, metav1.GetOptions{})
2873+
svcV1beta1, err := c.client.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), name, metav1.GetOptions{})
28752874
if err == nil {
28762875
if describerSettings.ShowEvents {
2877-
events, _ = searchEvents(c.client.CoreV1(), svcV1alpha1, describerSettings.ChunkSize)
2876+
events, _ = searchEvents(c.client.CoreV1(), svcV1beta1, describerSettings.ChunkSize)
28782877
}
2879-
return c.describeServiceCIDRV1alpha1(svcV1alpha1, events)
2878+
return c.describeServiceCIDRV1beta1(svcV1beta1, events)
28802879
}
28812880
return "", err
28822881
}
28832882

2884-
func (c *ServiceCIDRDescriber) describeServiceCIDRV1alpha1(svc *networkingv1alpha1.ServiceCIDR, events *corev1.EventList) (string, error) {
2883+
func (c *ServiceCIDRDescriber) describeServiceCIDRV1beta1(svc *networkingv1beta1.ServiceCIDR, events *corev1.EventList) (string, error) {
28852884
return tabbedString(func(out io.Writer) error {
28862885
w := NewPrefixWriter(out)
28872886
w.Write(LEVEL_0, "Name:\t%v\n", svc.Name)
@@ -2920,17 +2919,17 @@ type IPAddressDescriber struct {
29202919
func (c *IPAddressDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) {
29212920
var events *corev1.EventList
29222921

2923-
ipV1alpha1, err := c.client.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), name, metav1.GetOptions{})
2922+
ipV1beta1, err := c.client.NetworkingV1beta1().IPAddresses().Get(context.TODO(), name, metav1.GetOptions{})
29242923
if err == nil {
29252924
if describerSettings.ShowEvents {
2926-
events, _ = searchEvents(c.client.CoreV1(), ipV1alpha1, describerSettings.ChunkSize)
2925+
events, _ = searchEvents(c.client.CoreV1(), ipV1beta1, describerSettings.ChunkSize)
29272926
}
2928-
return c.describeIPAddressV1alpha1(ipV1alpha1, events)
2927+
return c.describeIPAddressV1beta1(ipV1beta1, events)
29292928
}
29302929
return "", err
29312930
}
29322931

2933-
func (c *IPAddressDescriber) describeIPAddressV1alpha1(ip *networkingv1alpha1.IPAddress, events *corev1.EventList) (string, error) {
2932+
func (c *IPAddressDescriber) describeIPAddressV1beta1(ip *networkingv1beta1.IPAddress, events *corev1.EventList) (string, error) {
29342933
return tabbedString(func(out io.Writer) error {
29352934
w := NewPrefixWriter(out)
29362935
w.Write(LEVEL_0, "Name:\t%v\n", ip.Name)

‎staging/src/k8s.io/kubectl/pkg/describe/describe_test.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
discoveryv1 "k8s.io/api/discovery/v1"
3838
discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
3939
networkingv1 "k8s.io/api/networking/v1"
40-
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
4140
networkingv1beta1 "k8s.io/api/networking/v1beta1"
4241
policyv1 "k8s.io/api/policy/v1"
4342
policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -6368,12 +6367,12 @@ func TestDescribeServiceCIDR(t *testing.T) {
63686367
input *fake.Clientset
63696368
output string
63706369
}{
6371-
"ServiceCIDR v1alpha1": {
6372-
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{
6370+
"ServiceCIDR v1beta1": {
6371+
input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
63736372
ObjectMeta: metav1.ObjectMeta{
63746373
Name: "foo.123",
63756374
},
6376-
Spec: networkingv1alpha1.ServiceCIDRSpec{
6375+
Spec: networkingv1beta1.ServiceCIDRSpec{
63776376
CIDRs: []string{"10.1.0.0/16", "fd00:1:1::/64"},
63786377
},
63796378
}),
@@ -6384,12 +6383,12 @@ Annotations: <none>
63846383
CIDRs: 10.1.0.0/16, fd00:1:1::/64
63856384
Events: <none>` + "\n",
63866385
},
6387-
"ServiceCIDR v1alpha1 IPv4": {
6388-
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{
6386+
"ServiceCIDR v1beta1 IPv4": {
6387+
input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
63896388
ObjectMeta: metav1.ObjectMeta{
63906389
Name: "foo.123",
63916390
},
6392-
Spec: networkingv1alpha1.ServiceCIDRSpec{
6391+
Spec: networkingv1beta1.ServiceCIDRSpec{
63936392
CIDRs: []string{"10.1.0.0/16"},
63946393
},
63956394
}),
@@ -6400,12 +6399,12 @@ Annotations: <none>
64006399
CIDRs: 10.1.0.0/16
64016400
Events: <none>` + "\n",
64026401
},
6403-
"ServiceCIDR v1alpha1 IPv6": {
6404-
input: fake.NewSimpleClientset(&networkingv1alpha1.ServiceCIDR{
6402+
"ServiceCIDR v1beta1 IPv6": {
6403+
input: fake.NewSimpleClientset(&networkingv1beta1.ServiceCIDR{
64056404
ObjectMeta: metav1.ObjectMeta{
64066405
Name: "foo.123",
64076406
},
6408-
Spec: networkingv1alpha1.ServiceCIDRSpec{
6407+
Spec: networkingv1beta1.ServiceCIDRSpec{
64096408
CIDRs: []string{"fd00:1:1::/64"},
64106409
},
64116410
}),
@@ -6439,13 +6438,13 @@ func TestDescribeIPAddress(t *testing.T) {
64396438
input *fake.Clientset
64406439
output string
64416440
}{
6442-
"IPAddress v1alpha1": {
6443-
input: fake.NewSimpleClientset(&networkingv1alpha1.IPAddress{
6441+
"IPAddress v1beta1": {
6442+
input: fake.NewSimpleClientset(&networkingv1beta1.IPAddress{
64446443
ObjectMeta: metav1.ObjectMeta{
64456444
Name: "foo.123",
64466445
},
6447-
Spec: networkingv1alpha1.IPAddressSpec{
6448-
ParentRef: &networkingv1alpha1.ParentReference{
6446+
Spec: networkingv1beta1.IPAddressSpec{
6447+
ParentRef: &networkingv1beta1.ParentReference{
64496448
Group: "mygroup",
64506449
Resource: "myresource",
64516450
Namespace: "mynamespace",

0 commit comments

Comments
 (0)