github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Remove TPR remnants

Browse Source 
There are still TPR types and generated client
in the extensions group. It is better to clean
that up, now that it has been removed from master.
This commit is contained in:
Nikhita Raghunath
2017-11-02 21:35:46 +05:30
parent 12752f3139
commit 3b0b95ecbf
9 changed files with 2 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/printers/internalversion/printers.go
View File

@@ -303,15 +303,6 @@ func AddHandlers(h printers.PrintHandler) {
h.TableHandler(componentStatusColumnDefinitions, printComponentStatus)
h.TableHandler(componentStatusColumnDefinitions, printComponentStatusList)
thirdPartyResourceColumnDefinitions := []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Description", Type: "string", Description: extensionsv1beta1.ThirdPartyResource{}.SwaggerDoc()["description"]},
{Name: "Version(s)", Type: "string", Description: extensionsv1beta1.ThirdPartyResource{}.SwaggerDoc()["versions"]},
}
h.TableHandler(thirdPartyResourceColumnDefinitions, printThirdPartyResource)
h.TableHandler(thirdPartyResourceColumnDefinitions, printThirdPartyResourceList)
deploymentColumnDefinitions := []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Desired", Type: "string", Description: extensionsv1beta1.DeploymentSpec{}.SwaggerDoc()["replicas"]},
@@ -1435,33 +1426,6 @@ func printComponentStatusList(list *api.ComponentStatusList, options printers.Pr
return rows, nil
}
func printThirdPartyResource(obj *extensions.ThirdPartyResource, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
row := metav1alpha1.TableRow{
Object: runtime.RawExtension{Object: obj},
}
versions := make([]string, len(obj.Versions))
for ix := range obj.Versions {
version := &obj.Versions[ix]
versions[ix] = fmt.Sprintf("%s", version.Name)
}
versionsString := strings.Join(versions, ",")
row.Cells = append(row.Cells, obj.Name, obj.Description, versionsString)
return []metav1alpha1.TableRow{row}, nil
}
func printThirdPartyResourceList(list *extensions.ThirdPartyResourceList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
rows := make([]metav1alpha1.TableRow, 0, len(list.Items))
for i := range list.Items {
r, err := printThirdPartyResource(&list.Items[i], options)
if err != nil {
return nil, err
}
rows = append(rows, r...)
}
return rows, nil
}
func truncate(str string, maxLen int) string {
if len(str) > maxLen {
return str[0:maxLen] + "..."