refactor: generated

cmd/kube-controller-manager/app/options/BUILD

@@ -15,8 +15,8 @@ go_library(
     srcs = ["options.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/unversioned:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
         "//pkg/client/leaderelection:go_default_library",
         "//pkg/master/ports:go_default_library",
         "//pkg/util/config:go_default_library",

cmd/kube-controller-manager/app/options/options.go

@@ -21,7 +21,7 @@ package options
 import (
 	"time"
 
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 	"k8s.io/kubernetes/pkg/client/leaderelection"
 	"k8s.io/kubernetes/pkg/master/ports"
@@ -57,19 +57,19 @@ func NewCMServer() *CMServer {
 			LookupCacheSizeForRC:              4096,
 			LookupCacheSizeForRS:              4096,
 			LookupCacheSizeForDaemonSet:       1024,
-			ServiceSyncPeriod:                 unversioned.Duration{Duration: 5 * time.Minute},
-			RouteReconciliationPeriod:         unversioned.Duration{Duration: 10 * time.Second},
-			ResourceQuotaSyncPeriod:           unversioned.Duration{Duration: 5 * time.Minute},
-			NamespaceSyncPeriod:               unversioned.Duration{Duration: 5 * time.Minute},
-			PVClaimBinderSyncPeriod:           unversioned.Duration{Duration: 15 * time.Second},
-			HorizontalPodAutoscalerSyncPeriod: unversioned.Duration{Duration: 30 * time.Second},
-			DeploymentControllerSyncPeriod:    unversioned.Duration{Duration: 30 * time.Second},
-			MinResyncPeriod:                   unversioned.Duration{Duration: 12 * time.Hour},
+			ServiceSyncPeriod:                 metav1.Duration{Duration: 5 * time.Minute},
+			RouteReconciliationPeriod:         metav1.Duration{Duration: 10 * time.Second},
+			ResourceQuotaSyncPeriod:           metav1.Duration{Duration: 5 * time.Minute},
+			NamespaceSyncPeriod:               metav1.Duration{Duration: 5 * time.Minute},
+			PVClaimBinderSyncPeriod:           metav1.Duration{Duration: 15 * time.Second},
+			HorizontalPodAutoscalerSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
+			DeploymentControllerSyncPeriod:    metav1.Duration{Duration: 30 * time.Second},
+			MinResyncPeriod:                   metav1.Duration{Duration: 12 * time.Hour},
 			RegisterRetryCount:                10,
-			PodEvictionTimeout:                unversioned.Duration{Duration: 5 * time.Minute},
-			NodeMonitorGracePeriod:            unversioned.Duration{Duration: 40 * time.Second},
-			NodeStartupGracePeriod:            unversioned.Duration{Duration: 60 * time.Second},
-			NodeMonitorPeriod:                 unversioned.Duration{Duration: 5 * time.Second},
+			PodEvictionTimeout:                metav1.Duration{Duration: 5 * time.Minute},
+			NodeMonitorGracePeriod:            metav1.Duration{Duration: 40 * time.Second},
+			NodeStartupGracePeriod:            metav1.Duration{Duration: 60 * time.Second},
+			NodeMonitorPeriod:                 metav1.Duration{Duration: 5 * time.Second},
 			ClusterName:                       "kubernetes",
 			NodeCIDRMaskSize:                  24,
 			ConfigureCloudRoutes:              true,
@@ -90,7 +90,7 @@ func NewCMServer() *CMServer {
 			KubeAPIQPS:              20.0,
 			KubeAPIBurst:            30,
 			LeaderElection:          leaderelection.DefaultLeaderElectionConfiguration(),
-			ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second},
+			ControllerStartInterval: metav1.Duration{Duration: 0 * time.Second},
 			EnableGarbageCollector:  true,
 			ConcurrentGCSyncs:       20,
 			ClusterSigningCertFile:  "/etc/kubernetes/ca/ca.pem",

cmd/kubeadm/app/apis/kubeadm/BUILD

@@ -21,7 +21,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/unversioned:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
     ],

cmd/kubeadm/app/apis/kubeadm/register.go

@@ -18,7 +18,7 @@ package kubeadm
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@@ -51,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterInfo{},
 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&unversioned.ExportOptions{},
+		&metav1.ExportOptions{},
 	)
 	return nil
 }

cmd/kubeadm/app/apis/kubeadm/types.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package kubeadm
 
-import "k8s.io/kubernetes/pkg/api/unversioned"
+import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" )
 
 type EnvParams struct {
 	KubernetesDir     string
@@ -30,7 +30,7 @@ type EnvParams struct {
 }
 
 type MasterConfiguration struct {
-	unversioned.TypeMeta
+	metav1.TypeMeta
 
 	Secrets           Secrets
 	API               API
@@ -72,7 +72,7 @@ type Secrets struct {
 }
 
 type NodeConfiguration struct {
-	unversioned.TypeMeta
+	metav1.TypeMeta
 
 	MasterAddresses []string
 	Secrets         Secrets
@@ -82,7 +82,7 @@ type NodeConfiguration struct {
 
 // ClusterInfo TODO add description
 type ClusterInfo struct {
-	unversioned.TypeMeta
+	metav1.TypeMeta
 	// TODO(phase1+) this may become simply `api.Config`
 	CertificateAuthorities []string `json:"certificateAuthorities"`
 	Endpoints              []string `json:"endpoints"`

cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD

@@ -21,8 +21,8 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/unversioned:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
     ],

cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@@ -51,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterInfo{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&unversioned.ExportOptions{},
+		&metav1.ExportOptions{},
 	)
 	return nil
 }

cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go

@@ -16,10 +16,10 @@ limitations under the License.
 
 package v1alpha1
 
-import "k8s.io/kubernetes/pkg/api/unversioned"
+import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" )
 
 type MasterConfiguration struct {
-	unversioned.TypeMeta `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
 
 	Secrets           Secrets    `json:"secrets"`
 	API               API        `json:"api"`
@@ -61,7 +61,7 @@ type Secrets struct {
 }
 
 type NodeConfiguration struct {
-	unversioned.TypeMeta `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
 
 	MasterAddresses []string `json:"masterAddresses"`
 	Secrets         Secrets  `json:"secrets"`
@@ -71,7 +71,7 @@ type NodeConfiguration struct {
 
 // ClusterInfo TODO add description
 type ClusterInfo struct {
-	unversioned.TypeMeta `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
 	// TODO(phase1+) this may become simply `api.Config`
 	CertificateAuthorities []string `json:"certificateAuthorities"`
 	Endpoints              []string `json:"endpoints"`

cmd/kubeadm/app/master/BUILD

@@ -30,9 +30,9 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/errors:go_default_library",
         "//pkg/api/resource:go_default_library",
-        "//pkg/api/unversioned:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
         "//pkg/client/unversioned/clientcmd:go_default_library",
         "//pkg/client/unversioned/clientcmd/api:go_default_library",

cmd/kubeadm/app/master/apiclient.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/images"
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
-	unversionedapi "k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
@@ -116,7 +116,7 @@ func NewDaemonSet(daemonName string, podSpec v1.PodSpec) *extensions.DaemonSet {
 	return &extensions.DaemonSet{
 		ObjectMeta: v1.ObjectMeta{Name: daemonName},
 		Spec: extensions.DaemonSetSpec{
-			Selector: &unversionedapi.LabelSelector{MatchLabels: l},
+			Selector: &metav1.LabelSelector{MatchLabels: l},
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: v1.ObjectMeta{Labels: l},
 				Spec:       podSpec,
@@ -142,7 +142,7 @@ func NewDeployment(deploymentName string, replicas int32, podSpec v1.PodSpec) *e
 		ObjectMeta: v1.ObjectMeta{Name: deploymentName},
 		Spec: extensions.DeploymentSpec{
 			Replicas: &replicas,
-			Selector: &unversionedapi.LabelSelector{MatchLabels: l},
+			Selector: &metav1.LabelSelector{MatchLabels: l},
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: v1.ObjectMeta{Labels: l},
 				Spec:       podSpec,
@@ -171,7 +171,7 @@ func attemptToUpdateMasterRoleLabelsAndTaints(client *clientset.Clientset, sched
 		return err
 	}
 
-	n.ObjectMeta.Labels[unversionedapi.NodeLabelKubeadmAlphaRole] = unversionedapi.NodeLabelRoleMaster
+	n.ObjectMeta.Labels[metav1.NodeLabelKubeadmAlphaRole] = metav1.NodeLabelRoleMaster
 
 	if !schedulable {
 		taintsAnnotation, _ := json.Marshal([]v1.Taint{{Key: "dedicated", Value: "master", Effect: "NoSchedule"}})
@@ -225,9 +225,9 @@ func SetNodeAffinity(meta *v1.ObjectMeta, expr ...v1.NodeSelectorRequirement) {
 // MasterNodeAffinity returns v1.NodeSelectorRequirement to be used with SetNodeAffinity to set affinity to master node
 func MasterNodeAffinity() v1.NodeSelectorRequirement {
 	return v1.NodeSelectorRequirement{
-		Key:      unversionedapi.NodeLabelKubeadmAlphaRole,
+		Key:      metav1.NodeLabelKubeadmAlphaRole,
 		Operator: v1.NodeSelectorOpIn,
-		Values:   []string{unversionedapi.NodeLabelRoleMaster},
+		Values:   []string{metav1.NodeLabelRoleMaster},
 	}
 }
 

cmd/kubeadm/app/master/manifests.go

@@ -27,7 +27,7 @@ import (
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	"k8s.io/kubernetes/cmd/kubeadm/app/images"
 	"k8s.io/kubernetes/pkg/api/resource"
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	api "k8s.io/kubernetes/pkg/api/v1"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/util/intstr"
@@ -201,7 +201,7 @@ func componentProbe(port int, path string) *api.Probe {
 
 func componentPod(container api.Container, volumes ...api.Volume) api.Pod {
 	return api.Pod{
-		TypeMeta: unversioned.TypeMeta{
+		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
 			Kind:       "Pod",
 		},

cmd/kubeadm/app/node/BUILD

@@ -45,7 +45,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
-        "//pkg/api/unversioned:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
         "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library",
         "//pkg/client/restclient:go_default_library",

cmd/kubeadm/app/node/bootstrap_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/typed/discovery"
@@ -40,7 +40,7 @@ func TestEstablishMasterConnection(t *testing.T) {
 		var obj interface{}
 		switch req.URL.Path {
 		case "/api":
-			obj = &unversioned.APIVersions{
+			obj = &metav1.APIVersions{
 				Versions: []string{
 					"v1.4",
 				},
@@ -54,11 +54,11 @@ func TestEstablishMasterConnection(t *testing.T) {
 			w.WriteHeader(http.StatusOK)
 			w.Write(output)
 		case "/apis":
-			obj = &unversioned.APIGroupList{
-				Groups: []unversioned.APIGroup{
+			obj = &metav1.APIGroupList{
+				Groups: []metav1.APIGroup{
 					{
 						Name: "certificates.k8s.io",
-						Versions: []unversioned.GroupVersionForDiscovery{
+						Versions: []metav1.GroupVersionForDiscovery{
 							{GroupVersion: "extensions/v1beta1"},
 						},
 					},
@@ -165,7 +165,7 @@ func TestCheckAPIEndpoint(t *testing.T) {
 				var obj interface{}
 				switch req.URL.Path {
 				case "/api":
-					obj = &unversioned.APIVersions{
+					obj = &metav1.APIVersions{
 						Versions: []string{
 							"v1.4",
 						},
@@ -196,7 +196,7 @@ func TestCheckAPIEndpoint(t *testing.T) {
 				var obj interface{}
 				switch req.URL.Path {
 				case "/api":
-					obj = &unversioned.APIVersions{
+					obj = &metav1.APIVersions{
 						Versions: []string{
 							"v1.4",
 						},
@@ -210,11 +210,11 @@ func TestCheckAPIEndpoint(t *testing.T) {
 					w.WriteHeader(http.StatusOK)
 					w.Write(output)
 				case "/apis":
-					obj = &unversioned.APIGroupList{
-						Groups: []unversioned.APIGroup{
+					obj = &metav1.APIGroupList{
+						Groups: []metav1.APIGroup{
 							{
 								Name: "certificates.k8s.io",
-								Versions: []unversioned.GroupVersionForDiscovery{
+								Versions: []metav1.GroupVersionForDiscovery{
 									{GroupVersion: "extensions/v1beta1"},
 								},
 							},

cmd/kubernetes-discovery/discoverysummarizer/BUILD

@@ -19,6 +19,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1:go_default_library",
-        "//pkg/api/unversioned:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
     ],
 )

cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1/types.go

@@ -38,6 +38,6 @@ type GroupVersionDiscoveryPath struct {
 	Path string `json:"path"`
 
 	// True if the path is for legacy group version.
-	// (i.e the path returns unversioned.APIVersions instead of unversioned.APIGroupList)
+	// (i.e the path returns metav1.APIVersions instead of metav1.APIGroupList)
 	IsLegacy bool `json:"isLegacy"`
 }