diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go index d88095ac..2e0e2ec6 100644 --- a/pkg/describe/describe.go +++ b/pkg/describe/describe.go @@ -215,7 +215,6 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]ResourceDescr {Group: networkingv1beta1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c}, {Group: networkingv1.GroupName, Kind: "Ingress"}: &IngressDescriber{c}, {Group: networkingv1.GroupName, Kind: "IngressClass"}: &IngressClassDescriber{c}, - {Group: networkingv1alpha1.GroupName, Kind: "ClusterCIDR"}: &ClusterCIDRDescriber{c}, {Group: networkingv1alpha1.GroupName, Kind: "IPAddress"}: &IPAddressDescriber{c}, {Group: batchv1.GroupName, Kind: "Job"}: &JobDescriber{c}, {Group: batchv1.GroupName, Kind: "CronJob"}: &CronJobDescriber{c}, @@ -2845,63 +2844,6 @@ func (i *IngressClassDescriber) describeIngressClassV1(ic *networkingv1.IngressC }) } -// ClusterCIDRDescriber generates information about a ClusterCIDR. -type ClusterCIDRDescriber struct { - client clientset.Interface -} - -func (c *ClusterCIDRDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) { - var events *corev1.EventList - - ccV1alpha1, err := c.client.NetworkingV1alpha1().ClusterCIDRs().Get(context.TODO(), name, metav1.GetOptions{}) - if err == nil { - if describerSettings.ShowEvents { - events, _ = searchEvents(c.client.CoreV1(), ccV1alpha1, describerSettings.ChunkSize) - } - return c.describeClusterCIDRV1alpha1(ccV1alpha1, events) - } - return "", err -} - -func (c *ClusterCIDRDescriber) describeClusterCIDRV1alpha1(cc *networkingv1alpha1.ClusterCIDR, events *corev1.EventList) (string, error) { - return tabbedString(func(out io.Writer) error { - w := NewPrefixWriter(out) - w.Write(LEVEL_0, "Name:\t%v\n", cc.Name) - printLabelsMultiline(w, "Labels", cc.Labels) - printAnnotationsMultiline(w, "Annotations", cc.Annotations) - - w.Write(LEVEL_0, "NodeSelector:\n") - if cc.Spec.NodeSelector != nil { - w.Write(LEVEL_1, "NodeSelector Terms:") - if len(cc.Spec.NodeSelector.NodeSelectorTerms) == 0 { - w.WriteLine("") - } else { - w.WriteLine("") - for i, term := range cc.Spec.NodeSelector.NodeSelectorTerms { - printNodeSelectorTermsMultilineWithIndent(w, LEVEL_2, fmt.Sprintf("Term %v", i), "\t", term.MatchExpressions) - } - } - } - - if cc.Spec.PerNodeHostBits != 0 { - w.Write(LEVEL_0, "PerNodeHostBits:\t%s\n", fmt.Sprint(cc.Spec.PerNodeHostBits)) - } - - if cc.Spec.IPv4 != "" { - w.Write(LEVEL_0, "IPv4:\t%s\n", cc.Spec.IPv4) - } - - if cc.Spec.IPv6 != "" { - w.Write(LEVEL_0, "IPv6:\t%s\n", cc.Spec.IPv6) - } - - if events != nil { - DescribeEvents(events, w) - } - return nil - }) -} - // IPAddressDescriber generates information about an IPAddress. type IPAddressDescriber struct { client clientset.Interface diff --git a/pkg/describe/describe_test.go b/pkg/describe/describe_test.go index 30c29c1f..f78d961f 100644 --- a/pkg/describe/describe_test.go +++ b/pkg/describe/describe_test.go @@ -5932,64 +5932,6 @@ Events: ` + "\n", } } -func TestDescribeClusterCIDR(t *testing.T) { - - testcases := map[string]struct { - input *fake.Clientset - output string - }{ - "ClusterCIDR v1alpha1": { - input: fake.NewSimpleClientset(&networkingv1alpha1.ClusterCIDR{ - ObjectMeta: metav1.ObjectMeta{ - Name: "foo.123", - }, - Spec: networkingv1alpha1.ClusterCIDRSpec{ - PerNodeHostBits: int32(8), - IPv4: "10.1.0.0/16", - IPv6: "fd00:1:1::/64", - NodeSelector: &corev1.NodeSelector{ - NodeSelectorTerms: []corev1.NodeSelectorTerm{ - { - MatchExpressions: []corev1.NodeSelectorRequirement{ - { - Key: "foo", - Operator: "In", - Values: []string{"bar"}}, - }, - }, - }, - }, - }, - }), - - output: `Name: foo.123 -Labels: -Annotations: -NodeSelector: - NodeSelector Terms: - Term 0: foo in [bar] -PerNodeHostBits: 8 -IPv4: 10.1.0.0/16 -IPv6: fd00:1:1::/64 -Events: ` + "\n", - }, - } - - for name, tc := range testcases { - t.Run(name, func(t *testing.T) { - c := &describeClient{T: t, Namespace: "foo", Interface: tc.input} - d := ClusterCIDRDescriber{c} - out, err := d.Describe("bar", "foo.123", DescriberSettings{ShowEvents: true}) - if err != nil { - t.Errorf("unexpected error: %v", err) - } - if out != tc.output { - t.Errorf("expected :\n%s\nbut got output:\n%s diff:\n%s", tc.output, out, cmp.Diff(tc.output, out)) - } - }) - } -} - func TestDescribeIPAddress(t *testing.T) { testcases := map[string]struct {