github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49830 from jianglingxia/jlx72916 

Automatic merge from submit-queue (batch tested with PRs 50418, 49830, 49206, 49061, 49912)

Renamed packge name to apiv1

**What this PR does / why we need it**:
Renamed packge name from k8s_api_v1 to apiv1
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-09 22:07:15 -07:00 committed by GitHub
parent 4d4dd23820 9e8d4b4188
commit 6aeb790582
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/deployment/util/deployment_util_test.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
) )
@ -147,7 +147,7 @@ func generatePod(labels map[string]string, image string) v1.Pod {
func generateRSWithLabel(labels map[string]string, image string) extensions.ReplicaSet { func generateRSWithLabel(labels map[string]string, image string) extensions.ReplicaSet {
return extensions.ReplicaSet{ return extensions.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: k8s_api_v1.SimpleNameGenerator.GenerateName("replicaset"), Name: apiv1.SimpleNameGenerator.GenerateName("replicaset"),
Labels: labels, Labels: labels,
}, },
Spec: extensions.ReplicaSetSpec{ Spec: extensions.ReplicaSetSpec{
@ -190,7 +190,7 @@ func generateRS(deployment extensions.Deployment) extensions.ReplicaSet {
return extensions.ReplicaSet{ return extensions.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
UID: randomUID(), UID: randomUID(),
Name: k8s_api_v1.SimpleNameGenerator.GenerateName("replicaset"), Name: apiv1.SimpleNameGenerator.GenerateName("replicaset"),
Labels: template.Labels, Labels: template.Labels,
OwnerReferences: []metav1.OwnerReference{*newDControllerRef(&deployment)}, OwnerReferences: []metav1.OwnerReference{*newDControllerRef(&deployment)},
}, },

6
pkg/controller/serviceaccount/tokengetter.go
View File

@ -23,7 +23,7 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/registry/core/secret" "k8s.io/kubernetes/pkg/registry/core/secret"
secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage"
serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
@ -68,7 +68,7 @@ func (r *registryGetter) GetServiceAccount(namespace, name string) (*v1.ServiceA
return nil, err return nil, err
} }
v1ServiceAccount := v1.ServiceAccount{} v1ServiceAccount := v1.ServiceAccount{}
err = k8s_api_v1.Convert_api_ServiceAccount_To_v1_ServiceAccount(internalServiceAccount, &v1ServiceAccount, nil) err = apiv1.Convert_api_ServiceAccount_To_v1_ServiceAccount(internalServiceAccount, &v1ServiceAccount, nil)
return &v1ServiceAccount, err return &v1ServiceAccount, err
} }
@ -79,7 +79,7 @@ func (r *registryGetter) GetSecret(namespace, name string) (*v1.Secret, error) {
return nil, err return nil, err
} }
v1Secret := v1.Secret{} v1Secret := v1.Secret{}
err = k8s_api_v1.Convert_api_Secret_To_v1_Secret(internalSecret, &v1Secret, nil) err = apiv1.Convert_api_Secret_To_v1_Secret(internalSecret, &v1Secret, nil)
return &v1Secret, err return &v1Secret, err
} }

6
pkg/kubectl/cmd/util/factory.go
View File

