diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index b800abcfe4..af8864ff9c 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -359,7 +359,7 @@ func startGarbageCollectorController(ctx ControllerContext) (bool, error) { // TODO: Make NewMetadataCodecFactory support arbitrary (non-compiled) // resource types. Otherwise we'll be storing full Unstructured data in our // caches for custom resources. Consider porting it to work with - // metav1alpha1.PartialObjectMetadata. + // metav1beta1.PartialObjectMetadata. metaOnlyClientPool := dynamic.NewClientPool(config, restMapper, dynamic.LegacyAPIPathResolverFunc) clientPool := dynamic.NewClientPool(config, restMapper, dynamic.LegacyAPIPathResolverFunc) diff --git a/hack/.golint_failures b/hack/.golint_failures index 31f894ec5b..2b5a7e6c72 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -502,7 +502,7 @@ staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation -staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1 +staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1 staging/src/k8s.io/apimachinery/pkg/apis/testapigroup staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1 staging/src/k8s.io/apimachinery/pkg/conversion diff --git a/hack/lib/util.sh b/hack/lib/util.sh index c4bfdbbca8..1a96acce65 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -277,11 +277,11 @@ kube::util::group-version-to-pkg-path() { meta/v1) echo "../vendor/k8s.io/apimachinery/pkg/apis/meta/v1" ;; - meta/v1alpha1) - echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + meta/v1beta1) + echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1" ;; - meta/v1alpha1) - echo "../vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + meta/v1beta1) + echo "../vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1" ;; unversioned) echo "pkg/api/unversioned" diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 20aef7fa0f..0e91c99414 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/hack/update-generated-swagger-docs.sh @@ -29,7 +29,7 @@ source "${KUBE_ROOT}/hack/lib/swagger.sh" kube::golang::setup_env -GROUP_VERSIONS=(meta/v1 meta/v1alpha1 ${KUBE_AVAILABLE_GROUP_VERSIONS}) +GROUP_VERSIONS=(meta/v1 meta/v1beta1 ${KUBE_AVAILABLE_GROUP_VERSIONS}) # To avoid compile errors, remove the currently existing files. for group_version in "${GROUP_VERSIONS[@]}"; do diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 542d26f598..0b46155942 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -54,7 +54,7 @@ openapi_library( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", "k8s.io/apimachinery/pkg/api/resource", "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "k8s.io/apimachinery/pkg/apis/testapigroup/v1", "k8s.io/apimachinery/pkg/runtime", "k8s.io/apimachinery/pkg/util/intstr", diff --git a/pkg/printers/BUILD b/pkg/printers/BUILD index f4b90a9805..9d2b02f880 100644 --- a/pkg/printers/BUILD +++ b/pkg/printers/BUILD @@ -26,7 +26,7 @@ go_library( "//vendor/github.com/ghodss/yaml:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -75,7 +75,7 @@ go_test( deps = [ "//pkg/apis/core:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", ], ) diff --git a/pkg/printers/humanreadable.go b/pkg/printers/humanreadable.go index 73ef967b15..5761ea6c8e 100644 --- a/pkg/printers/humanreadable.go +++ b/pkg/printers/humanreadable.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -34,19 +34,19 @@ import ( ) type TablePrinter interface { - PrintTable(obj runtime.Object, options PrintOptions) (*metav1alpha1.Table, error) + PrintTable(obj runtime.Object, options PrintOptions) (*metav1beta1.Table, error) } type PrintHandler interface { Handler(columns, columnsWithWide []string, printFunc interface{}) error - TableHandler(columns []metav1alpha1.TableColumnDefinition, printFunc interface{}) error - DefaultTableHandler(columns []metav1alpha1.TableColumnDefinition, printFunc interface{}) error + TableHandler(columns []metav1beta1.TableColumnDefinition, printFunc interface{}) error + DefaultTableHandler(columns []metav1beta1.TableColumnDefinition, printFunc interface{}) error } var withNamespacePrefixColumns = []string{"NAMESPACE"} // TODO(erictune): print cluster name too. type handlerEntry struct { - columnDefinitions []metav1alpha1.TableColumnDefinition + columnDefinitions []metav1beta1.TableColumnDefinition printRows bool printFunc reflect.Value args []reflect.Value @@ -126,15 +126,15 @@ func (h *HumanReadablePrinter) EnsurePrintHeaders() { // Handler adds a print handler with a given set of columns to HumanReadablePrinter instance. // See ValidatePrintHandlerFunc for required method signature. func (h *HumanReadablePrinter) Handler(columns, columnsWithWide []string, printFunc interface{}) error { - var columnDefinitions []metav1alpha1.TableColumnDefinition + var columnDefinitions []metav1beta1.TableColumnDefinition for _, column := range columns { - columnDefinitions = append(columnDefinitions, metav1alpha1.TableColumnDefinition{ + columnDefinitions = append(columnDefinitions, metav1beta1.TableColumnDefinition{ Name: column, Type: "string", }) } for _, column := range columnsWithWide { - columnDefinitions = append(columnDefinitions, metav1alpha1.TableColumnDefinition{ + columnDefinitions = append(columnDefinitions, metav1beta1.TableColumnDefinition{ Name: column, Type: "string", Priority: 1, @@ -164,7 +164,7 @@ func (h *HumanReadablePrinter) Handler(columns, columnsWithWide []string, printF // TableHandler adds a print handler with a given set of columns to HumanReadablePrinter instance. // See ValidateRowPrintHandlerFunc for required method signature. -func (h *HumanReadablePrinter) TableHandler(columnDefinitions []metav1alpha1.TableColumnDefinition, printFunc interface{}) error { +func (h *HumanReadablePrinter) TableHandler(columnDefinitions []metav1beta1.TableColumnDefinition, printFunc interface{}) error { printFuncValue := reflect.ValueOf(printFunc) if err := ValidateRowPrintHandlerFunc(printFuncValue); err != nil { utilruntime.HandleError(fmt.Errorf("unable to register print function: %v", err)) @@ -189,7 +189,7 @@ func (h *HumanReadablePrinter) TableHandler(columnDefinitions []metav1alpha1.Tab // DefaultTableHandler registers a set of columns and a print func that is given a chance to process // any object without an explicit handler. Only the most recently set print handler is used. // See ValidateRowPrintHandlerFunc for required method signature. -func (h *HumanReadablePrinter) DefaultTableHandler(columnDefinitions []metav1alpha1.TableColumnDefinition, printFunc interface{}) error { +func (h *HumanReadablePrinter) DefaultTableHandler(columnDefinitions []metav1beta1.TableColumnDefinition, printFunc interface{}) error { printFuncValue := reflect.ValueOf(printFunc) if err := ValidateRowPrintHandlerFunc(printFuncValue); err != nil { utilruntime.HandleError(fmt.Errorf("unable to register print function: %v", err)) @@ -208,7 +208,7 @@ func (h *HumanReadablePrinter) DefaultTableHandler(columnDefinitions []metav1alp // ValidateRowPrintHandlerFunc validates print handler signature. // printFunc is the function that will be called to print an object. // It must be of the following type: -// func printFunc(object ObjectType, options PrintOptions) ([]metav1alpha1.TableRow, error) +// func printFunc(object ObjectType, options PrintOptions) ([]metav1beta1.TableRow, error) // where ObjectType is the type of the object that will be printed, and the first // return value is an array of rows, with each row containing a number of cells that // match the number of columns defined for that printer function. @@ -222,10 +222,10 @@ func ValidateRowPrintHandlerFunc(printFunc reflect.Value) error { "Must accept 2 parameters and return 2 value.") } if funcType.In(1) != reflect.TypeOf((*PrintOptions)(nil)).Elem() || - funcType.Out(0) != reflect.TypeOf((*[]metav1alpha1.TableRow)(nil)).Elem() || + funcType.Out(0) != reflect.TypeOf((*[]metav1beta1.TableRow)(nil)).Elem() || funcType.Out(1) != reflect.TypeOf((*error)(nil)).Elem() { return fmt.Errorf("invalid print handler. The expected signature is: "+ - "func handler(obj %v, options PrintOptions) ([]metav1alpha1.TableRow, error)", funcType.In(0)) + "func handler(obj %v, options PrintOptions) ([]metav1beta1.TableRow, error)", funcType.In(0)) } return nil } @@ -303,7 +303,7 @@ func (h *HumanReadablePrinter) PrintObj(obj runtime.Object, output io.Writer) er } // display tables following the rules of options - if table, ok := obj.(*metav1alpha1.Table); ok { + if table, ok := obj.(*metav1beta1.Table); ok { if err := DecorateTable(table, h.options); err != nil { return err } @@ -341,10 +341,10 @@ func (h *HumanReadablePrinter) PrintObj(obj runtime.Object, output io.Writer) er return fmt.Errorf("error: unknown type %#v", obj) } -func hasCondition(conditions []metav1alpha1.TableRowCondition, t metav1alpha1.RowConditionType) bool { +func hasCondition(conditions []metav1beta1.TableRowCondition, t metav1beta1.RowConditionType) bool { for _, condition := range conditions { if condition.Type == t { - return condition.Status == metav1alpha1.ConditionTrue + return condition.Status == metav1beta1.ConditionTrue } } return false @@ -353,7 +353,7 @@ func hasCondition(conditions []metav1alpha1.TableRowCondition, t metav1alpha1.Ro // PrintTable prints a table to the provided output respecting the filtering rules for options // for wide columns and filetred rows. It filters out rows that are Completed. You should call // DecorateTable if you receive a table from a remote server before calling PrintTable. -func PrintTable(table *metav1alpha1.Table, output io.Writer, options PrintOptions) error { +func PrintTable(table *metav1beta1.Table, output io.Writer, options PrintOptions) error { if !options.NoHeaders { first := true for _, column := range table.ColumnDefinitions { @@ -370,7 +370,7 @@ func PrintTable(table *metav1alpha1.Table, output io.Writer, options PrintOption fmt.Fprintln(output) } for _, row := range table.Rows { - if !options.ShowAll && hasCondition(row.Conditions, metav1alpha1.RowCompleted) { + if !options.ShowAll && hasCondition(row.Conditions, metav1beta1.RowCompleted) { continue } first := true @@ -397,7 +397,7 @@ func PrintTable(table *metav1alpha1.Table, output io.Writer, options PrintOption // namespace column. It will fill empty columns with nil (if the object // does not expose metadata). It returns an error if the table cannot // be decorated. -func DecorateTable(table *metav1alpha1.Table, options PrintOptions) error { +func DecorateTable(table *metav1beta1.Table, options PrintOptions) error { width := len(table.ColumnDefinitions) + len(options.ColumnLabels) if options.WithNamespace { width++ @@ -420,22 +420,22 @@ func DecorateTable(table *metav1alpha1.Table, options PrintOptions) error { } if width != len(table.ColumnDefinitions) { - columns = make([]metav1alpha1.TableColumnDefinition, 0, width) + columns = make([]metav1beta1.TableColumnDefinition, 0, width) if options.WithNamespace { - columns = append(columns, metav1alpha1.TableColumnDefinition{ + columns = append(columns, metav1beta1.TableColumnDefinition{ Name: "Namespace", Type: "string", }) } columns = append(columns, table.ColumnDefinitions...) for _, label := range formatLabelHeaders(options.ColumnLabels) { - columns = append(columns, metav1alpha1.TableColumnDefinition{ + columns = append(columns, metav1beta1.TableColumnDefinition{ Name: label, Type: "string", }) } if options.ShowLabels { - columns = append(columns, metav1alpha1.TableColumnDefinition{ + columns = append(columns, metav1beta1.TableColumnDefinition{ Name: "Labels", Type: "string", }) @@ -492,7 +492,7 @@ func DecorateTable(table *metav1alpha1.Table, options PrintOptions) error { // PrintTable returns a table for the provided object, using the printer registered for that type. It returns // a table that includes all of the information requested by options, but will not remove rows or columns. The // caller is responsible for applying rules related to filtering rows or columns. -func (h *HumanReadablePrinter) PrintTable(obj runtime.Object, options PrintOptions) (*metav1alpha1.Table, error) { +func (h *HumanReadablePrinter) PrintTable(obj runtime.Object, options PrintOptions) (*metav1beta1.Table, error) { t := reflect.TypeOf(obj) handler, ok := h.handlerMap[t] if !ok { @@ -510,7 +510,7 @@ func (h *HumanReadablePrinter) PrintTable(obj runtime.Object, options PrintOptio columns := handler.columnDefinitions if !options.Wide { - columns = make([]metav1alpha1.TableColumnDefinition, 0, len(handler.columnDefinitions)) + columns = make([]metav1beta1.TableColumnDefinition, 0, len(handler.columnDefinitions)) for i := range handler.columnDefinitions { if handler.columnDefinitions[i].Priority != 0 { continue @@ -518,12 +518,12 @@ func (h *HumanReadablePrinter) PrintTable(obj runtime.Object, options PrintOptio columns = append(columns, handler.columnDefinitions[i]) } } - table := &metav1alpha1.Table{ + table := &metav1beta1.Table{ ListMeta: metav1.ListMeta{ ResourceVersion: "", }, ColumnDefinitions: columns, - Rows: results[0].Interface().([]metav1alpha1.TableRow), + Rows: results[0].Interface().([]metav1beta1.TableRow), } if m, err := meta.ListAccessor(obj); err == nil { table.ResourceVersion = m.GetResourceVersion() @@ -582,7 +582,7 @@ func printRowsForHandlerEntry(output io.Writer, handler *handlerEntry, obj runti } if results[1].IsNil() { - rows := results[0].Interface().([]metav1alpha1.TableRow) + rows := results[0].Interface().([]metav1beta1.TableRow) printRows(output, rows, options) return nil } @@ -590,7 +590,7 @@ func printRowsForHandlerEntry(output io.Writer, handler *handlerEntry, obj runti } // printRows writes the provided rows to output. -func printRows(output io.Writer, rows []metav1alpha1.TableRow, options PrintOptions) { +func printRows(output io.Writer, rows []metav1beta1.TableRow, options PrintOptions) { for _, row := range rows { if options.WithNamespace { if obj := row.Object.Object; obj != nil { @@ -630,9 +630,9 @@ func printRows(output io.Writer, rows []metav1alpha1.TableRow, options PrintOpti // legacyPrinterToTable uses the old printFunc with tabbed writer to generate a table. // TODO: remove when all legacy printers are removed. -func (h *HumanReadablePrinter) legacyPrinterToTable(obj runtime.Object, handler *handlerEntry) (*metav1alpha1.Table, error) { +func (h *HumanReadablePrinter) legacyPrinterToTable(obj runtime.Object, handler *handlerEntry) (*metav1beta1.Table, error) { printFunc := handler.printFunc - table := &metav1alpha1.Table{ + table := &metav1beta1.Table{ ColumnDefinitions: handler.columnDefinitions, } @@ -659,7 +659,7 @@ func (h *HumanReadablePrinter) legacyPrinterToTable(obj runtime.Object, handler } for len(data) > 0 { cells, remainder := tabbedLineToCells(data, len(table.ColumnDefinitions)) - table.Rows = append(table.Rows, metav1alpha1.TableRow{ + table.Rows = append(table.Rows, metav1beta1.TableRow{ Cells: cells, Object: runtime.RawExtension{Object: items[i]}, }) @@ -674,7 +674,7 @@ func (h *HumanReadablePrinter) legacyPrinterToTable(obj runtime.Object, handler } data := buf.Bytes() cells, _ := tabbedLineToCells(data, len(table.ColumnDefinitions)) - table.Rows = append(table.Rows, metav1alpha1.TableRow{ + table.Rows = append(table.Rows, metav1beta1.TableRow{ Cells: cells, Object: runtime.RawExtension{Object: obj}, }) diff --git a/pkg/printers/humanreadable_test.go b/pkg/printers/humanreadable_test.go index 779f6b748c..bfd1d78745 100644 --- a/pkg/printers/humanreadable_test.go +++ b/pkg/printers/humanreadable_test.go @@ -23,26 +23,26 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" api "k8s.io/kubernetes/pkg/apis/core" ) -var testNamespaceColumnDefinitions = []metav1alpha1.TableColumnDefinition{ +var testNamespaceColumnDefinitions = []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Status", Type: "string", Description: "The status of the namespace"}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, } -func testPrintNamespace(obj *api.Namespace, options PrintOptions) ([]metav1alpha1.TableRow, error) { +func testPrintNamespace(obj *api.Namespace, options PrintOptions) ([]metav1beta1.TableRow, error) { if options.WithNamespace { return nil, fmt.Errorf("namespace is not namespaced") } - row := metav1alpha1.TableRow{ + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, obj.Status.Phase, "") - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } func TestPrintRowsForHandlerEntry(t *testing.T) { @@ -58,7 +58,7 @@ func TestPrintRowsForHandlerEntry(t *testing.T) { }{ "no tablecolumndefinition and includeheader flase": { h: &handlerEntry{ - columnDefinitions: []metav1alpha1.TableColumnDefinition{}, + columnDefinitions: []metav1beta1.TableColumnDefinition{}, printRows: true, printFunc: printFunc, }, @@ -71,7 +71,7 @@ func TestPrintRowsForHandlerEntry(t *testing.T) { }, "no tablecolumndefinition and includeheader true": { h: &handlerEntry{ - columnDefinitions: []metav1alpha1.TableColumnDefinition{}, + columnDefinitions: []metav1beta1.TableColumnDefinition{}, printRows: true, printFunc: printFunc, }, diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD index edbd167520..8392537398 100644 --- a/pkg/printers/internalversion/BUILD +++ b/pkg/printers/internalversion/BUILD @@ -37,7 +37,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/yaml:go_default_library", @@ -97,7 +97,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/printers/internalversion/printers.go b/pkg/printers/internalversion/printers.go index 49df1b8215..aeb4f81e0f 100644 --- a/pkg/printers/internalversion/printers.go +++ b/pkg/printers/internalversion/printers.go @@ -37,7 +37,7 @@ import ( storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" @@ -72,7 +72,7 @@ const ( // AddHandlers adds print handlers for default Kubernetes types dealing with internal versions. // TODO: handle errors from Handler func AddHandlers(h printers.PrintHandler) { - podColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + podColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Ready", Type: "string", Description: "The aggregate readiness state of this pod for accepting traffic."}, {Name: "Status", Type: "string", Description: "The aggregate status of the containers in this pod."}, @@ -84,7 +84,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(podColumnDefinitions, printPodList) h.TableHandler(podColumnDefinitions, printPod) - podTemplateColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + podTemplateColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Containers", Type: "string", Description: "Names of each container in the template."}, {Name: "Images", Type: "string", Description: "Images referenced by each container in the template."}, @@ -93,7 +93,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(podTemplateColumnDefinitions, printPodTemplate) h.TableHandler(podTemplateColumnDefinitions, printPodTemplateList) - podDisruptionBudgetColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + podDisruptionBudgetColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Min Available", Type: "string", Description: "The minimum number of pods that must be available."}, {Name: "Max Unavailable", Type: "string", Description: "The maximum number of pods that may be unavailable."}, @@ -103,7 +103,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(podDisruptionBudgetColumnDefinitions, printPodDisruptionBudget) h.TableHandler(podDisruptionBudgetColumnDefinitions, printPodDisruptionBudgetList) - replicationControllerColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + replicationControllerColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "integer", Description: apiv1.ReplicationControllerSpec{}.SwaggerDoc()["replicas"]}, {Name: "Current", Type: "integer", Description: apiv1.ReplicationControllerStatus{}.SwaggerDoc()["replicas"]}, @@ -116,7 +116,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(replicationControllerColumnDefinitions, printReplicationController) h.TableHandler(replicationControllerColumnDefinitions, printReplicationControllerList) - replicaSetColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + replicaSetColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "integer", Description: extensionsv1beta1.ReplicaSetSpec{}.SwaggerDoc()["replicas"]}, {Name: "Current", Type: "integer", Description: extensionsv1beta1.ReplicaSetStatus{}.SwaggerDoc()["replicas"]}, @@ -129,7 +129,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(replicaSetColumnDefinitions, printReplicaSet) h.TableHandler(replicaSetColumnDefinitions, printReplicaSetList) - daemonSetColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + daemonSetColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "integer", Description: extensionsv1beta1.DaemonSetStatus{}.SwaggerDoc()["desiredNumberScheduled"]}, {Name: "Current", Type: "integer", Description: extensionsv1beta1.DaemonSetStatus{}.SwaggerDoc()["currentNumberScheduled"]}, @@ -145,7 +145,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(daemonSetColumnDefinitions, printDaemonSet) h.TableHandler(daemonSetColumnDefinitions, printDaemonSetList) - jobColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + jobColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "integer", Description: batchv1.JobSpec{}.SwaggerDoc()["completions"]}, {Name: "Successful", Type: "integer", Description: batchv1.JobStatus{}.SwaggerDoc()["succeeded"]}, @@ -157,7 +157,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(jobColumnDefinitions, printJob) h.TableHandler(jobColumnDefinitions, printJobList) - cronJobColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + cronJobColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Schedule", Type: "string", Description: batchv1beta1.CronJobSpec{}.SwaggerDoc()["schedule"]}, {Name: "Suspend", Type: "boolean", Description: batchv1beta1.CronJobSpec{}.SwaggerDoc()["suspend"]}, @@ -171,7 +171,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(cronJobColumnDefinitions, printCronJob) h.TableHandler(cronJobColumnDefinitions, printCronJobList) - serviceColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + serviceColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Type", Type: "string", Description: apiv1.ServiceSpec{}.SwaggerDoc()["type"]}, {Name: "Cluster-IP", Type: "string", Description: apiv1.ServiceSpec{}.SwaggerDoc()["clusterIP"]}, @@ -184,7 +184,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(serviceColumnDefinitions, printService) h.TableHandler(serviceColumnDefinitions, printServiceList) - ingressColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + ingressColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Hosts", Type: "string", Description: "Hosts that incoming requests are matched against before the ingress rule"}, {Name: "Address", Type: "string", Description: "Address is a list containing ingress points for the load-balancer"}, @@ -194,7 +194,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(ingressColumnDefinitions, printIngress) h.TableHandler(ingressColumnDefinitions, printIngressList) - statefulSetColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + statefulSetColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "string", Description: appsv1beta1.StatefulSetSpec{}.SwaggerDoc()["replicas"]}, {Name: "Current", Type: "string", Description: appsv1beta1.StatefulSetStatus{}.SwaggerDoc()["replicas"]}, @@ -205,7 +205,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(statefulSetColumnDefinitions, printStatefulSet) h.TableHandler(statefulSetColumnDefinitions, printStatefulSetList) - endpointColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + endpointColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Endpoints", Type: "string", Description: apiv1.Endpoints{}.SwaggerDoc()["subsets"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -213,7 +213,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(endpointColumnDefinitions, printEndpoints) h.TableHandler(endpointColumnDefinitions, printEndpointsList) - nodeColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + nodeColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Status", Type: "string", Description: "The status of the node"}, {Name: "Roles", Type: "string", Description: "The roles of the node"}, @@ -228,7 +228,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(nodeColumnDefinitions, printNode) h.TableHandler(nodeColumnDefinitions, printNodeList) - eventColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + eventColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Last Seen", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["lastTimestamp"]}, {Name: "First Seen", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["firstTimestamp"]}, {Name: "Count", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["count"]}, @@ -243,7 +243,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(eventColumnDefinitions, printEvent) h.TableHandler(eventColumnDefinitions, printEventList) - namespaceColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + namespaceColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Status", Type: "string", Description: "The status of the namespace"}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -251,7 +251,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(namespaceColumnDefinitions, printNamespace) h.TableHandler(namespaceColumnDefinitions, printNamespaceList) - secretColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + secretColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Type", Type: "string", Description: apiv1.Secret{}.SwaggerDoc()["type"]}, {Name: "Data", Type: "string", Description: apiv1.Secret{}.SwaggerDoc()["data"]}, @@ -260,7 +260,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(secretColumnDefinitions, printSecret) h.TableHandler(secretColumnDefinitions, printSecretList) - serviceAccountColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + serviceAccountColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Secrets", Type: "string", Description: apiv1.ServiceAccount{}.SwaggerDoc()["secrets"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -268,7 +268,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(serviceAccountColumnDefinitions, printServiceAccount) h.TableHandler(serviceAccountColumnDefinitions, printServiceAccountList) - persistentVolumeColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + persistentVolumeColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Capacity", Type: "string", Description: apiv1.PersistentVolumeSpec{}.SwaggerDoc()["capacity"]}, {Name: "Access Modes", Type: "string", Description: apiv1.PersistentVolumeSpec{}.SwaggerDoc()["accessModes"]}, @@ -282,7 +282,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(persistentVolumeColumnDefinitions, printPersistentVolume) h.TableHandler(persistentVolumeColumnDefinitions, printPersistentVolumeList) - persistentVolumeClaimColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + persistentVolumeClaimColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Status", Type: "string", Description: apiv1.PersistentVolumeClaimStatus{}.SwaggerDoc()["phase"]}, {Name: "Volume", Type: "string", Description: apiv1.PersistentVolumeSpec{}.SwaggerDoc()["volumeName"]}, @@ -294,7 +294,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(persistentVolumeClaimColumnDefinitions, printPersistentVolumeClaim) h.TableHandler(persistentVolumeClaimColumnDefinitions, printPersistentVolumeClaimList) - componentStatusColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + componentStatusColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Status", Type: "string", Description: "Status of the component conditions"}, {Name: "Message", Type: "string", Description: "Message of the component conditions"}, @@ -303,7 +303,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(componentStatusColumnDefinitions, printComponentStatus) h.TableHandler(componentStatusColumnDefinitions, printComponentStatusList) - deploymentColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + deploymentColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Desired", Type: "string", Description: extensionsv1beta1.DeploymentSpec{}.SwaggerDoc()["replicas"]}, {Name: "Current", Type: "string", Description: extensionsv1beta1.DeploymentStatus{}.SwaggerDoc()["replicas"]}, @@ -317,7 +317,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(deploymentColumnDefinitions, printDeployment) h.TableHandler(deploymentColumnDefinitions, printDeploymentList) - horizontalPodAutoscalerColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + horizontalPodAutoscalerColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Reference", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["scaleTargetRef"]}, {Name: "Targets", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["metrics"]}, @@ -329,7 +329,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(horizontalPodAutoscalerColumnDefinitions, printHorizontalPodAutoscaler) h.TableHandler(horizontalPodAutoscalerColumnDefinitions, printHorizontalPodAutoscalerList) - configMapColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + configMapColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Data", Type: "string", Description: apiv1.ConfigMap{}.SwaggerDoc()["data"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -337,7 +337,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(configMapColumnDefinitions, printConfigMap) h.TableHandler(configMapColumnDefinitions, printConfigMapList) - podSecurityPolicyColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + podSecurityPolicyColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Data", Type: "string", Description: extensionsv1beta1.PodSecurityPolicySpec{}.SwaggerDoc()["privileged"]}, {Name: "Caps", Type: "string", Description: extensionsv1beta1.PodSecurityPolicySpec{}.SwaggerDoc()["allowedCapabilities"]}, @@ -351,7 +351,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicy) h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicyList) - networkPolicyColumnDefinitioins := []metav1alpha1.TableColumnDefinition{ + networkPolicyColumnDefinitioins := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Pod-Selector", Type: "string", Description: extensionsv1beta1.NetworkPolicySpec{}.SwaggerDoc()["podSelector"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -359,7 +359,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(networkPolicyColumnDefinitioins, printNetworkPolicy) h.TableHandler(networkPolicyColumnDefinitioins, printNetworkPolicyList) - roleBindingsColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + roleBindingsColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, {Name: "Role", Type: "string", Priority: 1, Description: rbacv1beta1.RoleBinding{}.SwaggerDoc()["roleRef"]}, @@ -370,7 +370,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(roleBindingsColumnDefinitions, printRoleBinding) h.TableHandler(roleBindingsColumnDefinitions, printRoleBindingList) - clusterRoleBindingsColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + clusterRoleBindingsColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, {Name: "Role", Type: "string", Priority: 1, Description: rbacv1beta1.ClusterRoleBinding{}.SwaggerDoc()["roleRef"]}, @@ -381,7 +381,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(clusterRoleBindingsColumnDefinitions, printClusterRoleBinding) h.TableHandler(clusterRoleBindingsColumnDefinitions, printClusterRoleBindingList) - certificateSigningRequestColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + certificateSigningRequestColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, {Name: "Requestor", Type: "string", Description: certificatesv1beta1.CertificateSigningRequestSpec{}.SwaggerDoc()["request"]}, @@ -390,7 +390,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(certificateSigningRequestColumnDefinitions, printCertificateSigningRequest) h.TableHandler(certificateSigningRequestColumnDefinitions, printCertificateSigningRequestList) - storageClassColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + storageClassColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Provisioner", Type: "string", Description: storagev1.StorageClass{}.SwaggerDoc()["provisioner"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, @@ -399,7 +399,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(storageClassColumnDefinitions, printStorageClass) h.TableHandler(storageClassColumnDefinitions, printStorageClassList) - statusColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + statusColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Status", Type: "string", Description: metav1.Status{}.SwaggerDoc()["status"]}, {Name: "Reason", Type: "string", Description: metav1.Status{}.SwaggerDoc()["reason"]}, {Name: "Message", Type: "string", Description: metav1.Status{}.SwaggerDoc()["Message"]}, @@ -407,7 +407,7 @@ func AddHandlers(h printers.PrintHandler) { h.TableHandler(statusColumnDefinitions, printStatus) - controllerRevisionColumnDefinition := []metav1alpha1.TableColumnDefinition{ + controllerRevisionColumnDefinition := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Controller", Type: "string", Description: "Controller of the object"}, {Name: "Revision", Type: "string", Description: appsv1beta1.ControllerRevision{}.SwaggerDoc()["revision"]}, @@ -422,16 +422,16 @@ func AddHandlers(h printers.PrintHandler) { // AddDefaultHandlers adds handlers that can work with most Kubernetes objects. func AddDefaultHandlers(h printers.PrintHandler) { // types without defined columns - objectMetaColumnDefinitions := []metav1alpha1.TableColumnDefinition{ + objectMetaColumnDefinitions := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]}, } h.DefaultTableHandler(objectMetaColumnDefinitions, printObjectMeta) } -func printObjectMeta(obj runtime.Object, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { +func printObjectMeta(obj runtime.Object, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { if meta.IsListType(obj) { - rows := make([]metav1alpha1.TableRow, 0, 16) + rows := make([]metav1beta1.TableRow, 0, 16) err := meta.EachListItem(obj, func(obj runtime.Object) error { nestedRows, err := printObjectMeta(obj, options) if err != nil { @@ -446,12 +446,12 @@ func printObjectMeta(obj runtime.Object, options printers.PrintOptions) ([]metav return rows, nil } - rows := make([]metav1alpha1.TableRow, 0, 1) + rows := make([]metav1beta1.TableRow, 0, 1) m, err := meta.Accessor(obj) if err != nil { return nil, err } - row := metav1alpha1.TableRow{ + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, m.GetName(), translateTimestamp(m.GetCreationTimestamp())) @@ -504,12 +504,12 @@ func translateTimestamp(timestamp metav1.Time) string { } var ( - podSuccessConditions = []metav1alpha1.TableRowCondition{{Type: metav1alpha1.RowCompleted, Status: metav1alpha1.ConditionTrue, Reason: string(api.PodSucceeded), Message: "The pod has completed successfully."}} - podFailedConditions = []metav1alpha1.TableRowCondition{{Type: metav1alpha1.RowCompleted, Status: metav1alpha1.ConditionTrue, Reason: string(api.PodFailed), Message: "The pod failed."}} + podSuccessConditions = []metav1beta1.TableRowCondition{{Type: metav1beta1.RowCompleted, Status: metav1beta1.ConditionTrue, Reason: string(api.PodSucceeded), Message: "The pod has completed successfully."}} + podFailedConditions = []metav1beta1.TableRowCondition{{Type: metav1beta1.RowCompleted, Status: metav1beta1.ConditionTrue, Reason: string(api.PodFailed), Message: "The pod failed."}} ) -func printPodList(podList *api.PodList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(podList.Items)) +func printPodList(podList *api.PodList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(podList.Items)) for i := range podList.Items { r, err := printPod(&podList.Items[i], options) if err != nil { @@ -520,7 +520,7 @@ func printPodList(podList *api.PodList, options printers.PrintOptions) ([]metav1 return rows, nil } -func printPod(pod *api.Pod, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { +func printPod(pod *api.Pod, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { restarts := 0 totalContainers := len(pod.Spec.Containers) readyContainers := 0 @@ -530,7 +530,7 @@ func printPod(pod *api.Pod, options printers.PrintOptions) ([]metav1alpha1.Table reason = pod.Status.Reason } - row := metav1alpha1.TableRow{ + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: pod}, } @@ -614,20 +614,20 @@ func printPod(pod *api.Pod, options printers.PrintOptions) ([]metav1alpha1.Table } } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPodTemplate(obj *api.PodTemplate, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printPodTemplate(obj *api.PodTemplate, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } names, images := layoutContainerCells(obj.Template.Spec.Containers) row.Cells = append(row.Cells, obj.Name, names, images, labels.FormatLabels(obj.Template.Labels)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPodTemplateList(list *api.PodTemplateList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printPodTemplateList(list *api.PodTemplateList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printPodTemplate(&list.Items[i], options) if err != nil { @@ -638,8 +638,8 @@ func printPodTemplateList(list *api.PodTemplateList, options printers.PrintOptio return rows, nil } -func printPodDisruptionBudget(obj *policy.PodDisruptionBudget, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printPodDisruptionBudget(obj *policy.PodDisruptionBudget, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -658,11 +658,11 @@ func printPodDisruptionBudget(obj *policy.PodDisruptionBudget, options printers. } row.Cells = append(row.Cells, obj.Name, minAvailable, maxUnavailable, obj.Status.PodDisruptionsAllowed, translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPodDisruptionBudgetList(list *policy.PodDisruptionBudgetList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printPodDisruptionBudgetList(list *policy.PodDisruptionBudgetList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printPodDisruptionBudget(&list.Items[i], options) if err != nil { @@ -674,8 +674,8 @@ func printPodDisruptionBudgetList(list *policy.PodDisruptionBudgetList, options } // TODO(AdoHe): try to put wide output in a single method -func printReplicationController(obj *api.ReplicationController, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printReplicationController(obj *api.ReplicationController, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -688,11 +688,11 @@ func printReplicationController(obj *api.ReplicationController, options printers names, images := layoutContainerCells(obj.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images, labels.FormatLabels(obj.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printReplicationControllerList(list *api.ReplicationControllerList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printReplicationControllerList(list *api.ReplicationControllerList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printReplicationController(&list.Items[i], options) if err != nil { @@ -703,8 +703,8 @@ func printReplicationControllerList(list *api.ReplicationControllerList, options return rows, nil } -func printReplicaSet(obj *extensions.ReplicaSet, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printReplicaSet(obj *extensions.ReplicaSet, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -717,11 +717,11 @@ func printReplicaSet(obj *extensions.ReplicaSet, options printers.PrintOptions) names, images := layoutContainerCells(obj.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images, metav1.FormatLabelSelector(obj.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printReplicaSetList(list *extensions.ReplicaSetList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printReplicaSetList(list *extensions.ReplicaSetList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printReplicaSet(&list.Items[i], options) if err != nil { @@ -732,8 +732,8 @@ func printReplicaSetList(list *extensions.ReplicaSetList, options printers.Print return rows, nil } -func printJob(obj *batch.Job, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printJob(obj *batch.Job, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -749,11 +749,11 @@ func printJob(obj *batch.Job, options printers.PrintOptions) ([]metav1alpha1.Tab names, images := layoutContainerCells(obj.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images, metav1.FormatLabelSelector(obj.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printJobList(list *batch.JobList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printJobList(list *batch.JobList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printJob(&list.Items[i], options) if err != nil { @@ -764,8 +764,8 @@ func printJobList(list *batch.JobList, options printers.PrintOptions) ([]metav1a return rows, nil } -func printCronJob(obj *batch.CronJob, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printCronJob(obj *batch.CronJob, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -779,11 +779,11 @@ func printCronJob(obj *batch.CronJob, options printers.PrintOptions) ([]metav1al names, images := layoutContainerCells(obj.Spec.JobTemplate.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images, metav1.FormatLabelSelector(obj.Spec.JobTemplate.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printCronJobList(list *batch.CronJobList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printCronJobList(list *batch.CronJobList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printCronJob(&list.Items[i], options) if err != nil { @@ -858,8 +858,8 @@ func makePortString(ports []api.ServicePort) string { return strings.Join(pieces, ",") } -func printService(obj *api.Service, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printService(obj *api.Service, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } svcType := obj.Spec.Type @@ -878,11 +878,11 @@ func printService(obj *api.Service, options printers.PrintOptions) ([]metav1alph row.Cells = append(row.Cells, labels.FormatLabels(obj.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printServiceList(list *api.ServiceList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printServiceList(list *api.ServiceList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printService(&list.Items[i], options) if err != nil { @@ -930,8 +930,8 @@ func formatPorts(tls []extensions.IngressTLS) string { return "80" } -func printIngress(obj *extensions.Ingress, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printIngress(obj *extensions.Ingress, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } hosts := formatHosts(obj.Spec.Rules) @@ -939,11 +939,11 @@ func printIngress(obj *extensions.Ingress, options printers.PrintOptions) ([]met ports := formatPorts(obj.Spec.TLS) createTime := translateTimestamp(obj.CreationTimestamp) row.Cells = append(row.Cells, obj.Name, hosts, address, ports, createTime) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printIngressList(list *extensions.IngressList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printIngressList(list *extensions.IngressList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printIngress(&list.Items[i], options) if err != nil { @@ -954,8 +954,8 @@ func printIngressList(list *extensions.IngressList, options printers.PrintOption return rows, nil } -func printStatefulSet(obj *apps.StatefulSet, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printStatefulSet(obj *apps.StatefulSet, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } desiredReplicas := obj.Spec.Replicas @@ -966,11 +966,11 @@ func printStatefulSet(obj *apps.StatefulSet, options printers.PrintOptions) ([]m names, images := layoutContainerCells(obj.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printStatefulSetList(list *apps.StatefulSetList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printStatefulSetList(list *apps.StatefulSetList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printStatefulSet(&list.Items[i], options) if err != nil { @@ -981,8 +981,8 @@ func printStatefulSetList(list *apps.StatefulSetList, options printers.PrintOpti return rows, nil } -func printDaemonSet(obj *extensions.DaemonSet, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printDaemonSet(obj *extensions.DaemonSet, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -997,11 +997,11 @@ func printDaemonSet(obj *extensions.DaemonSet, options printers.PrintOptions) ([ names, images := layoutContainerCells(obj.Spec.Template.Spec.Containers) row.Cells = append(row.Cells, names, images, metav1.FormatLabelSelector(obj.Spec.Selector)) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printDaemonSetList(list *extensions.DaemonSetList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printDaemonSetList(list *extensions.DaemonSetList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printDaemonSet(&list.Items[i], options) if err != nil { @@ -1012,16 +1012,16 @@ func printDaemonSetList(list *extensions.DaemonSetList, options printers.PrintOp return rows, nil } -func printEndpoints(obj *api.Endpoints, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printEndpoints(obj *api.Endpoints, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, formatEndpoints(obj, nil), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printEndpointsList(list *api.EndpointsList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printEndpointsList(list *api.EndpointsList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printEndpoints(&list.Items[i], options) if err != nil { @@ -1032,16 +1032,16 @@ func printEndpointsList(list *api.EndpointsList, options printers.PrintOptions) return rows, nil } -func printNamespace(obj *api.Namespace, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printNamespace(obj *api.Namespace, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, obj.Status.Phase, translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printNamespaceList(list *api.NamespaceList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printNamespaceList(list *api.NamespaceList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printNamespace(&list.Items[i], options) if err != nil { @@ -1052,16 +1052,16 @@ func printNamespaceList(list *api.NamespaceList, options printers.PrintOptions) return rows, nil } -func printSecret(obj *api.Secret, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printSecret(obj *api.Secret, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, obj.Type, len(obj.Data), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printSecretList(list *api.SecretList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printSecretList(list *api.SecretList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printSecret(&list.Items[i], options) if err != nil { @@ -1072,16 +1072,16 @@ func printSecretList(list *api.SecretList, options printers.PrintOptions) ([]met return rows, nil } -func printServiceAccount(obj *api.ServiceAccount, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printServiceAccount(obj *api.ServiceAccount, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, len(obj.Secrets), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printServiceAccountList(list *api.ServiceAccountList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printServiceAccountList(list *api.ServiceAccountList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printServiceAccount(&list.Items[i], options) if err != nil { @@ -1092,8 +1092,8 @@ func printServiceAccountList(list *api.ServiceAccountList, options printers.Prin return rows, nil } -func printNode(obj *api.Node, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printNode(obj *api.Node, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1140,7 +1140,7 @@ func printNode(obj *api.Node, options printers.PrintOptions) ([]metav1alpha1.Tab row.Cells = append(row.Cells, getNodeExternalIP(obj), osImage, kernelVersion, crVersion) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } // Returns first external ip of the node or "" if none is found. @@ -1174,8 +1174,8 @@ func findNodeRoles(node *api.Node) []string { return roles.List() } -func printNodeList(list *api.NodeList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printNodeList(list *api.NodeList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printNode(&list.Items[i], options) if err != nil { @@ -1186,8 +1186,8 @@ func printNodeList(list *api.NodeList, options printers.PrintOptions) ([]metav1a return rows, nil } -func printPersistentVolume(obj *api.PersistentVolume, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printPersistentVolume(obj *api.PersistentVolume, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1213,11 +1213,11 @@ func printPersistentVolume(obj *api.PersistentVolume, options printers.PrintOpti phase, claimRefUID, helper.GetPersistentVolumeClass(obj), obj.Status.Reason, translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPersistentVolumeList(list *api.PersistentVolumeList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printPersistentVolumeList(list *api.PersistentVolumeList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printPersistentVolume(&list.Items[i], options) if err != nil { @@ -1228,8 +1228,8 @@ func printPersistentVolumeList(list *api.PersistentVolumeList, options printers. return rows, nil } -func printPersistentVolumeClaim(obj *api.PersistentVolumeClaim, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printPersistentVolumeClaim(obj *api.PersistentVolumeClaim, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1248,11 +1248,11 @@ func printPersistentVolumeClaim(obj *api.PersistentVolumeClaim, options printers } row.Cells = append(row.Cells, obj.Name, phase, obj.Spec.VolumeName, capacity, accessModes, helper.GetPersistentVolumeClaimClass(obj), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPersistentVolumeClaimList(list *api.PersistentVolumeClaimList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printPersistentVolumeClaimList(list *api.PersistentVolumeClaimList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printPersistentVolumeClaim(&list.Items[i], options) if err != nil { @@ -1263,8 +1263,8 @@ func printPersistentVolumeClaimList(list *api.PersistentVolumeClaimList, options return rows, nil } -func printEvent(obj *api.Event, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printEvent(obj *api.Event, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } // While watching event, we should print absolute time. @@ -1281,13 +1281,13 @@ func printEvent(obj *api.Event, options printers.PrintOptions) ([]metav1alpha1.T obj.InvolvedObject.FieldPath, obj.Type, obj.Reason, formatEventSource(obj.Source), obj.Message) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } // Sorts and prints the EventList in a human-friendly format. -func printEventList(list *api.EventList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { +func printEventList(list *api.EventList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { sort.Sort(events.SortableEvents(list.Items)) - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printEvent(&list.Items[i], options) if err != nil { @@ -1298,8 +1298,8 @@ func printEventList(list *api.EventList, options printers.PrintOptions) ([]metav return rows, nil } -func printRoleBinding(obj *rbac.RoleBinding, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printRoleBinding(obj *rbac.RoleBinding, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1309,12 +1309,12 @@ func printRoleBinding(obj *rbac.RoleBinding, options printers.PrintOptions) ([]m users, groups, sas, _ := rbac.SubjectsStrings(obj.Subjects) row.Cells = append(row.Cells, roleRef, strings.Join(users, ", "), strings.Join(groups, ", "), strings.Join(sas, ", ")) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } // Prints the RoleBinding in a human-friendly format. -func printRoleBindingList(list *rbac.RoleBindingList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printRoleBindingList(list *rbac.RoleBindingList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printRoleBinding(&list.Items[i], options) if err != nil { @@ -1325,8 +1325,8 @@ func printRoleBindingList(list *rbac.RoleBindingList, options printers.PrintOpti return rows, nil } -func printClusterRoleBinding(obj *rbac.ClusterRoleBinding, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printClusterRoleBinding(obj *rbac.ClusterRoleBinding, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1336,12 +1336,12 @@ func printClusterRoleBinding(obj *rbac.ClusterRoleBinding, options printers.Prin users, groups, sas, _ := rbac.SubjectsStrings(obj.Subjects) row.Cells = append(row.Cells, roleRef, strings.Join(users, ", "), strings.Join(groups, ", "), strings.Join(sas, ", ")) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } // Prints the ClusterRoleBinding in a human-friendly format. -func printClusterRoleBindingList(list *rbac.ClusterRoleBindingList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printClusterRoleBindingList(list *rbac.ClusterRoleBindingList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printClusterRoleBinding(&list.Items[i], options) if err != nil { @@ -1352,8 +1352,8 @@ func printClusterRoleBindingList(list *rbac.ClusterRoleBindingList, options prin return rows, nil } -func printCertificateSigningRequest(obj *certificates.CertificateSigningRequest, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printCertificateSigningRequest(obj *certificates.CertificateSigningRequest, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } status, err := extractCSRStatus(obj) @@ -1361,7 +1361,7 @@ func printCertificateSigningRequest(obj *certificates.CertificateSigningRequest, return nil, err } row.Cells = append(row.Cells, obj.Name, translateTimestamp(obj.CreationTimestamp), obj.Spec.Username, status) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } func extractCSRStatus(csr *certificates.CertificateSigningRequest) (string, error) { @@ -1391,8 +1391,8 @@ func extractCSRStatus(csr *certificates.CertificateSigningRequest) (string, erro return status, nil } -func printCertificateSigningRequestList(list *certificates.CertificateSigningRequestList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printCertificateSigningRequestList(list *certificates.CertificateSigningRequestList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printCertificateSigningRequest(&list.Items[i], options) if err != nil { @@ -1403,8 +1403,8 @@ func printCertificateSigningRequestList(list *certificates.CertificateSigningReq return rows, nil } -func printComponentStatus(obj *api.ComponentStatus, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printComponentStatus(obj *api.ComponentStatus, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } status := "Unknown" @@ -1423,11 +1423,11 @@ func printComponentStatus(obj *api.ComponentStatus, options printers.PrintOption } } row.Cells = append(row.Cells, obj.Name, status, message, error) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printComponentStatusList(list *api.ComponentStatusList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printComponentStatusList(list *api.ComponentStatusList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printComponentStatus(&list.Items[i], options) if err != nil { @@ -1445,8 +1445,8 @@ func truncate(str string, maxLen int) string { return str } -func printDeployment(obj *extensions.Deployment, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printDeployment(obj *extensions.Deployment, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } desiredReplicas := obj.Spec.Replicas @@ -1465,11 +1465,11 @@ func printDeployment(obj *extensions.Deployment, options printers.PrintOptions) containers, images := layoutContainerCells(containers) row.Cells = append(row.Cells, containers, images, selector.String()) } - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printDeploymentList(list *extensions.DeploymentList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printDeploymentList(list *extensions.DeploymentList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printDeployment(&list.Items[i], options) if err != nil { @@ -1540,8 +1540,8 @@ func formatHPAMetrics(specs []autoscaling.MetricSpec, statuses []autoscaling.Met return ret } -func printHorizontalPodAutoscaler(obj *autoscaling.HorizontalPodAutoscaler, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printHorizontalPodAutoscaler(obj *autoscaling.HorizontalPodAutoscaler, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1556,11 +1556,11 @@ func printHorizontalPodAutoscaler(obj *autoscaling.HorizontalPodAutoscaler, opti maxPods := obj.Spec.MaxReplicas currentReplicas := obj.Status.CurrentReplicas row.Cells = append(row.Cells, obj.Name, reference, metrics, minPods, maxPods, currentReplicas, translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printHorizontalPodAutoscalerList(list *autoscaling.HorizontalPodAutoscalerList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printHorizontalPodAutoscalerList(list *autoscaling.HorizontalPodAutoscalerList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printHorizontalPodAutoscaler(&list.Items[i], options) if err != nil { @@ -1571,16 +1571,16 @@ func printHorizontalPodAutoscalerList(list *autoscaling.HorizontalPodAutoscalerL return rows, nil } -func printConfigMap(obj *api.ConfigMap, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printConfigMap(obj *api.ConfigMap, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, len(obj.Data), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printConfigMapList(list *api.ConfigMapList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printConfigMapList(list *api.ConfigMapList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printConfigMap(&list.Items[i], options) if err != nil { @@ -1591,18 +1591,18 @@ func printConfigMapList(list *api.ConfigMapList, options printers.PrintOptions) return rows, nil } -func printPodSecurityPolicy(obj *extensions.PodSecurityPolicy, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printPodSecurityPolicy(obj *extensions.PodSecurityPolicy, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, obj.Spec.Privileged, obj.Spec.AllowedCapabilities, obj.Spec.SELinux.Rule, obj.Spec.RunAsUser.Rule, obj.Spec.FSGroup.Rule, obj.Spec.SupplementalGroups.Rule, obj.Spec.ReadOnlyRootFilesystem, obj.Spec.Volumes) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printPodSecurityPolicyList(list *extensions.PodSecurityPolicyList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printPodSecurityPolicyList(list *extensions.PodSecurityPolicyList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printPodSecurityPolicy(&list.Items[i], options) if err != nil { @@ -1613,16 +1613,16 @@ func printPodSecurityPolicyList(list *extensions.PodSecurityPolicyList, options return rows, nil } -func printNetworkPolicy(obj *networking.NetworkPolicy, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printNetworkPolicy(obj *networking.NetworkPolicy, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Name, metav1.FormatLabelSelector(&obj.Spec.PodSelector), translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printNetworkPolicyList(list *networking.NetworkPolicyList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printNetworkPolicyList(list *networking.NetworkPolicyList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printNetworkPolicy(&list.Items[i], options) if err != nil { @@ -1633,8 +1633,8 @@ func printNetworkPolicyList(list *networking.NetworkPolicyList, options printers return rows, nil } -func printStorageClass(obj *storage.StorageClass, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printStorageClass(obj *storage.StorageClass, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1645,11 +1645,11 @@ func printStorageClass(obj *storage.StorageClass, options printers.PrintOptions) provtype := obj.Provisioner row.Cells = append(row.Cells, name, provtype, translateTimestamp(obj.CreationTimestamp)) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printStorageClassList(list *storage.StorageClassList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printStorageClassList(list *storage.StorageClassList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printStorageClass(&list.Items[i], options) if err != nil { @@ -1660,13 +1660,13 @@ func printStorageClassList(list *storage.StorageClassList, options printers.Prin return rows, nil } -func printStatus(obj *metav1.Status, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printStatus(obj *metav1.Status, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } row.Cells = append(row.Cells, obj.Status, obj.Reason, obj.Message) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } // Lay out all the containers on one line if use wide output. @@ -1712,8 +1712,8 @@ func formatEventSource(es api.EventSource) string { return strings.Join(EventSourceString, ", ") } -func printControllerRevision(obj *apps.ControllerRevision, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - row := metav1alpha1.TableRow{ +func printControllerRevision(obj *apps.ControllerRevision, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + row := metav1beta1.TableRow{ Object: runtime.RawExtension{Object: obj}, } @@ -1726,11 +1726,11 @@ func printControllerRevision(obj *apps.ControllerRevision, options printers.Prin revision := obj.Revision age := translateTimestamp(obj.CreationTimestamp) row.Cells = append(row.Cells, obj.Name, controllerName, revision, age) - return []metav1alpha1.TableRow{row}, nil + return []metav1beta1.TableRow{row}, nil } -func printControllerRevisionList(list *apps.ControllerRevisionList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) +func printControllerRevisionList(list *apps.ControllerRevisionList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) { + rows := make([]metav1beta1.TableRow, 0, len(list.Items)) for i := range list.Items { r, err := printControllerRevision(&list.Items[i], options) if err != nil { diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index d828cded6f..4357d774b6 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" yamlserializer "k8s.io/apimachinery/pkg/runtime/serializer/yaml" @@ -1590,7 +1590,7 @@ func TestPrintPodTable(t *testing.T) { func TestPrintPod(t *testing.T) { tests := []struct { pod api.Pod - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ { // Test name, num of containers, restarts, container ready status @@ -1605,7 +1605,7 @@ func TestPrintPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, }, { // Test container error overwrites pod phase @@ -1620,7 +1620,7 @@ func TestPrintPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test2", "1/2", "ContainerWaitingReason", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test2", "1/2", "ContainerWaitingReason", 6, ""}}}, }, { // Test the same as the above but with Terminated state and the first container overwrites the rest @@ -1635,7 +1635,7 @@ func TestPrintPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test3", "0/2", "ContainerWaitingReason", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test3", "0/2", "ContainerWaitingReason", 6, ""}}}, }, { // Test ready is not enough for reporting running @@ -1650,7 +1650,7 @@ func TestPrintPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test4", "1/2", "podPhase", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test4", "1/2", "podPhase", 6, ""}}}, }, { // Test ready is not enough for reporting running @@ -1666,7 +1666,7 @@ func TestPrintPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test5", "1/2", "podReason", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test5", "1/2", "podReason", 6, ""}}}, }, } @@ -1687,7 +1687,7 @@ func TestPrintPod(t *testing.T) { func TestPrintPodwide(t *testing.T) { tests := []struct { pod api.Pod - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ { // Test when the NodeName and PodIP are not none @@ -1707,7 +1707,7 @@ func TestPrintPodwide(t *testing.T) { NominatedNodeName: "node1", }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "1.1.1.1", "test1", "node1"}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "1.1.1.1", "test1", "node1"}}}, }, { // Test when the NodeName and PodIP are none @@ -1726,7 +1726,7 @@ func TestPrintPodwide(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test2", "1/2", "ContainerWaitingReason", 6, "", "", ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test2", "1/2", "ContainerWaitingReason", 6, "", "", ""}}}, }, } @@ -1747,7 +1747,7 @@ func TestPrintPodwide(t *testing.T) { func TestPrintPodList(t *testing.T) { tests := []struct { pods api.PodList - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ // Test podList's pod: name, num of containers, restarts, container ready status { @@ -1776,7 +1776,7 @@ func TestPrintPodList(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "2/2", "podPhase", 6, ""}}, {Cells: []interface{}{"test2", "1/1", "podPhase", 1, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "2/2", "podPhase", 6, ""}}, {Cells: []interface{}{"test2", "1/1", "podPhase", 1, ""}}}, }, } @@ -1798,7 +1798,7 @@ func TestPrintPodList(t *testing.T) { func TestPrintNonTerminatedPod(t *testing.T) { tests := []struct { pod api.Pod - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ { // Test pod phase Running should be printed @@ -1813,7 +1813,7 @@ func TestPrintNonTerminatedPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "Running", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "Running", 6, ""}}}, }, { // Test pod phase Pending should be printed @@ -1828,7 +1828,7 @@ func TestPrintNonTerminatedPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test2", "1/2", "Pending", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test2", "1/2", "Pending", 6, ""}}}, }, { // Test pod phase Unknown should be printed @@ -1843,7 +1843,7 @@ func TestPrintNonTerminatedPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test3", "1/2", "Unknown", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test3", "1/2", "Unknown", 6, ""}}}, }, { // Test pod phase Succeeded shouldn't be printed @@ -1858,7 +1858,7 @@ func TestPrintNonTerminatedPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test4", "1/2", "Succeeded", 6, ""}, Conditions: podSuccessConditions}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test4", "1/2", "Succeeded", 6, ""}, Conditions: podSuccessConditions}}, }, { // Test pod phase Failed shouldn't be printed @@ -1873,7 +1873,7 @@ func TestPrintNonTerminatedPod(t *testing.T) { }, }, }, - []metav1alpha1.TableRow{{Cells: []interface{}{"test5", "1/2", "Failed", 6, ""}, Conditions: podFailedConditions}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test5", "1/2", "Failed", 6, ""}, Conditions: podFailedConditions}}, }, } @@ -1896,7 +1896,7 @@ func TestPrintPodWithLabels(t *testing.T) { tests := []struct { pod api.Pod labelColumns []string - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ { // Test name, num of containers, restarts, container ready status @@ -1915,7 +1915,7 @@ func TestPrintPodWithLabels(t *testing.T) { }, }, []string{"col1", "COL2"}, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "asd", "zxc"}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "asd", "zxc"}}}, }, { // Test name, num of containers, restarts, container ready status @@ -1934,7 +1934,7 @@ func TestPrintPodWithLabels(t *testing.T) { }, }, []string{}, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, }, } @@ -2524,7 +2524,7 @@ func TestPrintPodShowLabels(t *testing.T) { tests := []struct { pod api.Pod showLabels bool - expect []metav1alpha1.TableRow + expect []metav1beta1.TableRow }{ { // Test name, num of containers, restarts, container ready status @@ -2543,7 +2543,7 @@ func TestPrintPodShowLabels(t *testing.T) { }, }, true, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "COL2=zxc,col1=asd"}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, "", "COL2=zxc,col1=asd"}}}, }, { // Test name, num of containers, restarts, container ready status @@ -2562,7 +2562,7 @@ func TestPrintPodShowLabels(t *testing.T) { }, }, false, - []metav1alpha1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, + []metav1beta1.TableRow{{Cells: []interface{}{"test1", "1/2", "podPhase", 6, ""}}}, }, } diff --git a/pkg/printers/storage/BUILD b/pkg/printers/storage/BUILD index 69772c8a40..a560d725aa 100644 --- a/pkg/printers/storage/BUILD +++ b/pkg/printers/storage/BUILD @@ -11,7 +11,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/printers/storage", deps = [ "//pkg/printers:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", ], diff --git a/pkg/printers/storage/storage.go b/pkg/printers/storage/storage.go index e70f408c73..3eee73825a 100644 --- a/pkg/printers/storage/storage.go +++ b/pkg/printers/storage/storage.go @@ -17,7 +17,7 @@ limitations under the License. package storage import ( - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/printers" @@ -27,6 +27,6 @@ type TableConvertor struct { printers.TablePrinter } -func (c TableConvertor) ConvertToTable(ctx genericapirequest.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1alpha1.Table, error) { +func (c TableConvertor) ConvertToTable(ctx genericapirequest.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { return c.TablePrinter.PrintTable(obj, printers.PrintOptions{Wide: true}) } diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index a005dc937f..9581db5804 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -20,7 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 1770b1802e..f98f09adfa 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -26,7 +26,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -409,7 +409,7 @@ func TestConvertToTableList(t *testing.T) { defer storage.Store.DestroyFunc() ctx := genericapirequest.NewDefaultContext() - columns := []metav1alpha1.TableColumnDefinition{ + columns := []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]}, {Name: "Ready", Type: "string", Description: "The aggregate readiness state of this pod for accepting traffic."}, {Name: "Status", Type: "string", Description: "The aggregate status of the containers in this pod."}, @@ -440,7 +440,7 @@ func TestConvertToTableList(t *testing.T) { testCases := []struct { in runtime.Object - out *metav1alpha1.Table + out *metav1beta1.Table err bool }{ { @@ -449,25 +449,25 @@ func TestConvertToTableList(t *testing.T) { }, { in: &api.Pod{}, - out: &metav1alpha1.Table{ + out: &metav1beta1.Table{ ColumnDefinitions: columns, - Rows: []metav1alpha1.TableRow{ + Rows: []metav1beta1.TableRow{ {Cells: []interface{}{"", "0/0", "", 0, "", "", ""}, Object: runtime.RawExtension{Object: &api.Pod{}}}, }, }, }, { in: pod1, - out: &metav1alpha1.Table{ + out: &metav1beta1.Table{ ColumnDefinitions: columns, - Rows: []metav1alpha1.TableRow{ + Rows: []metav1beta1.TableRow{ {Cells: []interface{}{"foo", "1/2", "Pending", 10, "1y", "10.1.2.3", "test-node"}, Object: runtime.RawExtension{Object: pod1}}, }, }, }, { in: &api.PodList{}, - out: &metav1alpha1.Table{ColumnDefinitions: columns}, + out: &metav1beta1.Table{ColumnDefinitions: columns}, }, } for i, test := range testCases { diff --git a/staging/BUILD b/staging/BUILD index ff9fea11b7..38d8326f2a 100644 --- a/staging/BUILD +++ b/staging/BUILD @@ -58,7 +58,7 @@ filegroup( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:all-srcs", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:all-srcs", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/conversion:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/fields:all-srcs", diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 68289f085b..6d13930af3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -679,7 +679,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/BUILD b/staging/src/k8s.io/apimachinery/pkg/api/meta/BUILD index 21097f9b9d..29be07874a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/meta/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/BUILD @@ -19,7 +19,7 @@ go_test( deps = [ "//vendor/github.com/google/gofuzz:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", @@ -46,7 +46,7 @@ go_library( "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/meta.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/meta.go index c2d51b43c7..b9670071c1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/meta/meta.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/meta.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -118,12 +118,12 @@ func Accessor(obj interface{}) (metav1.Object, error) { // AsPartialObjectMetadata takes the metav1 interface and returns a partial object. // TODO: consider making this solely a conversion action. -func AsPartialObjectMetadata(m metav1.Object) *metav1alpha1.PartialObjectMetadata { +func AsPartialObjectMetadata(m metav1.Object) *metav1beta1.PartialObjectMetadata { switch t := m.(type) { case *metav1.ObjectMeta: - return &metav1alpha1.PartialObjectMetadata{ObjectMeta: *t} + return &metav1beta1.PartialObjectMetadata{ObjectMeta: *t} default: - return &metav1alpha1.PartialObjectMetadata{ + return &metav1beta1.PartialObjectMetadata{ ObjectMeta: metav1.ObjectMeta{ Name: m.GetName(), GenerateName: m.GetGenerateName(), diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/meta_test.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/meta_test.go index c7b753e0f5..4680bae9a8 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/meta/meta_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/meta_test.go @@ -22,7 +22,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/util/diff" fuzz "github.com/google/gofuzz" @@ -41,7 +41,7 @@ func TestAsPartialObjectMetadata(t *testing.T) { } for i := 0; i < 100; i++ { - m := &metav1alpha1.PartialObjectMetadata{} + m := &metav1beta1.PartialObjectMetadata{} f.Fuzz(&m.ObjectMeta) partial := AsPartialObjectMetadata(m) if !reflect.DeepEqual(&partial.ObjectMeta, &m.ObjectMeta) { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD index 00e122ca7a..fa0dd46d34 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD @@ -15,7 +15,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go index 27dfb3d9e9..d41744af4d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go @@ -29,7 +29,7 @@ import ( apitesting "k8s.io/apimachinery/pkg/api/testing" "k8s.io/apimachinery/pkg/api/testing/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/types" @@ -252,7 +252,7 @@ func v1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} { func v1alpha1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} { return []interface{}{ - func(r *metav1alpha1.TableRow, c fuzz.Continue) { + func(r *metav1beta1.TableRow, c fuzz.Continue) { c.Fuzz(&r.Object) c.Fuzz(&r.Conditions) if len(r.Conditions) == 0 { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD index 5f11cb1a99..defc85ac34 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD @@ -35,7 +35,7 @@ go_library( importpath = "k8s.io/apimachinery/pkg/apis/meta/internalversion", deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go index db79fb0cb5..4bde90b3ff 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go @@ -18,7 +18,7 @@ package internalversion import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" @@ -79,16 +79,16 @@ func addToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) &metav1.DeleteOptions{}, ) scheme.AddKnownTypes(SchemeGroupVersion, - &metav1alpha1.Table{}, - &metav1alpha1.TableOptions{}, - &metav1alpha1.PartialObjectMetadata{}, - &metav1alpha1.PartialObjectMetadataList{}, + &metav1beta1.Table{}, + &metav1beta1.TableOptions{}, + &metav1beta1.PartialObjectMetadata{}, + &metav1beta1.PartialObjectMetadataList{}, ) - scheme.AddKnownTypes(metav1alpha1.SchemeGroupVersion, - &metav1alpha1.Table{}, - &metav1alpha1.TableOptions{}, - &metav1alpha1.PartialObjectMetadata{}, - &metav1alpha1.PartialObjectMetadataList{}, + scheme.AddKnownTypes(metav1beta1.SchemeGroupVersion, + &metav1beta1.Table{}, + &metav1beta1.TableOptions{}, + &metav1beta1.PartialObjectMetadata{}, + &metav1beta1.PartialObjectMetadataList{}, ) // Allow delete options to be decoded across all version in this scheme (we may want to be more clever than this) scheme.AddUnversionedTypes(SchemeGroupVersion, &metav1.DeleteOptions{}) diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/BUILD similarity index 84% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/BUILD rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/BUILD index ab36b18731..05f33c5b42 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/BUILD @@ -1,8 +1,9 @@ -package(default_visibility = ["//visibility:public"]) +load("@io_bazel_rules_go//go:def.bzl", "go_library") -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", +filegroup( + name = "go_default_library_protos", + srcs = ["generated.proto"], + visibility = ["//visibility:public"], ) go_library( @@ -18,7 +19,8 @@ go_library( "zz_generated.deepcopy.go", "zz_generated.defaults.go", ], - importpath = "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + importpath = "k8s.io/apimachinery/pkg/apis/meta/v1beta1", + visibility = ["//visibility:public"], deps = [ "//vendor/github.com/gogo/protobuf/proto:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -39,10 +41,5 @@ filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], -) - -filegroup( - name = "go_default_library_protos", - srcs = ["generated.proto"], visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/conversion.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/conversion.go similarity index 73% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/conversion.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/conversion.go index f8ecc7c26c..f3e5e4c98d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/conversion.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/conversion.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import "k8s.io/apimachinery/pkg/conversion" -// Convert_Slice_string_To_v1alpha1_IncludeObjectPolicy allows converting a URL query parameter value -func Convert_Slice_string_To_v1alpha1_IncludeObjectPolicy(input *[]string, out *IncludeObjectPolicy, s conversion.Scope) error { +// Convert_Slice_string_To_v1beta1_IncludeObjectPolicy allows converting a URL query parameter value +func Convert_Slice_string_To_v1beta1_IncludeObjectPolicy(input *[]string, out *IncludeObjectPolicy, s conversion.Scope) error { if len(*input) > 0 { *out = IncludeObjectPolicy((*input)[0]) } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/deepcopy.go similarity index 98% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/deepcopy.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/deepcopy.go index ab6d048541..2dd440bb72 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/deepcopy.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/deepcopy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 func (in *TableRow) DeepCopy() *TableRow { if in == nil { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go similarity index 97% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/doc.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go index eea67c5c83..dc461cc296 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/doc.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go @@ -19,4 +19,4 @@ limitations under the License. // +k8s:defaulter-gen=TypeMeta // +groupName=meta.k8s.io -package v1alpha1 +package v1beta1 diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go similarity index 83% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.pb.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go index 4fcddb3ab3..dda05bea44 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go @@ -15,21 +15,21 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto +// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto // DO NOT EDIT! /* - Package v1alpha1 is a generated protocol buffer package. + Package v1beta1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto + k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto It has these top-level messages: PartialObjectMetadata PartialObjectMetadataList TableOptions */ -package v1alpha1 +package v1beta1 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -66,9 +66,9 @@ func (*TableOptions) ProtoMessage() {} func (*TableOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} } func init() { - proto.RegisterType((*PartialObjectMetadata)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1alpha1.PartialObjectMetadata") - proto.RegisterType((*PartialObjectMetadataList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1alpha1.PartialObjectMetadataList") - proto.RegisterType((*TableOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1alpha1.TableOptions") + proto.RegisterType((*PartialObjectMetadata)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1beta1.PartialObjectMetadata") + proto.RegisterType((*PartialObjectMetadataList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1beta1.PartialObjectMetadataList") + proto.RegisterType((*TableOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1beta1.TableOptions") } func (m *PartialObjectMetadata) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -600,34 +600,34 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ - // 392 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xbf, 0x6e, 0xd4, 0x40, - 0x10, 0x87, 0xbd, 0x42, 0x91, 0x92, 0x0d, 0x69, 0x8c, 0x90, 0xc2, 0x15, 0xeb, 0xe8, 0xaa, 0x08, - 0xc1, 0x2e, 0x09, 0x08, 0xd1, 0xe2, 0x2e, 0x12, 0x28, 0x91, 0xa1, 0xa2, 0x62, 0x6d, 0x0f, 0xf6, - 0x62, 0x7b, 0xd7, 0xda, 0x1d, 0x47, 0xba, 0x0a, 0x1e, 0x81, 0xc7, 0xba, 0x32, 0x65, 0x2a, 0x8b, - 0x33, 0x6f, 0x41, 0x85, 0x6c, 0x5f, 0xc8, 0xbf, 0x3b, 0xe5, 0xba, 0x99, 0xdf, 0xe8, 0xfb, 0x3c, - 0xe3, 0xa5, 0x9f, 0x8a, 0x77, 0x8e, 0x2b, 0x23, 0x8a, 0x26, 0x06, 0xab, 0x01, 0xc1, 0x89, 0x73, - 0xd0, 0xa9, 0xb1, 0x62, 0x39, 0x90, 0xb5, 0xaa, 0x64, 0x92, 0x2b, 0x0d, 0x76, 0x26, 0xea, 0x22, - 0xeb, 0x03, 0x27, 0x2a, 0x40, 0x29, 0xce, 0x8f, 0x64, 0x59, 0xe7, 0xf2, 0x48, 0x64, 0xa0, 0xc1, - 0x4a, 0x84, 0x94, 0xd7, 0xd6, 0xa0, 0xf1, 0x9f, 0x8f, 0x2c, 0xbf, 0xc9, 0xf2, 0xba, 0xc8, 0xfa, - 0xc0, 0xf1, 0x9e, 0xe5, 0x57, 0xec, 0xe4, 0x65, 0xa6, 0x30, 0x6f, 0x62, 0x9e, 0x98, 0x4a, 0x64, - 0x26, 0x33, 0x62, 0x50, 0xc4, 0xcd, 0xb7, 0xa1, 0x1b, 0x9a, 0xa1, 0x1a, 0xd5, 0x93, 0x37, 0x9b, - 0xac, 0x75, 0x77, 0xa1, 0xc9, 0xda, 0x63, 0x6c, 0xa3, 0x51, 0x55, 0x70, 0x0f, 0x78, 0xfb, 0x10, - 0xe0, 0x92, 0x1c, 0x2a, 0x79, 0x8f, 0x7b, 0xbd, 0x8e, 0x6b, 0x50, 0x95, 0x42, 0x69, 0x74, 0x68, - 0xef, 0x42, 0xd3, 0x19, 0x7d, 0x7a, 0x26, 0x2d, 0x2a, 0x59, 0x9e, 0xc6, 0xdf, 0x21, 0xc1, 0x8f, - 0x80, 0x32, 0x95, 0x28, 0xfd, 0xaf, 0x74, 0xbb, 0x5a, 0xd6, 0xfb, 0xe4, 0x80, 0x1c, 0xee, 0x1e, - 0xbf, 0xe2, 0x9b, 0xfc, 0x5a, 0x7e, 0xed, 0x09, 0xfd, 0x79, 0x1b, 0x78, 0x5d, 0x1b, 0xd0, 0xeb, - 0x2c, 0xfa, 0x6f, 0x9d, 0xfe, 0xa0, 0xcf, 0x56, 0x7e, 0xfa, 0x83, 0x72, 0xe8, 0xc7, 0x74, 0x4b, - 0x21, 0x54, 0x6e, 0x9f, 0x1c, 0x3c, 0x3a, 0xdc, 0x3d, 0x7e, 0xcf, 0x37, 0x7f, 0x56, 0xbe, 0xd2, - 0x1a, 0xee, 0x74, 0x6d, 0xb0, 0x75, 0xd2, 0x3b, 0xa3, 0x51, 0x3d, 0x8d, 0xe9, 0xe3, 0xcf, 0x32, - 0x2e, 0xe1, 0xb4, 0x46, 0x65, 0xb4, 0xf3, 0x23, 0xba, 0xa7, 0x74, 0x52, 0x36, 0x29, 0x8c, 0xe8, - 0x70, 0xf7, 0x4e, 0xf8, 0x62, 0x79, 0xc5, 0xde, 0xc9, 0xcd, 0xe1, 0xdf, 0x36, 0x78, 0x72, 0x2b, - 0x38, 0x33, 0xa5, 0x4a, 0x66, 0xd1, 0x6d, 0x45, 0xc8, 0xe7, 0x0b, 0xe6, 0x5d, 0x2c, 0x98, 0x77, - 0xb9, 0x60, 0xde, 0xcf, 0x8e, 0x91, 0x79, 0xc7, 0xc8, 0x45, 0xc7, 0xc8, 0x65, 0xc7, 0xc8, 0xef, - 0x8e, 0x91, 0x5f, 0x7f, 0x98, 0xf7, 0x65, 0xfb, 0x6a, 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x97, 0x95, 0xbb, 0xf9, 0x14, 0x03, 0x00, 0x00, + // 391 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xbd, 0x6e, 0xd4, 0x40, + 0x10, 0xc7, 0xbd, 0x42, 0x11, 0x64, 0x43, 0x1a, 0x23, 0xa4, 0x70, 0xc5, 0x3a, 0xba, 0x2a, 0x48, + 0x64, 0x97, 0x04, 0x84, 0x28, 0x91, 0xbb, 0x48, 0xa0, 0x44, 0x16, 0x15, 0x15, 0x6b, 0x7b, 0xf0, + 0x2d, 0xb6, 0x77, 0xad, 0xdd, 0x71, 0xa4, 0x6b, 0x10, 0x8f, 0xc0, 0x63, 0x5d, 0x99, 0x32, 0x95, + 0xc5, 0x99, 0xb7, 0xa0, 0x42, 0xfe, 0x10, 0xf9, 0xb8, 0x3b, 0xe5, 0xba, 0x99, 0xff, 0xe8, 0xf7, + 0xf3, 0x8c, 0x97, 0x46, 0xf9, 0x7b, 0xc7, 0x95, 0x11, 0x79, 0x1d, 0x83, 0xd5, 0x80, 0xe0, 0xc4, + 0x25, 0xe8, 0xd4, 0x58, 0x31, 0x0e, 0x64, 0xa5, 0x4a, 0x99, 0xcc, 0x94, 0x06, 0x3b, 0x17, 0x55, + 0x9e, 0x75, 0x81, 0x13, 0x25, 0xa0, 0x14, 0x97, 0x27, 0x31, 0xa0, 0x3c, 0x11, 0x19, 0x68, 0xb0, + 0x12, 0x21, 0xe5, 0x95, 0x35, 0x68, 0xfc, 0x97, 0x03, 0xca, 0x6f, 0xa3, 0xbc, 0xca, 0xb3, 0x2e, + 0x70, 0xbc, 0x43, 0xf9, 0x88, 0x4e, 0x8e, 0x33, 0x85, 0xb3, 0x3a, 0xe6, 0x89, 0x29, 0x45, 0x66, + 0x32, 0x23, 0x7a, 0x43, 0x5c, 0x7f, 0xeb, 0xbb, 0xbe, 0xe9, 0xab, 0xc1, 0x3c, 0x79, 0xbb, 0xcd, + 0x52, 0xf7, 0xf7, 0x99, 0x6c, 0x3c, 0xc5, 0xd6, 0x1a, 0x55, 0x09, 0x2b, 0xc0, 0xbb, 0x87, 0x00, + 0x97, 0xcc, 0xa0, 0x94, 0x2b, 0xdc, 0x9b, 0x4d, 0x5c, 0x8d, 0xaa, 0x10, 0x4a, 0xa3, 0x43, 0x7b, + 0x1f, 0x9a, 0xce, 0xe9, 0xf3, 0x0b, 0x69, 0x51, 0xc9, 0xe2, 0x3c, 0xfe, 0x0e, 0x09, 0x7e, 0x02, + 0x94, 0xa9, 0x44, 0xe9, 0x7f, 0xa5, 0x4f, 0xca, 0xb1, 0x3e, 0x20, 0x87, 0xe4, 0x68, 0xef, 0xf4, + 0x35, 0xdf, 0xe6, 0xcf, 0xf2, 0x1b, 0x4f, 0xe8, 0x2f, 0x9a, 0xc0, 0x6b, 0x9b, 0x80, 0xde, 0x64, + 0xd1, 0x7f, 0xeb, 0xf4, 0x07, 0x7d, 0xb1, 0xf6, 0xd3, 0x1f, 0x95, 0x43, 0x5f, 0xd2, 0x1d, 0x85, + 0x50, 0xba, 0x03, 0x72, 0xf8, 0xe8, 0x68, 0xef, 0xf4, 0x03, 0xdf, 0xfa, 0x55, 0xf9, 0x5a, 0x69, + 0xb8, 0xdb, 0x36, 0xc1, 0xce, 0x59, 0xa7, 0x8c, 0x06, 0xf3, 0x34, 0xa6, 0x4f, 0x3f, 0xcb, 0xb8, + 0x80, 0xf3, 0x0a, 0x95, 0xd1, 0xce, 0x8f, 0xe8, 0xbe, 0xd2, 0x49, 0x51, 0xa7, 0x30, 0xa0, 0xfd, + 0xd9, 0xbb, 0xe1, 0xab, 0xf1, 0x88, 0xfd, 0xb3, 0xdb, 0xc3, 0xbf, 0x4d, 0xf0, 0xec, 0x4e, 0x70, + 0x61, 0x0a, 0x95, 0xcc, 0xa3, 0xbb, 0x8a, 0xf0, 0x78, 0xb1, 0x64, 0xde, 0xd5, 0x92, 0x79, 0xd7, + 0x4b, 0xe6, 0xfd, 0x6c, 0x19, 0x59, 0xb4, 0x8c, 0x5c, 0xb5, 0x8c, 0x5c, 0xb7, 0x8c, 0xfc, 0x6e, + 0x19, 0xf9, 0xf5, 0x87, 0x79, 0x5f, 0x1e, 0x8f, 0xab, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x73, + 0xdf, 0x3a, 0x0c, 0x10, 0x03, 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto similarity index 94% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto index 7509f6e867..a9060bf96f 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.proto @@ -19,7 +19,7 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.apimachinery.pkg.apis.meta.v1alpha1; +package k8s.io.apimachinery.pkg.apis.meta.v1beta1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; @@ -27,7 +27,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "v1alpha1"; +option go_package = "v1beta1"; // PartialObjectMetadata is a generic representation of any object with ObjectMeta. It allows clients // to get access to a particular ObjectMeta schema without knowing the details of the version. @@ -52,7 +52,7 @@ message TableOptions { // includeObject decides whether to include each object along with its columnar information. // Specifying "None" will return no object, specifying "Object" will return the full object contents, and // specifying "Metadata" (the default) will return the object's metadata in the PartialObjectMetadata kind - // in version v1alpha1 of the meta.k8s.io API group. + // in version v1beta1 of the meta.k8s.io API group. optional string includeObject = 1; } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/register.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go similarity index 92% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/register.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go index dab66bf088..d13254b41d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/register.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( "k8s.io/apimachinery/pkg/runtime" @@ -25,17 +25,17 @@ import ( const GroupName = "meta.k8s.io" // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} // Kind takes an unqualified kind and returns a Group qualified GroupKind func Kind(kind string) schema.GroupKind { return SchemeGroupVersion.WithKind(kind).GroupKind() } -// scheme is the registry for the common types that adhere to the meta v1alpha1 API spec. +// scheme is the registry for the common types that adhere to the meta v1beta1 API spec. var scheme = runtime.NewScheme() -// ParameterCodec knows about query parameters used with the meta v1alpha1 API spec. +// ParameterCodec knows about query parameters used with the meta v1beta1 API spec. var ParameterCodec = runtime.NewParameterCodec(scheme) func init() { @@ -47,7 +47,7 @@ func init() { ) if err := scheme.AddConversionFuncs( - Convert_Slice_string_To_v1alpha1_IncludeObjectPolicy, + Convert_Slice_string_To_v1beta1_IncludeObjectPolicy, ); err != nil { panic(err) } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go similarity index 98% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go index 1c97414a9f..7b7c47d827 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// package v1alpha1 is alpha objects from meta that will be introduced. -package v1alpha1 +// package v1beta1 is alpha objects from meta that will be introduced. +package v1beta1 import ( "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -136,7 +136,7 @@ type TableOptions struct { // includeObject decides whether to include each object along with its columnar information. // Specifying "None" will return no object, specifying "Object" will return the full object contents, and // specifying "Metadata" (the default) will return the object's metadata in the PartialObjectMetadata kind - // in version v1alpha1 of the meta.k8s.io API group. + // in version v1beta1 of the meta.k8s.io API group. IncludeObject IncludeObjectPolicy `json:"includeObject,omitempty" protobuf:"bytes,1,opt,name=includeObject,casttype=IncludeObjectPolicy"` } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types_swagger_doc_generated.go similarity index 98% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types_swagger_doc_generated.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types_swagger_doc_generated.go index e8bb626029..2680fbf7e4 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types_swagger_doc_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 // This file contains a collection of methods that can be used from go-restful to // generate Swagger API documentation for its models. Please read this PR for more @@ -71,7 +71,7 @@ func (TableColumnDefinition) SwaggerDoc() map[string]string { var map_TableOptions = map[string]string{ "": "TableOptions are used when a Table is requested by the caller.", - "includeObject": "includeObject decides whether to include each object along with its columnar information. Specifying \"None\" will return no object, specifying \"Object\" will return the full object contents, and specifying \"Metadata\" (the default) will return the object's metadata in the PartialObjectMetadata kind in version v1alpha1 of the meta.k8s.io API group.", + "includeObject": "includeObject decides whether to include each object along with its columnar information. Specifying \"None\" will return no object, specifying \"Object\" will return the full object contents, and specifying \"Metadata\" (the default) will return the object's metadata in the PartialObjectMetadata kind in version v1beta1 of the meta.k8s.io API group.", } func (TableOptions) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.deepcopy.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go index 1b3172004d..a1f58daa33 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // This file was autogenerated by deepcopy-gen. Do not edit it manually! -package v1alpha1 +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.defaults.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.defaults.go similarity index 98% rename from staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.defaults.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.defaults.go index 5e24d22cac..b61dda74c2 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1alpha1/zz_generated.defaults.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.defaults.go @@ -18,7 +18,7 @@ limitations under the License. // This file was autogenerated by defaulter-gen. Do not edit it manually! -package v1alpha1 +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index b0dbe4c6c4..b35962bd34 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -1031,7 +1031,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD index 39fe40b5d9..f2a8e3cffc 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD @@ -27,7 +27,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index a0cc897aa8..1d01431f59 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -45,7 +45,7 @@ import ( metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -434,7 +434,7 @@ func (storage *SimpleRESTStorage) Export(ctx request.Context, name string, opts return obj, storage.errors["export"] } -func (storage *SimpleRESTStorage) ConvertToTable(ctx request.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1alpha1.Table, error) { +func (storage *SimpleRESTStorage) ConvertToTable(ctx request.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { return rest.NewDefaultTableConvertor(schema.GroupResource{Resource: "simple"}).ConvertToTable(ctx, obj, tableOptions) } @@ -1846,8 +1846,8 @@ func TestGetTable(t *testing.T) { t.Fatal(err) } partial := meta.AsPartialObjectMetadata(m) - partial.GetObjectKind().SetGroupVersionKind(metav1alpha1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) - encodedBody, err := runtime.Encode(metainternalversion.Codecs.LegacyCodec(metav1alpha1.SchemeGroupVersion), partial) + partial.GetObjectKind().SetGroupVersionKind(metav1beta1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) + encodedBody, err := runtime.Encode(metainternalversion.Codecs.LegacyCodec(metav1beta1.SchemeGroupVersion), partial) if err != nil { t.Fatal(err) } @@ -1860,7 +1860,7 @@ func TestGetTable(t *testing.T) { accept string params url.Values pretty bool - expected *metav1alpha1.Table + expected *metav1beta1.Table statusCode int item bool }{ @@ -1870,46 +1870,46 @@ func TestGetTable(t *testing.T) { }, { item: true, - accept: runtime.ContentTypeJSON + ";as=Table;v=v1alpha1;g=meta.k8s.io", - expected: &metav1alpha1.Table{ - TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1alpha1"}, + accept: runtime.ContentTypeJSON + ";as=Table;v=v1beta1;g=meta.k8s.io", + expected: &metav1beta1.Table{ + TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1beta1"}, ListMeta: metav1.ListMeta{ResourceVersion: "10", SelfLink: "/blah"}, - ColumnDefinitions: []metav1alpha1.TableColumnDefinition{ + ColumnDefinitions: []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metaDoc["name"]}, {Name: "Created At", Type: "date", Description: metaDoc["creationTimestamp"]}, }, - Rows: []metav1alpha1.TableRow{ + Rows: []metav1beta1.TableRow{ {Cells: []interface{}{"foo1", now.Time.UTC().Format(time.RFC3339)}, Object: runtime.RawExtension{Raw: encodedBody}}, }, }, }, { item: true, - accept: runtime.ContentTypeJSON + ";as=Table;v=v1alpha1;g=meta.k8s.io", + accept: runtime.ContentTypeJSON + ";as=Table;v=v1beta1;g=meta.k8s.io", params: url.Values{"includeObject": []string{"Metadata"}}, - expected: &metav1alpha1.Table{ - TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1alpha1"}, + expected: &metav1beta1.Table{ + TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1beta1"}, ListMeta: metav1.ListMeta{ResourceVersion: "10", SelfLink: "/blah"}, - ColumnDefinitions: []metav1alpha1.TableColumnDefinition{ + ColumnDefinitions: []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metaDoc["name"]}, {Name: "Created At", Type: "date", Description: metaDoc["creationTimestamp"]}, }, - Rows: []metav1alpha1.TableRow{ + Rows: []metav1beta1.TableRow{ {Cells: []interface{}{"foo1", now.Time.UTC().Format(time.RFC3339)}, Object: runtime.RawExtension{Raw: encodedBody}}, }, }, }, { - accept: runtime.ContentTypeJSON + ";as=Table;v=v1alpha1;g=meta.k8s.io", + accept: runtime.ContentTypeJSON + ";as=Table;v=v1beta1;g=meta.k8s.io", params: url.Values{"includeObject": []string{"Metadata"}}, - expected: &metav1alpha1.Table{ - TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1alpha1"}, + expected: &metav1beta1.Table{ + TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1beta1"}, ListMeta: metav1.ListMeta{ResourceVersion: "10", SelfLink: "/test/link"}, - ColumnDefinitions: []metav1alpha1.TableColumnDefinition{ + ColumnDefinitions: []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: metaDoc["name"]}, {Name: "Created At", Type: "date", Description: metaDoc["creationTimestamp"]}, }, - Rows: []metav1alpha1.TableRow{ + Rows: []metav1beta1.TableRow{ {Cells: []interface{}{"foo1", now.Time.UTC().Format(time.RFC3339)}, Object: runtime.RawExtension{Raw: encodedBody}}, }, }, @@ -1969,7 +1969,7 @@ func TestGetTable(t *testing.T) { if resp.StatusCode != http.StatusOK { t.Errorf("%d: unexpected response: %#v", i, resp) } - var itemOut metav1alpha1.Table + var itemOut metav1beta1.Table body, err := extractBody(resp, &itemOut) if err != nil { t.Fatal(err) @@ -2031,12 +2031,12 @@ func TestGetPartialObjectMetadata(t *testing.T) { expectKind: schema.GroupVersionKind{Kind: "Simple", Group: testGroupVersion.Group, Version: testGroupVersion.Version}, }, { - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1alpha1;g=meta.k8s.io, application/json", - expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadata", Group: "meta.k8s.io", Version: "v1alpha1"}, + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1beta1;g=meta.k8s.io, application/json", + expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadata", Group: "meta.k8s.io", Version: "v1beta1"}, }, { list: true, - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1alpha1;g=meta.k8s.io", + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1beta1;g=meta.k8s.io", statusCode: http.StatusNotAcceptable, }, { @@ -2046,36 +2046,36 @@ func TestGetPartialObjectMetadata(t *testing.T) { }, { list: true, - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1alpha1;g=meta.k8s.io, application/json", - expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadataList", Group: "meta.k8s.io", Version: "v1alpha1"}, + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1beta1;g=meta.k8s.io, application/json", + expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadataList", Group: "meta.k8s.io", Version: "v1beta1"}, }, { - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1alpha1;g=meta.k8s.io", + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1beta1;g=meta.k8s.io", statusCode: http.StatusNotAcceptable, }, { - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1alpha1;g=meta.k8s.io", - expected: &metav1alpha1.PartialObjectMetadata{ + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadata;v=v1beta1;g=meta.k8s.io", + expected: &metav1beta1.PartialObjectMetadata{ ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "ns1", CreationTimestamp: now, UID: types.UID("abcdef0123")}, }, - expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadata", Group: "meta.k8s.io", Version: "v1alpha1"}, + expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadata", Group: "meta.k8s.io", Version: "v1beta1"}, }, { list: true, - accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1alpha1;g=meta.k8s.io", - expected: &metav1alpha1.PartialObjectMetadataList{ - Items: []*metav1alpha1.PartialObjectMetadata{ + accept: runtime.ContentTypeJSON + ";as=PartialObjectMetadataList;v=v1beta1;g=meta.k8s.io", + expected: &metav1beta1.PartialObjectMetadataList{ + Items: []*metav1beta1.PartialObjectMetadata{ { - TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1alpha1", Kind: "PartialObjectMetadata"}, + TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1beta1", Kind: "PartialObjectMetadata"}, ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "ns1", CreationTimestamp: now, UID: types.UID("newer")}, }, { - TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1alpha1", Kind: "PartialObjectMetadata"}, + TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1beta1", Kind: "PartialObjectMetadata"}, ObjectMeta: metav1.ObjectMeta{Name: "foo2", Namespace: "ns2", CreationTimestamp: now, UID: types.UID("older")}, }, }, }, - expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadataList", Group: "meta.k8s.io", Version: "v1alpha1"}, + expectKind: schema.GroupVersionKind{Kind: "PartialObjectMetadataList", Group: "meta.k8s.io", Version: "v1beta1"}, }, } for i, test := range tests { @@ -2116,7 +2116,7 @@ func TestGetPartialObjectMetadata(t *testing.T) { } body := "" if test.expected != nil { - itemOut, d, err := extractBodyObject(resp, metainternalversion.Codecs.LegacyCodec(metav1alpha1.SchemeGroupVersion)) + itemOut, d, err := extractBodyObject(resp, metainternalversion.Codecs.LegacyCodec(metav1beta1.SchemeGroupVersion)) if err != nil { t.Fatal(err) } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD index 6e9fd65115..f1867bf0ea 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD @@ -60,7 +60,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go index 1d11d0a304..e69ba02af0 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go @@ -184,7 +184,7 @@ func TestNegotiate(t *testing.T) { { req: &http.Request{ Header: http.Header{ - "Accept": []string{"application/json;as=BOGUS;v=v1alpha1;g=meta.k8s.io, application/json"}, + "Accept": []string{"application/json;as=BOGUS;v=v1beta1;g=meta.k8s.io, application/json"}, }, }, contentType: "application/json", diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go index 1aec3ba2d2..508b0aeded 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" @@ -46,7 +46,7 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. if target := mediaType.Convert; target != nil { switch { - case target.Kind == "PartialObjectMetadata" && target.GroupVersion() == metav1alpha1.SchemeGroupVersion: + case target.Kind == "PartialObjectMetadata" && target.GroupVersion() == metav1beta1.SchemeGroupVersion: if meta.IsListType(result) { // TODO: this should be calculated earlier err = newNotAcceptableError(fmt.Sprintf("you requested PartialObjectMetadata, but the requested object is a list (%T)", result)) @@ -59,7 +59,7 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. return } partial := meta.AsPartialObjectMetadata(m) - partial.GetObjectKind().SetGroupVersionKind(metav1alpha1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) + partial.GetObjectKind().SetGroupVersionKind(metav1beta1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) // renegotiate under the internal version _, info, err := negotiation.NegotiateOutputMediaType(req, metainternalversion.Codecs, &scope) @@ -67,25 +67,25 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. scope.err(err, w, req) return } - encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1alpha1.SchemeGroupVersion) + encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1beta1.SchemeGroupVersion) responsewriters.SerializeObject(info.MediaType, encoder, w, req, statusCode, partial) return - case target.Kind == "PartialObjectMetadataList" && target.GroupVersion() == metav1alpha1.SchemeGroupVersion: + case target.Kind == "PartialObjectMetadataList" && target.GroupVersion() == metav1beta1.SchemeGroupVersion: if !meta.IsListType(result) { // TODO: this should be calculated earlier err = newNotAcceptableError(fmt.Sprintf("you requested PartialObjectMetadataList, but the requested object is not a list (%T)", result)) scope.err(err, w, req) return } - list := &metav1alpha1.PartialObjectMetadataList{} + list := &metav1beta1.PartialObjectMetadataList{} err := meta.EachListItem(result, func(obj runtime.Object) error { m, err := meta.Accessor(obj) if err != nil { return err } partial := meta.AsPartialObjectMetadata(m) - partial.GetObjectKind().SetGroupVersionKind(metav1alpha1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) + partial.GetObjectKind().SetGroupVersionKind(metav1beta1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) list.Items = append(list.Items, partial) return nil }) @@ -100,16 +100,16 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. scope.err(err, w, req) return } - encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1alpha1.SchemeGroupVersion) + encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1beta1.SchemeGroupVersion) responsewriters.SerializeObject(info.MediaType, encoder, w, req, statusCode, list) return - case target.Kind == "Table" && target.GroupVersion() == metav1alpha1.SchemeGroupVersion: + case target.Kind == "Table" && target.GroupVersion() == metav1beta1.SchemeGroupVersion: // TODO: relax the version abstraction // TODO: skip if this is a status response (delete without body)? - opts := &metav1alpha1.TableOptions{} - if err := metav1alpha1.ParameterCodec.DecodeParameters(req.URL.Query(), metav1alpha1.SchemeGroupVersion, opts); err != nil { + opts := &metav1beta1.TableOptions{} + if err := metav1beta1.ParameterCodec.DecodeParameters(req.URL.Query(), metav1beta1.SchemeGroupVersion, opts); err != nil { scope.err(err, w, req) return } @@ -123,14 +123,14 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. for i := range table.Rows { item := &table.Rows[i] switch opts.IncludeObject { - case metav1alpha1.IncludeObject: + case metav1beta1.IncludeObject: item.Object.Object, err = scope.Convertor.ConvertToVersion(item.Object.Object, scope.Kind.GroupVersion()) if err != nil { scope.err(err, w, req) return } // TODO: rely on defaulting for the value here? - case metav1alpha1.IncludeMetadata, "": + case metav1beta1.IncludeMetadata, "": m, err := meta.Accessor(item.Object.Object) if err != nil { scope.err(err, w, req) @@ -138,9 +138,9 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. } // TODO: turn this into an internal type and do conversion in order to get object kind automatically set? partial := meta.AsPartialObjectMetadata(m) - partial.GetObjectKind().SetGroupVersionKind(metav1alpha1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) + partial.GetObjectKind().SetGroupVersionKind(metav1beta1.SchemeGroupVersion.WithKind("PartialObjectMetadata")) item.Object.Object = partial - case metav1alpha1.IncludeNone: + case metav1beta1.IncludeNone: item.Object.Object = nil default: // TODO: move this to validation on the table options? @@ -155,7 +155,7 @@ func transformResponseObject(ctx request.Context, scope RequestScope, req *http. scope.err(err, w, req) return } - encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1alpha1.SchemeGroupVersion) + encoder := metainternalversion.Codecs.EncoderForVersion(info.Serializer, metav1beta1.SchemeGroupVersion) responsewriters.SerializeObject(info.MediaType, encoder, w, req, statusCode, table) return diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go index a03f6988a4..63135aaa86 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -69,7 +69,7 @@ func (scope *RequestScope) err(err error, w http.ResponseWriter, req *http.Reque func (scope *RequestScope) AllowsConversion(gvk schema.GroupVersionKind) bool { // TODO: this is temporary, replace with an abstraction calculated at endpoint installation time - if gvk.GroupVersion() == metav1alpha1.SchemeGroupVersion { + if gvk.GroupVersion() == metav1beta1.SchemeGroupVersion { switch gvk.Kind { case "Table": return scope.TableConvertor != nil diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD index 5472bb807a..76bac16f2d 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD @@ -64,7 +64,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/validation/path:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index bc2d512224..0907f01548 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/validation/path" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -1368,7 +1368,7 @@ func (e *Store) CompleteWithOptions(options *generic.StoreOptions) error { return nil } -func (e *Store) ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1alpha1.Table, error) { +func (e *Store) ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { if e.TableConvertor != nil { return e.TableConvertor.ConvertToTable(ctx, object, tableOptions) } diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/BUILD b/staging/src/k8s.io/apiserver/pkg/registry/rest/BUILD index 30b23efa2c..e3ab6e10d6 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/BUILD @@ -42,7 +42,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go index 1155c8ade2..8cf9689ac2 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go @@ -23,7 +23,7 @@ import ( metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" @@ -134,7 +134,7 @@ type GetterWithOptions interface { } type TableConvertor interface { - ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1alpha1.Table, error) + ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) } // Deleter is an object that can delete a named RESTful resource. diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/table.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/table.go index 4bc1b36685..2f0d1df3b6 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/table.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/table.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" @@ -40,14 +40,14 @@ func NewDefaultTableConvertor(resource schema.GroupResource) TableConvertor { var swaggerMetadataDescriptions = metav1.ObjectMeta{}.SwaggerDoc() -func (c defaultTableConvertor) ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1alpha1.Table, error) { - var table metav1alpha1.Table +func (c defaultTableConvertor) ConvertToTable(ctx genericapirequest.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { + var table metav1beta1.Table fn := func(obj runtime.Object) error { m, err := meta.Accessor(obj) if err != nil { return errNotAcceptable{resource: c.qualifiedResource} } - table.Rows = append(table.Rows, metav1alpha1.TableRow{ + table.Rows = append(table.Rows, metav1beta1.TableRow{ Cells: []interface{}{m.GetName(), m.GetCreationTimestamp().Time.UTC().Format(time.RFC3339)}, Object: runtime.RawExtension{Object: obj}, }) @@ -73,7 +73,7 @@ func (c defaultTableConvertor) ConvertToTable(ctx genericapirequest.Context, obj table.SelfLink = m.GetSelfLink() } } - table.ColumnDefinitions = []metav1alpha1.TableColumnDefinition{ + table.ColumnDefinitions = []metav1beta1.TableColumnDefinition{ {Name: "Name", Type: "string", Format: "name", Description: swaggerMetadataDescriptions["name"]}, {Name: "Created At", Type: "date", Description: swaggerMetadataDescriptions["creationTimestamp"]}, } diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 3a562c15ab..54d36c4358 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -455,7 +455,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/client-go/tools/pager/BUILD b/staging/src/k8s.io/client-go/tools/pager/BUILD index 2bbc814890..d30a10cd6e 100644 --- a/staging/src/k8s.io/client-go/tools/pager/BUILD +++ b/staging/src/k8s.io/client-go/tools/pager/BUILD @@ -44,7 +44,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", ], ) diff --git a/staging/src/k8s.io/client-go/tools/pager/pager_test.go b/staging/src/k8s.io/client-go/tools/pager/pager_test.go index 6e3e9444ab..b905fc1fb6 100644 --- a/staging/src/k8s.io/client-go/tools/pager/pager_test.go +++ b/staging/src/k8s.io/client-go/tools/pager/pager_test.go @@ -25,14 +25,14 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" ) func list(count int, rv string) *metainternalversion.List { var list metainternalversion.List for i := 0; i < count; i++ { - list.Items = append(list.Items, &metav1alpha1.PartialObjectMetadata{ + list.Items = append(list.Items, &metav1beta1.PartialObjectMetadata{ ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%d", i), }, @@ -80,7 +80,7 @@ func (p *testPager) PagedList(ctx context.Context, options metav1.ListOptions) ( if p.remaining <= 0 { break } - list.Items = append(list.Items, &metav1alpha1.PartialObjectMetadata{ + list.Items = append(list.Items, &metav1beta1.PartialObjectMetadata{ ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%d", p.index), }, diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go index 0c2573bf26..0553cf5043 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go @@ -73,7 +73,7 @@ func New() *Generator { `+k8s.io/apimachinery/pkg/runtime/schema`, `+k8s.io/apimachinery/pkg/runtime`, `k8s.io/apimachinery/pkg/apis/meta/v1`, - `k8s.io/apimachinery/pkg/apis/meta/v1alpha1`, + `k8s.io/apimachinery/pkg/apis/meta/v1beta1`, }, ","), Packages: "", DropEmbeddedFields: "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 52410383dc..889ea4ea1f 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -643,7 +643,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json index 9fff235738..e4579cf83e 100644 --- a/staging/src/k8s.io/metrics/Godeps/Godeps.json +++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json @@ -259,7 +259,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 5421a1f02e..844b2ce51b 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -643,7 +643,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index 04ea1a9cd4..47780f6d1a 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -287,7 +287,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", + "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index 0df03ec01e..2821d47cfd 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -49,7 +49,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/test/e2e/apimachinery/table_conversion.go b/test/e2e/apimachinery/table_conversion.go index e381140268..d1da1c4bcd 100644 --- a/test/e2e/apimachinery/table_conversion.go +++ b/test/e2e/apimachinery/table_conversion.go @@ -27,7 +27,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" + metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/test/e2e/framework" @@ -47,8 +47,8 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { _, err := c.CoreV1().Pods(ns).Create(newTablePod(podName)) Expect(err).NotTo(HaveOccurred()) - table := &metav1alpha1.Table{} - err = c.CoreV1().RESTClient().Get().Resource("pods").Namespace(ns).Name(podName).SetHeader("Accept", "application/json;as=Table;v=v1alpha1;g=meta.k8s.io").Do().Into(table) + table := &metav1beta1.Table{} + err = c.CoreV1().RESTClient().Get().Resource("pods").Namespace(ns).Name(podName).SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io").Do().Into(table) Expect(err).NotTo(HaveOccurred()) framework.Logf("Table: %#v", table) @@ -92,10 +92,10 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { Fail("Unable to create template %d, exiting", i) }) - pagedTable := &metav1alpha1.Table{} + pagedTable := &metav1beta1.Table{} err := c.CoreV1().RESTClient().Get().Namespace(ns).Resource("podtemplates"). VersionedParams(&metav1.ListOptions{Limit: 2}, metav1.ParameterCodec). - SetHeader("Accept", "application/json;as=Table;v=v1alpha1;g=meta.k8s.io"). + SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io"). Do().Into(pagedTable) Expect(err).NotTo(HaveOccurred()) // TODO: kops PR job is still using etcd2, which prevents this feature from working. Remove this check when kops is upgraded to etcd3 @@ -111,7 +111,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { err = c.CoreV1().RESTClient().Get().Namespace(ns).Resource("podtemplates"). VersionedParams(&metav1.ListOptions{Continue: pagedTable.Continue}, metav1.ParameterCodec). - SetHeader("Accept", "application/json;as=Table;v=v1alpha1;g=meta.k8s.io"). + SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io"). Do().Into(pagedTable) Expect(err).NotTo(HaveOccurred()) Expect(len(pagedTable.Rows)).To(BeNumerically(">", 0)) @@ -121,8 +121,8 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { It("should return generic metadata details across all namespaces for nodes", func() { c := f.ClientSet - table := &metav1alpha1.Table{} - err := c.CoreV1().RESTClient().Get().Resource("nodes").SetHeader("Accept", "application/json;as=Table;v=v1alpha1;g=meta.k8s.io").Do().Into(table) + table := &metav1beta1.Table{} + err := c.CoreV1().RESTClient().Get().Resource("nodes").SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io").Do().Into(table) Expect(err).NotTo(HaveOccurred()) framework.Logf("Table: %#v", table) @@ -141,14 +141,14 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { It("should return a 406 for a backend which does not implement metadata", func() { c := f.ClientSet - table := &metav1alpha1.Table{} - err := c.CoreV1().RESTClient().Get().Resource("services").SetHeader("Accept", "application/json;as=Table;v=v1alpha1;g=meta.k8s.io").Do().Into(table) + table := &metav1beta1.Table{} + err := c.CoreV1().RESTClient().Get().Resource("services").SetHeader("Accept", "application/json;as=Table;v=v1beta1;g=meta.k8s.io").Do().Into(table) Expect(err).To(HaveOccurred()) Expect(err.(errors.APIStatus).Status().Code).To(Equal(int32(406))) }) }) -func printTable(table *metav1alpha1.Table) string { +func printTable(table *metav1beta1.Table) string { buf := &bytes.Buffer{} tw := tabwriter.NewWriter(buf, 5, 8, 1, ' ', 0) err := printers.PrintTable(table, tw, printers.PrintOptions{})