kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87952 from mikedanese/opts 

add *Options to Create, Update, and Patch in generated clientsets

Kubernetes-commit: abe6321296123aaba8e83978f7d17951ab1b64fd
This commit is contained in:
Kubernetes Publisher 2020-02-08 20:43:53 -08:00
parent a9e8eb5139 29cd24b6cc
commit 757539aac7
13 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -580,11 +580,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "c44f517f891f"
"Rev": "af50d22222d3"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "dd255cc51571"
"Rev": "396603da40fa"
},
{
"ImportPath": "k8s.io/component-base",
@ -604,7 +604,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "c28290839484"
"Rev": "48c4e2ddad0b"
},
{
"ImportPath": "k8s.io/utils",

10
go.mod
View File

@ -39,11 +39,11 @@ require (
k8s.io/api v0.0.0-20200209065837-d5ab0ddd8b73
k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b
k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a
k8s.io/client-go v0.0.0-20200209070100-c44f517f891f
k8s.io/client-go v0.0.0-20200209070101-af50d22222d3
k8s.io/component-base v0.0.0-20200209070609-0d86229a457e
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0-20200209071823-c28290839484
k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -56,8 +56,8 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20200209065837-d5ab0ddd8b73
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a
k8s.io/client-go => k8s.io/client-go v0.0.0-20200209070100-c44f517f891f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200208144352-dd255cc51571
k8s.io/client-go => k8s.io/client-go v0.0.0-20200209070101-af50d22222d3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200209044353-396603da40fa
k8s.io/component-base => k8s.io/component-base v0.0.0-20200209070609-0d86229a457e
k8s.io/metrics => k8s.io/metrics v0.0.0-20200209071823-c28290839484
k8s.io/metrics => k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b
)

6
go.sum
View File

@ -315,8 +315,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
k8s.io/api v0.0.0-20200209065837-d5ab0ddd8b73/go.mod h1:p/XFTiuxjo+0OlHcql2jDLBO6mxwx4J9xy7Sq9vRtnY=
k8s.io/apimachinery v0.0.0-20200209065656-fb45917aae8b/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/cli-runtime v0.0.0-20200209071941-a3380550112a/go.mod h1:STmitnuF1Wn7OiGEN67PnaK8WXHx76SPGZgZKsIdtr8=
k8s.io/client-go v0.0.0-20200209070100-c44f517f891f/go.mod h1:lrXl4vvqm+n6jlzJDxwcfMx2obCLSV1hYD1HuaL7WEc=
k8s.io/code-generator v0.0.0-20200208144352-dd255cc51571/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/client-go v0.0.0-20200209070101-af50d22222d3/go.mod h1:lrXl4vvqm+n6jlzJDxwcfMx2obCLSV1hYD1HuaL7WEc=
k8s.io/code-generator v0.0.0-20200209044353-396603da40fa/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200209070609-0d86229a457e/go.mod h1:9W3ADuxIg84JdjKHNl3fh3XfShf7mxOdoPJHuCabJ/o=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@ -326,7 +326,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/metrics v0.0.0-20200209071823-c28290839484/go.mod h1:8wVI238ZPYfnx5LlqFNUpB876LXRVhgY6hGnfiZLsjU=
k8s.io/metrics v0.0.0-20200209071824-48c4e2ddad0b/go.mod h1:fMISjqV6tiQDSuQ4g7JJ0RCv+tSWl+glbr8aIm+azhY=
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc h1:MUttqhwRgupMiA5ps5F3d2/NLkU8EZSECTGxrQxqM54=
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

3
pkg/cmd/autoscale/autoscale.go
View File

@ -25,6 +25,7 @@ import (
autoscalingv1 "k8s.io/api/autoscaling/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/cli-runtime/pkg/resource"
@ -263,7 +264,7 @@ func (o *AutoscaleOptions) Run() error {
return err
}
actualHPA, err := o.HPAClient.HorizontalPodAutoscalers(o.namespace).Create(context.TODO(), hpa)
actualHPA, err := o.HPAClient.HorizontalPodAutoscalers(o.namespace).Create(context.TODO(), hpa, metav1.CreateOptions{})
if err != nil {
return err
}

2
pkg/cmd/create/create_clusterrole.go
View File

@ -201,7 +201,7 @@ func (c *CreateClusterRoleOptions) RunCreateRole() error {
// Create ClusterRole.
if !c.DryRun {
clusterRole, err = c.Client.ClusterRoles().Create(context.TODO(), clusterRole)
clusterRole, err = c.Client.ClusterRoles().Create(context.TODO(), clusterRole, metav1.CreateOptions{})
if err != nil {
return err
}

2
pkg/cmd/create/create_cronjob.go
View File

@ -165,7 +165,7 @@ func (o *CreateCronJobOptions) Run() error {
if !o.DryRun {
var err error
cronjob, err = o.Client.CronJobs(o.Namespace).Create(context.TODO(), cronjob)
cronjob, err = o.Client.CronJobs(o.Namespace).Create(context.TODO(), cronjob, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("failed to create cronjob: %v", err)
}

2
pkg/cmd/create/create_job.go
View File

@ -193,7 +193,7 @@ func (o *CreateJobOptions) Run() error {
}
if !o.DryRun {
var err error
job, err = o.Client.Jobs(o.Namespace).Create(context.TODO(), job)
job, err = o.Client.Jobs(o.Namespace).Create(context.TODO(), job, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("failed to create job: %v", err)
}

2
pkg/cmd/create/create_role.go
View File

@ -342,7 +342,7 @@ func (o *CreateRoleOptions) RunCreateRole() error {
// Create role.
if !o.DryRun {
role, err = o.Client.Roles(o.Namespace).Create(context.TODO(), role)
role, err = o.Client.Roles(o.Namespace).Create(context.TODO(), role, metav1.CreateOptions{})
if err != nil {
return err
}

8
pkg/cmd/rollingupdate/rolling_updater.go
View File

@ -483,7 +483,7 @@ func (r *RollingUpdater) getOrCreateTargetControllerWithClient(controller *corev
controller.Annotations[desiredReplicasAnnotation] = fmt.Sprintf("%d", valOrZero(controller.Spec.Replicas))
controller.Annotations[sourceIDAnnotation] = sourceID
controller.Spec.Replicas = utilpointer.Int32Ptr(0)
newRc, err := r.rcClient.ReplicationControllers(r.ns).Create(context.TODO(), controller)
newRc, err := r.rcClient.ReplicationControllers(r.ns).Create(context.TODO(), controller, metav1.CreateOptions{})
return newRc, false, err
}
// Validate and use the existing controller.
@ -576,7 +576,7 @@ func Rename(c corev1client.ReplicationControllersGetter, rc *corev1.ReplicationC
return err
}
// Then create the same RC with the new name.
_, err = c.ReplicationControllers(rc.Namespace).Create(context.TODO(), rc)
_, err = c.ReplicationControllers(rc.Namespace).Create(context.TODO(), rc, metav1.CreateOptions{})
return err
}
@ -783,7 +783,7 @@ func updateRcWithRetries(rcClient corev1client.ReplicationControllersGetter, nam
err := retry.RetryOnConflict(retry.DefaultBackoff, func() (e error) {
// Apply the update, then attempt to push it to the apiserver.
applyUpdate(rc)
if rc, e = rcClient.ReplicationControllers(namespace).Update(context.TODO(), rc); e == nil {
if rc, e = rcClient.ReplicationControllers(namespace).Update(context.TODO(), rc, metav1.UpdateOptions{}); e == nil {
// rc contains the latest controller post update
return
}
@ -814,7 +814,7 @@ func updatePodWithRetries(podClient corev1client.PodsGetter, namespace string, p
err := retry.RetryOnConflict(retry.DefaultBackoff, func() (e error) {
// Apply the update, then attempt to push it to the apiserver.
applyUpdate(pod)
if pod, e = podClient.Pods(namespace).Update(context.TODO(), pod); e == nil {
if pod, e = podClient.Pods(namespace).Update(context.TODO(), pod, metav1.UpdateOptions{}); e == nil {
return
}
updateErr := e

2
pkg/cmd/rollingupdate/rollingupdate.go
View File

@ -432,7 +432,7 @@ func (o *RollingUpdateOptions) Run() error {
if err != nil {
return err
}
coreClient.ReplicationControllers(config.NewRc.Namespace).Update(context.TODO(), config.NewRc)
coreClient.ReplicationControllers(config.NewRc.Namespace).Update(context.TODO(), config.NewRc, metav1.UpdateOptions{})
}
err = updater.Update(config)
if err != nil {

5
pkg/drain/cordon.go
View File

@ -21,6 +21,7 @@ import (
"fmt"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -88,9 +89,9 @@ func (c *CordonHelper) PatchOrReplace(clientset kubernetes.Interface) (error, er
patchBytes, patchErr := strategicpatch.CreateTwoWayMergePatch(oldData, newData, c.node)
if patchErr == nil {
_, err = client.Patch(context.TODO(), c.node.Name, types.StrategicMergePatchType, patchBytes)
_, err = client.Patch(context.TODO(), c.node.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{})
} else {
_, err = client.Update(context.TODO(), c.node)
_, err = client.Update(context.TODO(), c.node, metav1.UpdateOptions{})
}
return err, patchErr
}

2
pkg/polymorphichelpers/history_test.go
View File

@ -85,7 +85,7 @@ func TestViewHistory(t *testing.T) {
)
fakeClientSet := fake.NewSimpleClientset(ssStub)
_, err := fakeClientSet.AppsV1().ControllerRevisions("default").Create(context.TODO(), ssStub1)
_, err := fakeClientSet.AppsV1().ControllerRevisions("default").Create(context.TODO(), ssStub1, metav1.CreateOptions{})
if err != nil {
t.Fatalf("create controllerRevisions error %v occurred ", err)
}

6
pkg/polymorphichelpers/rollback.go
View File

@ -154,7 +154,7 @@ func (r *DeploymentRollbacker) Rollback(obj runtime.Object, updatedAnnotations m
}
// Restore revision
if _, err = r.c.AppsV1().Deployments(namespace).Patch(context.TODO(), name, patchType, patch); err != nil {
if _, err = r.c.AppsV1().Deployments(namespace).Patch(context.TODO(), name, patchType, patch, metav1.PatchOptions{}); err != nil {
return "", fmt.Errorf("failed restoring revision %d: %v", toRevision, err)
}
return rollbackSuccess, nil
@ -294,7 +294,7 @@ func (r *DaemonSetRollbacker) Rollback(obj runtime.Object, updatedAnnotations ma
}
// Restore revision
if _, err = r.c.AppsV1().DaemonSets(accessor.GetNamespace()).Patch(context.TODO(), accessor.GetName(), types.StrategicMergePatchType, toHistory.Data.Raw); err != nil {
if _, err = r.c.AppsV1().DaemonSets(accessor.GetNamespace()).Patch(context.TODO(), accessor.GetName(), types.StrategicMergePatchType, toHistory.Data.Raw, metav1.PatchOptions{}); err != nil {
return "", fmt.Errorf("failed restoring revision %d: %v", toRevision, err)
}
@ -381,7 +381,7 @@ func (r *StatefulSetRollbacker) Rollback(obj runtime.Object, updatedAnnotations
}
// Restore revision
if _, err = r.c.AppsV1().StatefulSets(sts.Namespace).Patch(context.TODO(), sts.Name, types.StrategicMergePatchType, toHistory.Data.Raw); err != nil {
if _, err = r.c.AppsV1().StatefulSets(sts.Namespace).Patch(context.TODO(), sts.Name, types.StrategicMergePatchType, toHistory.Data.Raw, metav1.PatchOptions{}); err != nil {
return "", fmt.Errorf("failed restoring revision %d: %v", toRevision, err)
}