github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

use core client with explicit version globally

Browse Source
This commit is contained in:
Kevin
2017-10-25 23:54:32 +08:00
parent d945927077
commit 4c8539cece
190 changed files with 921 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/utils/runners.go
View File

@@ -61,7 +61,7 @@ func removePtr(replicas *int32) int32 {
func WaitUntilPodIsScheduled(c clientset.Interface, name, namespace string, timeout time.Duration) (*v1.Pod, error) {
// Wait until it's scheduled
p, err := c.Core().Pods(namespace).Get(name, metav1.GetOptions{ResourceVersion: "0"})
p, err := c.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{ResourceVersion: "0"})
if err == nil && p.Spec.NodeName != "" {
return p, nil
}
@@ -69,7 +69,7 @@ func WaitUntilPodIsScheduled(c clientset.Interface, name, namespace string, time
startTime := time.Now()
for startTime.Add(timeout).After(time.Now()) {
time.Sleep(pollingPeriod)
p, err := c.Core().Pods(namespace).Get(name, metav1.GetOptions{ResourceVersion: "0"})
p, err := c.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{ResourceVersion: "0"})
if err == nil && p.Spec.NodeName != "" {
return p, nil
}
@@ -83,7 +83,7 @@ func RunPodAndGetNodeName(c clientset.Interface, pod *v1.Pod, timeout time.Durat
var err error
// Create a Pod
for i := 0; i < retries; i++ {
_, err = c.Core().Pods(namespace).Create(pod)
_, err = c.CoreV1().Pods(namespace).Create(pod)
if err == nil || apierrs.IsAlreadyExists(err) {
break
}
@@ -553,7 +553,7 @@ func (config *RCConfig) create() error {
config.applyTo(rc.Spec.Template)
_, err := config.Client.Core().ReplicationControllers(config.Namespace).Create(rc)
_, err := config.Client.CoreV1().ReplicationControllers(config.Namespace).Create(rc)
if err != nil {
return fmt.Errorf("Error creating replication controller: %v", err)
}
@@ -760,7 +760,7 @@ func (config *RCConfig) start() error {
if oldRunning != config.Replicas {
// List only pods from a given replication controller.
options := metav1.ListOptions{LabelSelector: label.String()}
if pods, err := config.Client.Core().Pods(metav1.NamespaceAll).List(options); err == nil {
if pods, err := config.Client.CoreV1().Pods(metav1.NamespaceAll).List(options); err == nil {
for _, pod := range pods.Items {
config.RCConfigLog("Pod %s\t%s\t%s\t%s", pod.Name, pod.Spec.NodeName, pod.Status.Phase, pod.DeletionTimestamp)
@@ -789,7 +789,7 @@ func StartPods(c clientset.Interface, replicas int, namespace string, podNamePre
pod.ObjectMeta.Labels["name"] = podName
pod.ObjectMeta.Labels["startPodsID"] = startPodsID
pod.Spec.Containers[0].Name = podName
_, err := c.Core().Pods(namespace).Create(&pod)
_, err := c.CoreV1().Pods(namespace).Create(&pod)
if err != nil {
return err
}
@@ -890,7 +890,7 @@ func DoPrepareNode(client clientset.Interface, node *v1.Node, strategy PrepareNo
return nil
}
for attempt := 0; attempt < retries; attempt++ {
if _, err = client.Core().Nodes().Patch(node.Name, types.MergePatchType, []byte(patch)); err == nil {
if _, err = client.CoreV1().Nodes().Patch(node.Name, types.MergePatchType, []byte(patch)); err == nil {
return nil
}
if !apierrs.IsConflict(err) {
@@ -903,7 +903,7 @@ func DoPrepareNode(client clientset.Interface, node *v1.Node, strategy PrepareNo
func DoCleanupNode(client clientset.Interface, nodeName string, strategy PrepareNodeStrategy) error {
for attempt := 0; attempt < retries; attempt++ {
node, err := client.Core().Nodes().Get(nodeName, metav1.GetOptions{})
node, err := client.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("Skipping cleanup of Node: failed to get Node %v: %v", nodeName, err)
}
@@ -911,7 +911,7 @@ func DoCleanupNode(client clientset.Interface, nodeName string, strategy Prepare
if apiequality.Semantic.DeepEqual(node, updatedNode) {
return nil
}
if _, err = client.Core().Nodes().Update(updatedNode); err == nil {
if _, err = client.CoreV1().Nodes().Update(updatedNode); err == nil {
return nil
}
if !apierrs.IsConflict(err) {
@@ -988,7 +988,7 @@ func MakePodSpec() v1.PodSpec {
func makeCreatePod(client clientset.Interface, namespace string, podTemplate *v1.Pod) error {
var err error
for attempt := 0; attempt < retries; attempt++ {
if _, err := client.Core().Pods(namespace).Create(podTemplate); err == nil {
if _, err := client.CoreV1().Pods(namespace).Create(podTemplate); err == nil {
return nil
}
glog.Errorf("Error while creating pod, maybe retry: %v", err)
@@ -1033,7 +1033,7 @@ func createController(client clientset.Interface, controllerName, namespace stri
}
var err error
for attempt := 0; attempt < retries; attempt++ {
if _, err := client.Core().ReplicationControllers(namespace).Create(rc); err == nil {
if _, err := client.CoreV1().ReplicationControllers(namespace).Create(rc); err == nil {
return nil
}
glog.Errorf("Error while creating rc, maybe retry: %v", err)
@@ -1093,7 +1093,7 @@ func (config *SecretConfig) Run() error {
secret.StringData[k] = v
}
_, err := config.Client.Core().Secrets(config.Namespace).Create(secret)
_, err := config.Client.CoreV1().Secrets(config.Namespace).Create(secret)
if err != nil {
return fmt.Errorf("Error creating secret: %v", err)
}
@@ -1102,7 +1102,7 @@ func (config *SecretConfig) Run() error {
}
func (config *SecretConfig) Stop() error {
if err := config.Client.Core().Secrets(config.Namespace).Delete(config.Name, &metav1.DeleteOptions{}); err != nil {
if err := config.Client.CoreV1().Secrets(config.Namespace).Delete(config.Name, &metav1.DeleteOptions{}); err != nil {
return fmt.Errorf("Error deleting secret: %v", err)
}
config.LogFunc("Deleted secret %v/%v", config.Namespace, config.Name)
@@ -1152,7 +1152,7 @@ func (config *ConfigMapConfig) Run() error {
configMap.Data[k] = v
}
_, err := config.Client.Core().ConfigMaps(config.Namespace).Create(configMap)
_, err := config.Client.CoreV1().ConfigMaps(config.Namespace).Create(configMap)
if err != nil {
return fmt.Errorf("Error creating configmap: %v", err)
}
@@ -1161,7 +1161,7 @@ func (config *ConfigMapConfig) Run() error {
}
func (config *ConfigMapConfig) Stop() error {
if err := config.Client.Core().ConfigMaps(config.Namespace).Delete(config.Name, &metav1.DeleteOptions{}); err != nil {
if err := config.Client.CoreV1().ConfigMaps(config.Namespace).Delete(config.Name, &metav1.DeleteOptions{}); err != nil {
return fmt.Errorf("Error deleting configmap: %v", err)
}
config.LogFunc("Deleted configmap %v/%v", config.Namespace, config.Name)
@@ -1240,7 +1240,7 @@ func (config *DaemonConfig) Run() error {
var nodes *v1.NodeList
for i := 0; i < retries; i++ {
// Wait for all daemons to be running
nodes, err = config.Client.Core().Nodes().List(metav1.ListOptions{ResourceVersion: "0"})
nodes, err = config.Client.CoreV1().Nodes().List(metav1.ListOptions{ResourceVersion: "0"})
if err == nil {
break
} else if i+1 == retries {