@ -47,7 +47,7 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
@ -296,13 +296,13 @@ func GetFirstPod(client coreclient.PodsGetter, namespace string, selector labels
for i := range podList.Items { for i := range podList.Items {
pod := podList.Items[i] pod := podList.Items[i]
externalPod := &v1.Pod{} externalPod := &v1.Pod{}
k8s_api_v1.Convert_api_Pod_To_v1_Pod(&pod, externalPod, nil) apiv1.Convert_api_Pod_To_v1_Pod(&pod, externalPod, nil)
pods = append(pods, externalPod) pods = append(pods, externalPod)
} }
if len(pods) > 0 { if len(pods) > 0 {
sort.Sort(sortBy(pods)) sort.Sort(sortBy(pods))
internalPod := &api.Pod{} internalPod := &api.Pod{}
k8s_api_v1.Convert_v1_Pod_To_api_Pod(pods[0], internalPod, nil) apiv1.Convert_v1_Pod_To_api_Pod(pods[0], internalPod, nil)
return internalPod, len(podList.Items), nil return internalPod, len(podList.Items), nil
} }

4
pkg/kubectl/history.go
View File

@ -34,7 +34,7 @@ import (
clientappsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1" clientappsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1"
clientextensionsv1beta1 "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" clientextensionsv1beta1 "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@ -139,7 +139,7 @@ func (h *DeploymentHistoryViewer) ViewHistory(namespace, name string, revision i
func printTemplate(template *v1.PodTemplateSpec) (string, error) { func printTemplate(template *v1.PodTemplateSpec) (string, error) {
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
internalTemplate := &api.PodTemplateSpec{} internalTemplate := &api.PodTemplateSpec{}
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil { if err := apiv1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil {
return "", fmt.Errorf("failed to convert podtemplate, %v", err) return "", fmt.Errorf("failed to convert podtemplate, %v", err)
} }
w := printersinternal.NewPrefixWriter(buf) w := printersinternal.NewPrefixWriter(buf)

8
pkg/kubectl/rollback.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@ -181,7 +181,7 @@ func simpleDryRun(deployment *extensions.Deployment, c clientset.Interface, toRe
} }
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
internalTemplate := &api.PodTemplateSpec{} internalTemplate := &api.PodTemplateSpec{}
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil { if err := apiv1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil {
return "", fmt.Errorf("failed to convert podtemplate, %v", err) return "", fmt.Errorf("failed to convert podtemplate, %v", err)
} }
w := printersinternal.NewPrefixWriter(buf) w := printersinternal.NewPrefixWriter(buf)
@ -200,7 +200,7 @@ func simpleDryRun(deployment *extensions.Deployment, c clientset.Interface, toRe
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
buf.WriteString("\n") buf.WriteString("\n")
internalTemplate := &api.PodTemplateSpec{} internalTemplate := &api.PodTemplateSpec{}
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil { if err := apiv1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil {
return "", fmt.Errorf("failed to convert podtemplate, %v", err) return "", fmt.Errorf("failed to convert podtemplate, %v", err)
} }
w := printersinternal.NewPrefixWriter(buf) w := printersinternal.NewPrefixWriter(buf)
@ -259,7 +259,7 @@ func (r *DaemonSetRollbacker) Rollback(obj runtime.Object, updatedAnnotations ma
content := bytes.NewBuffer([]byte{}) content := bytes.NewBuffer([]byte{})
w := printersinternal.NewPrefixWriter(content) w := printersinternal.NewPrefixWriter(content)
internalTemplate := &api.PodTemplateSpec{} internalTemplate := &api.PodTemplateSpec{}
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&appliedDS.Spec.Template, internalTemplate, nil); err != nil { if err := apiv1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&appliedDS.Spec.Template, internalTemplate, nil); err != nil {
return "", fmt.Errorf("failed to convert podtemplate while printing: %v", err) return "", fmt.Errorf("failed to convert podtemplate while printing: %v", err)
} }
printersinternal.DescribePodTemplate(internalTemplate, w) printersinternal.DescribePodTemplate(internalTemplate, w)

4
pkg/kubectl/rolling_updater.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/integer" "k8s.io/client-go/util/integer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod" podutil "k8s.io/kubernetes/pkg/api/v1/pod"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/pkg/client/retry"
@ -424,7 +424,7 @@ func (r *RollingUpdater) readyPods(oldRc, newRc *api.ReplicationController, minR
} }
for _, pod := range pods.Items { for _, pod := range pods.Items {
v1Pod := &v1.Pod{} v1Pod := &v1.Pod{}
if err := k8s_api_v1.Convert_api_Pod_To_v1_Pod(&pod, v1Pod, nil); err != nil { if err := apiv1.Convert_api_Pod_To_v1_Pod(&pod, v1Pod, nil); err != nil {
return 0, 0, err return 0, 0, err
} }
// Do not count deleted pods as ready // Do not count deleted pods as ready